marinofaggiana 5 years ago
parent
commit
b5a41ed9d0

+ 2 - 2
iOSClient/AppDelegate.m

@@ -244,8 +244,8 @@
     // verify task (download/upload) lost
     [self verifyTaskLost];
     
-    // verify delete Asset Local Identifiers
-    [[NCUtility sharedInstance] deleteAssetLocalIdentifiersWithAccount:self.activeAccount];
+    // verify delete Asset Local Identifiers in auto upload
+    [[NCUtility sharedInstance] deleteAssetLocalIdentifiersWithAccount:self.activeAccount sessionSelector:selectorUploadAutoUpload];
    
     // Brand
 #if defined(HC)

+ 2 - 2
iOSClient/Database/NCManageDatabase.swift

@@ -2532,13 +2532,13 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    @objc func getAssetLocalIdentifiersUploaded(account: String) -> [String] {
+    @objc func getAssetLocalIdentifiersUploaded(account: String, sessionSelector: String) -> [String] {
         
         let realm = try! Realm()
         realm.refresh()
         var assetLocalIdentifiers = [String]()
         
-        let results = realm.objects(tableMetadata.self).filter("account == %@ AND assetLocalIdentifier != '' AND session == '' AND sessionError == ''", account)
+        let results = realm.objects(tableMetadata.self).filter("account == %@ AND assetLocalIdentifier != '' AND session == '' AND sessionError == '' AND sessionSelector == %@", account, sessionSelector)
         for result in results {
             assetLocalIdentifiers.append(result.assetLocalIdentifier)
         }

+ 2 - 2
iOSClient/Utility/NCUtility.swift

@@ -533,9 +533,9 @@ class NCUtility: NSObject {
         return image ?? UIImage()
     }
     
-    @objc func deleteAssetLocalIdentifiers(account: String) {
+    @objc func deleteAssetLocalIdentifiers(account: String, sessionSelector: String) {
         
-        let localIdentifiers = NCManageDatabase.sharedInstance.getAssetLocalIdentifiersUploaded(account: account)
+        let localIdentifiers = NCManageDatabase.sharedInstance.getAssetLocalIdentifiersUploaded(account: account, sessionSelector: sessionSelector)
         if localIdentifiers.count == 0 { return }
         let assets = PHAsset.fetchAssets(withLocalIdentifiers: localIdentifiers, options: nil)