Bläddra i källkod

remove old OPTION_OFFLINE_DISABLE

Marino Faggiana 8 år sedan
förälder
incheckning
642db2fd85

+ 3 - 3
Nextcloud.xcodeproj/project.pbxproj

@@ -3030,7 +3030,7 @@
 			path = Utility;
 			sourceTree = "<group>";
 		};
-		F7C00D411E2D0D0F0032160B /* Favorite+Offline+Synchronize */ = {
+		F7C00D411E2D0D0F0032160B /* Favorite+Synchronize */ = {
 			isa = PBXGroup;
 			children = (
 				F7C00D421E2D0D0F0032160B /* CCCellOffline.h */,
@@ -3043,7 +3043,7 @@
 				F7EC14791E5D9C0B0046F351 /* CCSynchronize.h */,
 				F7EC147A1E5D9C0B0046F351 /* CCSynchronize.m */,
 			);
-			name = "Favorite+Offline+Synchronize";
+			name = "Favorite+Synchronize";
 			path = Offline;
 			sourceTree = "<group>";
 		};
@@ -3340,7 +3340,7 @@
 				F7F9E3451BC26B19004B9223 /* Move */,
 				F74D3DB81BAC1941000BAE4B /* Networking */,
 				F7C5259A1E3B441D00FFE02C /* Notification */,
-				F7C00D411E2D0D0F0032160B /* Favorite+Offline+Synchronize */,
+				F7C00D411E2D0D0F0032160B /* Favorite+Synchronize */,
 				F7FCFFD51D70798C000E6E29 /* PeekPop */,
 				F719FDAE1CF06645004895D0 /* PhotosCameraUpload */,
 				F7BE6E2A1D2D5C3B00106933 /* QuickActions */,

+ 0 - 5
iOSClient/AppDelegate.m

@@ -355,11 +355,6 @@
         NSLog(@"[LOG] Initialize Camera Upload");
         [[NSNotificationCenter defaultCenter] postNotificationName:@"initStateCameraUpload" object:nil];
         
-#ifndef OPTION_OFFLINE_DISABLE
-        NSLog(@"[LOG] files Offline");
-        [[CCSynchronize sharedSynchronize] readOffline];
-#endif
-        
         NSLog(@"[LOG] Listning Favorites");
         [[CCSynchronize sharedSynchronize] readListingFavorites];        
     });

+ 0 - 3
iOSClient/Brand/CCNextcloudConstant.h

@@ -54,9 +54,7 @@
 /*
  #define OPTION_MULTIUSER_DISABLE
  #define OPTION_CRYPTO_CLOUD_SYSTEM_DISABLE
- #define OPTION_OFFLINE_DISABLE
  
- #define OPTION_NOTIFICATION_PUSH_ENABLE
  #define OPTION_FIREBASE_ENABLE
  #define OPTION_AUTOMATIC_UPLOAD_ENABLE
  #define OPTION_DISABLE_INTRO
@@ -64,7 +62,6 @@
  #define NO_REQUEST_LOGIN_URL
  */
 
-#define OPTION_OFFLINE_DISABLE
 #define OPTION_FIREBASE_ENABLE
 
 // -----------------------------------------------------------------------------------------------------------

+ 1 - 21
iOSClient/Main/CCMain.m

@@ -5182,27 +5182,7 @@
         cell.labelInfoFile.text = [CCUtility dateDiff:metadata.date];
         
         lunghezzaFile = @" ";
-        
-#ifndef OPTION_OFFLINE_DISABLE
-
-        // ----------------------------------------------------------------------------------------------------------
-        // Offline Folder
-        // ----------------------------------------------------------------------------------------------------------
-        
-        BOOL isOfflineDirectory = [CCCoreData isOfflineDirectoryServerUrl:directoryServerUrl activeAccount:app.activeAccount];
-
-        // Verify Offline
-        if (_isOfflineServerUrl == YES && isOfflineDirectory == NO) {
-            [CCCoreData setOfflineDirectoryServerUrl:directoryServerUrl offline:YES activeAccount:app.activeAccount];
-            isOfflineDirectory = YES;
-        }
-        
-        if (isOfflineDirectory) {
-            
-            cell.offlineImageView.image = [UIImage imageNamed:image_offline];
-        }
-#endif
-        
+                
         // ----------------------------------------------------------------------------------------------------------
         // Favorite Folder
         // ----------------------------------------------------------------------------------------------------------

+ 0 - 4
iOSClient/Offline/CCOfflineContainer.m

@@ -70,11 +70,7 @@
     
     // Create data model
 
-#ifdef OPTION_OFFLINE_DISABLE
     _pageType = @[k_pageOfflineFavorites, k_pageOfflineLocal];
-#else
-    _pageType = @[k_pageOfflineFavorites, k_pageOfflineOffline, k_pageOfflineLocal];
-#endif
     
     _currentPageType = k_pageOfflineFavorites;
     self.title = NSLocalizedString(@"_favorites_", nil);