Skip to content
This repository has been archived by the owner on Jun 19, 2023. It is now read-only.

Refactored Instant Upload #681

Merged
merged 9 commits into from
Jun 8, 2016
Merged

Refactored Instant Upload #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
74171bd
Instant Upload now implemented in InstantUpload class. Instant Upload…
Jon-Schneider May 31, 2016
871be46
Cleans up property accesses in migration 18.
Jon-Schneider May 31, 2016
71bbc31
Merge pull request #669 from owncloud/clear_cache_button
Jun 1, 2016
e04c2bf
Instant Upload now implemented in InstantUpload class. Instant Upload…
Jon-Schneider May 31, 2016
34ae5d3
Cleans up property accesses in migration 18.
Jon-Schneider May 31, 2016
09d0ad2
Fixes strings merge conflict rebasing 'refactored_instant_upload' ont…
Jon-Schneider Jun 1, 2016
978bf25
Cleans up InstantUpload alert handling.
Jon-Schneider Jun 2, 2016
7e38843
When instant upload is enabled it now sets the timestamp photos must …
Jon-Schneider Jun 2, 2016
01ff844
Fixes Background Instant Upload bug where user, after denying locatio…
Jon-Schneider Jun 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 6 additions & 20 deletions Owncloud iOs Client.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,6 @@
4030D8F61A16277100DB0871 /* file_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4030D8F31A16277100DB0871 /* file_icon@2x.png */; };
4030D8F71A16277100DB0871 /* file_icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4030D8F41A16277100DB0871 /* file_icon@3x.png */; };
404FDA241A36E5E5008AB4E1 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 404FDA231A36E5E5008AB4E1 /* CoreLocation.framework */; };
404FDA281A36EA9D008AB4E1 /* ManageLocation.m in Sources */ = {isa = PBXBuildFile; fileRef = 404FDA271A36EA9D008AB4E1 /* ManageLocation.m */; };
4052B4D81B4ECC75000788DA /* btnAllHelpGrey.png in Resources */ = {isa = PBXBuildFile; fileRef = 4052B4D71B4ECC75000788DA /* btnAllHelpGrey.png */; };
4052B4DA1B4ECD3A000788DA /* btnHelpPage0.png in Resources */ = {isa = PBXBuildFile; fileRef = 4052B4D91B4ECD3A000788DA /* btnHelpPage0.png */; };
4052B4DC1B4ECD74000788DA /* btnHelpPage1.png in Resources */ = {isa = PBXBuildFile; fileRef = 4052B4DB1B4ECD74000788DA /* btnHelpPage1.png */; };
Expand All @@ -368,7 +367,6 @@
405D06CB1BFB678900591604 /* CapabilitiesDto.m in Sources */ = {isa = PBXBuildFile; fileRef = EA0EFA1A1BEA66A1009971AF /* CapabilitiesDto.m */; };
40A3A0EB1CEC9B3A0056016A /* more-filledBlack.png in Resources */ = {isa = PBXBuildFile; fileRef = 40A3A0E91CEC9B3A0056016A /* more-filledBlack.png */; };
40A3A0EC1CEC9B3A0056016A /* more-filledBlack@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 40A3A0EA1CEC9B3A0056016A /* more-filledBlack@2x.png */; };
40A969E41A5EEAC80046A36C /* ManageAsset.m in Sources */ = {isa = PBXBuildFile; fileRef = 40A969E31A5EEAC80046A36C /* ManageAsset.m */; };
40AB1F5B1A12392E003E7397 /* cancel_download_white@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 40AB1F591A12392E003E7397 /* cancel_download_white@3x.png */; };
40AB1F5C1A12392E003E7397 /* cancel_download@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 40AB1F5A1A12392E003E7397 /* cancel_download@3x.png */; };
40AB1F5F1A123B03003E7397 /* BackRootFolderIcon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 40AB1F5E1A123B03003E7397 /* BackRootFolderIcon@3x.png */; };
Expand Down Expand Up @@ -910,6 +908,7 @@
EAF771311B73523800ED6E6E /* SystemConstants-swift.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAF771301B73523800ED6E6E /* SystemConstants-swift.swift */; };
EAFDF1771A76372A00655DBF /* NSString+Encoding.m in Sources */ = {isa = PBXBuildFile; fileRef = EAABAB2918585CD700909831 /* NSString+Encoding.m */; };
EAFE20A81AC4617D00BB888E /* UIImage+Resize.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAFE20A71AC4617D00BB888E /* UIImage+Resize.swift */; };
FCE228D11CFE08EF00E4827F /* InstantUpload.m in Sources */ = {isa = PBXBuildFile; fileRef = FCE228D01CFE08EF00E4827F /* InstantUpload.m */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -1468,8 +1467,6 @@
4030D8F31A16277100DB0871 /* file_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "file_icon@2x.png"; sourceTree = "<group>"; };
4030D8F41A16277100DB0871 /* file_icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "file_icon@3x.png"; sourceTree = "<group>"; };
404FDA231A36E5E5008AB4E1 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
404FDA261A36EA9D008AB4E1 /* ManageLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ManageLocation.h; sourceTree = "<group>"; };
404FDA271A36EA9D008AB4E1 /* ManageLocation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ManageLocation.m; sourceTree = "<group>"; };
4052B4D71B4ECC75000788DA /* btnAllHelpGrey.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = btnAllHelpGrey.png; sourceTree = "<group>"; };
4052B4D91B4ECD3A000788DA /* btnHelpPage0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = btnHelpPage0.png; sourceTree = "<group>"; };
4052B4DB1B4ECD74000788DA /* btnHelpPage1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = btnHelpPage1.png; sourceTree = "<group>"; };
Expand All @@ -1482,8 +1479,6 @@
405AD0C01B56C26A00271424 /* iphoneShare.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = iphoneShare.png; sourceTree = "<group>"; };
40A3A0E91CEC9B3A0056016A /* more-filledBlack.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "more-filledBlack.png"; sourceTree = "<group>"; };
40A3A0EA1CEC9B3A0056016A /* more-filledBlack@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "more-filledBlack@2x.png"; sourceTree = "<group>"; };
40A969E21A5EEAC80046A36C /* ManageAsset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ManageAsset.h; sourceTree = "<group>"; };
40A969E31A5EEAC80046A36C /* ManageAsset.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ManageAsset.m; sourceTree = "<group>"; };
40AB1F591A12392E003E7397 /* cancel_download_white@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "cancel_download_white@3x.png"; sourceTree = "<group>"; };
40AB1F5A1A12392E003E7397 /* cancel_download@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "cancel_download@3x.png"; sourceTree = "<group>"; };
40AB1F5E1A123B03003E7397 /* BackRootFolderIcon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "BackRootFolderIcon@3x.png"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1833,6 +1828,8 @@
EAF7712B1B7340C400ED6E6E /* ShareLinkButtonCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = ShareLinkButtonCell.xib; path = Tabs/FileTab/Share/Cells/ShareLinkButtonCell.xib; sourceTree = "<group>"; };
EAF771301B73523800ED6E6E /* SystemConstants-swift.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "SystemConstants-swift.swift"; path = "Utils/SystemConstants-swift.swift"; sourceTree = "<group>"; };
EAFE20A71AC4617D00BB888E /* UIImage+Resize.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIImage+Resize.swift"; sourceTree = "<group>"; };
FCE228CF1CFE08EF00E4827F /* InstantUpload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InstantUpload.h; sourceTree = "<group>"; };
FCE228D01CFE08EF00E4827F /* InstantUpload.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InstantUpload.m; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -1996,7 +1993,6 @@
148DD5DD1778549700FB9977 /* ExternalLibreries */,
148DD61D17785D4200FB9977 /* Files */,
137AAF1715B0054F00A1A764 /* Login */,
404FDA251A36E60A008AB4E1 /* Location */,
40A969DD1A5EDF900046A36C /* InstantUpload */,
148DD6661778625100FB9977 /* Network */,
1324298315ADBB3700DF823E /* Supporting Files */,
Expand Down Expand Up @@ -2925,15 +2921,6 @@
path = HelpGuide;
sourceTree = "<group>";
};
404FDA251A36E60A008AB4E1 /* Location */ = {
isa = PBXGroup;
children = (
404FDA261A36EA9D008AB4E1 /* ManageLocation.h */,
404FDA271A36EA9D008AB4E1 /* ManageLocation.m */,
);
path = Location;
sourceTree = "<group>";
};
4052B4AC1B4E951F000788DA /* HelpPageButtons */ = {
isa = PBXGroup;
children = (
Expand All @@ -2958,8 +2945,8 @@
40A969DD1A5EDF900046A36C /* InstantUpload */ = {
isa = PBXGroup;
children = (
40A969E21A5EEAC80046A36C /* ManageAsset.h */,
40A969E31A5EEAC80046A36C /* ManageAsset.m */,
FCE228CF1CFE08EF00E4827F /* InstantUpload.h */,
FCE228D01CFE08EF00E4827F /* InstantUpload.m */,
);
path = InstantUpload;
sourceTree = "<group>";
Expand Down Expand Up @@ -4552,7 +4539,6 @@
files = (
EAF771311B73523800ED6E6E /* SystemConstants-swift.swift in Sources */,
59BF9B361A2C8BEA009D9CF0 /* DocumentPickerViewController.m in Sources */,
404FDA281A36EA9D008AB4E1 /* ManageLocation.m in Sources */,
59BF9B371A2C8BEA009D9CF0 /* FileListDocumentProviderViewController.m in Sources */,
EAD0EBA317FAF811000005A1 /* OCELCAssetTablePicker.m in Sources */,
1324298915ADBB3700DF823E /* main.m in Sources */,
Expand Down Expand Up @@ -4601,7 +4587,6 @@
148DD619177855D900FB9977 /* Reachability.m in Sources */,
40C0BDBC1C465F390057B1DD /* SharePrivilegeCell.swift in Sources */,
148DD62517785D6900FB9977 /* DetailViewController.m in Sources */,
40A969E41A5EEAC80046A36C /* ManageAsset.m in Sources */,
EABF69171891379C00A2217C /* SWTableViewCell.m in Sources */,
EA8ADE681A31E9AB008D3612 /* FFCircularProgressView.m in Sources */,
148DD62A17785D9800FB9977 /* FilePreviewViewController.m in Sources */,
Expand Down Expand Up @@ -4744,6 +4729,7 @@
1420C3AC178A9F5000C0455C /* LoginViewController.m in Sources */,
400A63661B4FD75600890579 /* IFTTTAnimatedScrollViewController.m in Sources */,
EA8ADE6A1A31E9AB008D3612 /* UIColor+iOS7.m in Sources */,
FCE228D11CFE08EF00E4827F /* InstantUpload.m in Sources */,
13A9C667187FE91700C6EEE8 /* ShareFileOrFolder.m in Sources */,
EA0599851BB92B19002C2864 /* ShareUserCell.swift in Sources */,
EA42FA51180539E70006DB7C /* ImageUtils.m in Sources */,
Expand Down
46 changes: 5 additions & 41 deletions Owncloud iOs Client/AppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,14 @@
#import "UtilsDtos.h"
#import "UtilsUrls.h"
#import "OCKeychain.h"
#import "ManageLocation.h"
#import "ManageAsset.h"
#import "OCSplitViewController.h"
#import "InitializeDatabase.h"
#import "HelpGuideViewController.h"
#import "SyncFolderManager.h"
#import "DownloadFileSyncFolder.h"
#import "CheckFeaturesSupported.h"
#import "ManageTouchID.h"
#import "InstantUpload.h"

NSString * CloseAlertViewWhenApplicationDidEnterBackground = @"CloseAlertViewWhenApplicationDidEnterBackground";
NSString * RefreshSharesItemsAfterCheckServerVersion = @"RefreshSharesItemsAfterCheckServerVersion";
Expand Down Expand Up @@ -180,6 +179,10 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
//Show TouchID dialog if active
if([ManageAppSettingsDB isTouchID])
[[ManageTouchID sharedSingleton] showTouchIDAuth];

dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(4.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[[InstantUpload instantUploadManager] activate];
});

return YES;
}
Expand Down Expand Up @@ -873,12 +876,6 @@ - (void) removeInboxFolder{
[fileManager removeItemAtPath:inboxFolder error:&error];
}


- (void) initInstantUploads{

[self.settingsViewController initStateInstantUpload];
}

#pragma mark - Manage media player

/*
Expand Down Expand Up @@ -1045,10 +1042,6 @@ - (void)applicationWillEnterForeground:(UIApplication *)application
{
DLog(@"applicationWillEnterForeground");

[self performSelector:@selector(initInstantUploads) withObject:nil afterDelay:4.0];



if (_activeUser.username==nil) {
_activeUser=[ManageUsersDB getActiveUser];
}
Expand Down Expand Up @@ -2832,35 +2825,6 @@ -(void)reloadCellByKey:(NSString *)key{
FileDto *folderRemoved = [ManageFilesDB getFileDtoByFileName:[folderToRemoveName encodeString:NSUTF8StringEncoding] andFilePath:[folderToRemovePath encodeString:NSUTF8StringEncoding] andUser:app.activeUser];
[self reloadCellByFile:folderRemoved];
}

#pragma mark - Location

-(void)checkIfLocationIsEnabled {
if ([CLLocationManager locationServicesEnabled]) {

DLog(@"authorizationStatus: %d", [CLLocationManager authorizationStatus]);

if ([CLLocationManager authorizationStatus] != kCLAuthorizationStatusAuthorized) {

if ([CLLocationManager authorizationStatus] == kCLAuthorizationStatusDenied) {
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"location_not_enabled", nil)
message:NSLocalizedString(@"message_location_not_enabled", nil)
delegate:nil
cancelButtonTitle:@"ok"
otherButtonTitles:nil];
[alert show];
} else {
DLog(@"Location services not enabled");
[[ManageLocation sharedSingleton] startSignificantChangeUpdates];
[[ManageLocation sharedSingleton] stopSignificantChangeUpdates];
}
}
}

}



- (void) showLoginView {
DLog(@"ShowLoginView");

Expand Down
3 changes: 2 additions & 1 deletion Owncloud iOs Client/DataBase/DTOs/UserDto.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@ typedef enum {
@property NSInteger hasForbiddenCharactersSupport;
@property NSInteger hasCapabilitiesSupport;
@property BOOL instantUpload;
@property BOOL backgroundInstantUpload;
@property (nonatomic, copy) NSString *pathInstantUpload;
@property BOOL onlyWifiInstantUpload;
@property long dateInstantUpload;
@property NSTimeInterval timestampInstantUpload;
@property (nonatomic, copy) NSString *urlRedirected;
@property (nonatomic, strong) CapabilitiesDto *capabilitiesDto;
@property enumSortingType sortingType;
Expand Down
22 changes: 21 additions & 1 deletion Owncloud iOs Client/DataBase/Queries/InitializeDatabase.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
#define k_DB_version_15 15
#define k_DB_version_16 16
#define k_DB_version_17 17
#define k_DB_version_18 18

@implementation InitializeDatabase

Expand All @@ -53,7 +54,7 @@ @implementation InitializeDatabase
+ (void) initDataBase {

//New version
static int dbVersion = k_DB_version_17;
static int dbVersion = k_DB_version_18;

//This method make a new database
[ManageDB createDataBase];
Expand Down Expand Up @@ -83,6 +84,7 @@ + (void) initDataBase {
[ManageDB updateDBVersion14To15];
[ManageDB updateDBVersion15To16];
[self updateDBVersion16To17];
[ManageDB updateDBVersion17To18];
break;
case k_DB_version_2:
[ManageDB updateDBVersion2To3];
Expand All @@ -101,6 +103,7 @@ + (void) initDataBase {
[ManageDB updateDBVersion14To15];
[ManageDB updateDBVersion15To16];
[self updateDBVersion16To17];
[ManageDB updateDBVersion17To18];
break;
case k_DB_version_3:
[ManageDB updateDBVersion3To4];
Expand All @@ -117,6 +120,7 @@ + (void) initDataBase {
[ManageDB updateDBVersion14To15];
[ManageDB updateDBVersion15To16];
[self updateDBVersion16To17];
[ManageDB updateDBVersion17To18];
break;
case k_DB_version_4:
[ManageDB updateDBVersion4To5];
Expand All @@ -132,6 +136,7 @@ + (void) initDataBase {
[ManageDB updateDBVersion14To15];
[ManageDB updateDBVersion15To16];
[self updateDBVersion16To17];
[ManageDB updateDBVersion17To18];
break;
case k_DB_version_5:
[ManageDB updateDBVersion5To6];
Expand All @@ -146,6 +151,7 @@ + (void) initDataBase {
[ManageDB updateDBVersion14To15];
[ManageDB updateDBVersion15To16];
[self updateDBVersion16To17];
[ManageDB updateDBVersion17To18];
break;
case k_DB_version_6:
[ManageDB updateDBVersion6To7];
Expand All @@ -159,6 +165,7 @@ + (void) initDataBase {
[ManageDB updateDBVersion14To15];
[ManageDB updateDBVersion15To16];
[self updateDBVersion16To17];
[ManageDB updateDBVersion17To18];
break;
case k_DB_version_7:
[self updateDBVersion7To8];
Expand All @@ -171,6 +178,7 @@ + (void) initDataBase {
[ManageDB updateDBVersion14To15];
[ManageDB updateDBVersion15To16];
[self updateDBVersion16To17];
[ManageDB updateDBVersion17To18];
break;
case k_DB_version_8:
[ManageDB updateDBVersion8To9];
Expand All @@ -182,6 +190,7 @@ + (void) initDataBase {
[ManageDB updateDBVersion14To15];
[ManageDB updateDBVersion15To16];
[self updateDBVersion16To17];
[ManageDB updateDBVersion17To18];
break;
case k_DB_version_9:
[ManageDB updateDBVersion9To10];
Expand All @@ -192,6 +201,7 @@ + (void) initDataBase {
[ManageDB updateDBVersion14To15];
[ManageDB updateDBVersion15To16];
[self updateDBVersion16To17];
[ManageDB updateDBVersion17To18];
break;
case k_DB_version_10:
[ManageDB updateDBVersion10To11];
Expand All @@ -201,6 +211,7 @@ + (void) initDataBase {
[ManageDB updateDBVersion14To15];
[ManageDB updateDBVersion15To16];
[self updateDBVersion16To17];
[ManageDB updateDBVersion17To18];
break;
case k_DB_version_11:
[ManageDB updateDBVersion11To12];
Expand All @@ -209,6 +220,7 @@ + (void) initDataBase {
[ManageDB updateDBVersion14To15];
[ManageDB updateDBVersion15To16];
[self updateDBVersion16To17];
[ManageDB updateDBVersion17To18];
break;
case k_DB_version_12:
[ManageDB updateDBVersion12To13];
Expand All @@ -219,24 +231,32 @@ + (void) initDataBase {
[ManageDB updateDBVersion14To15];
[ManageDB updateDBVersion15To16];
[self updateDBVersion16To17];
[ManageDB updateDBVersion17To18];
break;
case k_DB_version_13:
[ManageDB updateDBVersion13To14];
[ManageDB updateDBVersion14To15];
[ManageDB updateDBVersion15To16];
[self updateDBVersion16To17];
[ManageDB updateDBVersion17To18];
break;
case k_DB_version_14:
[ManageDB updateDBVersion14To15];
[ManageDB updateDBVersion15To16];
[self updateDBVersion16To17];
[ManageDB updateDBVersion17To18];
break;
case k_DB_version_15:
[ManageDB updateDBVersion15To16];
[self updateDBVersion16To17];
[ManageDB updateDBVersion17To18];
break;
case k_DB_version_16:
[self updateDBVersion16To17];
[ManageDB updateDBVersion17To18];
break;
case k_DB_version_17:
[ManageDB updateDBVersion17To18];
break;
}
}
Expand Down
7 changes: 4 additions & 3 deletions Owncloud iOs Client/DataBase/Queries/ManageAppSettingsDB.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,13 @@
* Methods manage instant uploads photos
*/
+(BOOL)isInstantUpload;
+(BOOL)isBackgroundInstantUpload;
+(void)updateInstantUploadTo:(BOOL)instantUpload;
+(void)updateBackgroundInstantUploadTo:(BOOL)newValue;
+(void)updatePathInstantUpload:(NSString *)newValue;
+(void)updateDateInstantUpload:(long )newValue;
+(void)updateInstantUploadAllUser;
+(long)getDateInstantUpload;
+(NSTimeInterval)getTimestampInstantUpload;
+(void)updateTimestampInstantUpload:(NSTimeInterval)newValue;
+(void)updateOnlyWifiInstantUpload:(BOOL)newValue;


@end