Marino Faggiana 7 年之前
父节点
当前提交
78de256465
共有 1 个文件被更改,包括 22 次插入19 次删除
  1. 22 19
      iOSClient/AutoUpload/NCAutoUpload.m

+ 22 - 19
iOSClient/AutoUpload/NCAutoUpload.m

@@ -433,14 +433,14 @@
             [self addDatabaseAutoUploadAndPhotoLibrary:metadataNet asset:asset];
     }
     
-    // Insert all assets (Full) in TableAutoUpload
-    if (assetsFull && [metadataNetFull count] > 0) {
+        // Insert all assets (Full) in TableAutoUpload
+        if (assetsFull && [metadataNetFull count] > 0) {
     
-        [[NCManageDatabase sharedInstance] addAutoUploadWithMetadatasNet:metadataNetFull];
-          
-        // Update icon badge number
-        [app updateApplicationIconBadgeNumber];
-    }
+            [[NCManageDatabase sharedInstance] addAutoUploadWithMetadatasNet:metadataNetFull];
+        
+            // Update icon badge number
+            [app updateApplicationIconBadgeNumber];
+        }
     
     // end loading
     [_hud hideHud];
@@ -448,23 +448,26 @@
 
 - (void)addDatabaseAutoUploadAndPhotoLibrary:(CCMetadataNet *)metadataNet asset:(PHAsset *)asset
 {
-    if ([[NCManageDatabase sharedInstance] addAutoUploadWithMetadataNet:metadataNet]) {
+    @synchronized(self) {
         
-        [[NCManageDatabase sharedInstance] addActivityClient:metadataNet.fileName fileID:metadataNet.assetLocalIdentifier action:k_activityDebugActionAutoUpload selector:metadataNet.selector note:@"Add Auto Upload, add new asset" type:k_activityTypeInfo verbose:k_activityVerboseHigh activeUrl:app.activeUrl];
+        if ([[NCManageDatabase sharedInstance] addAutoUploadWithMetadataNet:metadataNet]) {
         
-    } else {
+            [[NCManageDatabase sharedInstance] addActivityClient:metadataNet.fileName fileID:metadataNet.assetLocalIdentifier action:k_activityDebugActionAutoUpload selector:metadataNet.selector note:@"Add Auto Upload, add new asset" type:k_activityTypeInfo verbose:k_activityVerboseHigh activeUrl:app.activeUrl];
         
-        [[NCManageDatabase sharedInstance] addActivityClient:metadataNet.fileName fileID:metadataNet.assetLocalIdentifier action:k_activityDebugActionAutoUpload selector:metadataNet.selector note:@"Add Auto Upload, asset already present" type:k_activityTypeInfo verbose:k_activityVerboseHigh activeUrl:app.activeUrl];
-    }
+        } else {
+    
+            [[NCManageDatabase sharedInstance] addActivityClient:metadataNet.fileName fileID:metadataNet.assetLocalIdentifier action:k_activityDebugActionAutoUpload selector:metadataNet.selector note:@"Add Auto Upload, asset already present" type:k_activityTypeInfo verbose:k_activityVerboseHigh activeUrl:app.activeUrl];
+        }
     
-    // Add asset in table Photo Library
-    if ([metadataNet.selector isEqualToString:selectorUploadAutoUpload])
-        [[NCManageDatabase sharedInstance] addPhotoLibrary:@[asset]];
+        // Add asset in table Photo Library
+        if ([metadataNet.selector isEqualToString:selectorUploadAutoUpload])
+            [[NCManageDatabase sharedInstance] addPhotoLibrary:@[asset]];
         
-    dispatch_async(dispatch_get_main_queue(), ^{
-        // Update icon badge number
-        [app updateApplicationIconBadgeNumber];
-    });
+        dispatch_async(dispatch_get_main_queue(), ^{
+            // Update icon badge number
+            [app updateApplicationIconBadgeNumber];
+        });
+    }
 }
 
 #pragma --------------------------------------------------------------------------------------------