소스 검색

Select type of session

Marino Faggiana 8 년 전
부모
커밋
b601293a27
4개의 변경된 파일10개의 추가작업 그리고 14개의 파일을 삭제
  1. 3 5
      iOSClient/AppDelegate.m
  2. 1 0
      iOSClient/FileSystem/CCCoreData.m
  3. 1 1
      iOSClient/Main/CCMain.m
  4. 5 8
      iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

+ 3 - 5
iOSClient/AppDelegate.m

@@ -392,12 +392,10 @@
 
 - (void)verifyProcess
 {
-    NSMutableArray *metadatasNet = [self verifyExistsInQueuesUploadSelector:selectorUploadAutomaticAll];
-    
-    NSLog(@"5 sec. %lu", [metadatasNet count]);
-    
-    
+    // Verify Synchronized Folder
+    NSMutableArray *metadatasNet = [self verifyExistsInQueuesUploadSelector:selectorDownloadSynchronized];
     
+    //NSLog(@"5 sec. %lu", (unsigned long)[metadatasNet count]);
 }
 
 #pragma --------------------------------------------------------------------------------------------

+ 1 - 0
iOSClient/FileSystem/CCCoreData.m

@@ -1519,6 +1519,7 @@
         metadataNet.taskStatus = taskStatusResume;                          // Default
         
         if (delete) {                                                       // Remove record
+            
             [record MR_deleteEntityInContext:context];
             [context MR_saveToPersistentStoreAndWait];
         }

+ 1 - 1
iOSClient/Main/CCMain.m

@@ -335,7 +335,7 @@
             
             if ([metadatasNet count] > 0) {
                 
-                messageDebug = [NSString stringWithFormat:@"DEBUG UploadAutomaticAll : %lu - %@", [metadatasNet count], metadataNet];
+                messageDebug = [NSString stringWithFormat:@"DEBUG UploadAutomaticAll : %lu - %@", (unsigned long)[metadatasNet count], metadataNet];
                 
                 [app messageNotification:@"_info_" description:messageDebug visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeInfo];
             }

+ 5 - 8
iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -1211,15 +1211,12 @@
         NSString *fileNameUpload = [CCUtility createFileNameFromAsset:asset];
         
         // Select type of session
-        if (assetsFull) {
-            session = upload_session;
-        } else {
-            if (assetMediaType == PHAssetMediaTypeImage && [CCCoreData getCameraUploadWWanPhotoActiveAccount:app.activeAccount] == NO) session = upload_session;
-            if (assetMediaType == PHAssetMediaTypeVideo && [CCCoreData getCameraUploadWWanVideoActiveAccount:app.activeAccount] == NO) session = upload_session;
-            if (assetMediaType == PHAssetMediaTypeImage && [CCCoreData getCameraUploadWWanPhotoActiveAccount:app.activeAccount]) session = upload_session_wwan;
-            if (assetMediaType == PHAssetMediaTypeVideo && [CCCoreData getCameraUploadWWanVideoActiveAccount:app.activeAccount]) session = upload_session_wwan;
-        }
         
+        if (assetMediaType == PHAssetMediaTypeImage && [CCCoreData getCameraUploadWWanPhotoActiveAccount:app.activeAccount] == NO) session = upload_session;
+        if (assetMediaType == PHAssetMediaTypeVideo && [CCCoreData getCameraUploadWWanVideoActiveAccount:app.activeAccount] == NO) session = upload_session;
+        if (assetMediaType == PHAssetMediaTypeImage && [CCCoreData getCameraUploadWWanPhotoActiveAccount:app.activeAccount]) session = upload_session_wwan;
+        if (assetMediaType == PHAssetMediaTypeVideo && [CCCoreData getCameraUploadWWanVideoActiveAccount:app.activeAccount]) session = upload_session_wwan;
+
         NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
         
         [formatter setDateFormat:@"yyyy"];