Forráskód Böngészése

Change function loadAutomaticUpload

Marino Faggiana 8 éve
szülő
commit
4799c41b8f

+ 2 - 2
iOSClient/AppDelegate.m

@@ -379,8 +379,6 @@
 - (void)verifyProcess
 {
 // BACKGROND & FOREGROUND
-    
-    [app performSelectorOnMainThread:@selector(loadAutomaticUpload) withObject:nil waitUntilDone:NO];
 
 // ONLY BACKGROUND
     
@@ -390,6 +388,8 @@
     } else {
 
 // ONLY FOREFROUND
+        
+        [app performSelectorOnMainThread:@selector(loadAutomaticUpload) withObject:nil waitUntilDone:NO];
     
     }
 }

+ 2 - 2
iOSClient/ManageLocation+ManageAsset/CCManageAsset.m

@@ -110,9 +110,9 @@
             [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantFuture]];
     }
     
-    // Video - Foreground
+    // Video
     
-    if ([CCCoreData getCameraUploadVideoActiveAccount:app.activeAccount] && !([[UIApplication sharedApplication] applicationState] == UIApplicationStateBackground)) {
+    if ([CCCoreData getCameraUploadVideoActiveAccount:app.activeAccount]) {
         
         dispatch_semaphore_t semaphoreAsset = dispatch_semaphore_create(0);
         

+ 0 - 4
iOSClient/Settings/CCManageCameraUpload.m

@@ -468,10 +468,6 @@
         case 0:
             sectionName = [CCUtility localizableBrand:@"_photo_folder_photocamera_" table:nil];
             break;
-        case 2:
-            if ([CCCoreData getCameraUploadActiveAccount:app.activeAccount]) sectionName = [CCUtility localizableBrand:@"_upload_automatic_videos_footer_" table:nil ];
-            else sectionName = @"";
-            break;
         case 3:
             if ([CCCoreData getCameraUploadActiveAccount:app.activeAccount]) sectionName = [CCUtility localizableBrand:@"_photo_folder_background_" table:nil];
             else sectionName = @"";

+ 0 - 1
iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -157,7 +157,6 @@
 "_upload_automatic_photos_" = "Upload camera photos automatically";
 "_upload_automatic_videos_" = "Upload camera videos automatically";
 "_photo_folder_photocamera_"= "The photos will be uploaded to the folder 'photos' in your Cloud";
-"_upload_automatic_videos_footer_"  = "Due to the use of the CPU, the videos will be sent only when _brand_ is active and in the foreground.";
 "_photo_folder_background_"         = "This option requires the use of GPS to trigger the detection of new photos in the camera roll once the location changes significantly";
 "_cameraupload_background_title_"   = "Limitations";
 "_cameraupload_background_msg_"     = "Due to IOS restrictions, it is not yet possible to perform background processes, unless GPS services are activated. Once the cell in the cellular network is changed, the system wakes up _brand_ for a short time and checks for new photos to upload to the cloud.";