fix

iOSClient/AppDelegate.m

@@ -1317,7 +1317,7 @@
         return;
     
     NSArray *uploadInQueue = [CCCoreData getTableMetadataUploadAccount:app.activeAccount];
-    NSArray *recordAutomaticUploadInLock =  [[NCManageDatabase sharedInstance] getLockAutomaticUploadForAccount:_activeAccount];
+    NSArray *recordAutomaticUploadInLock =  [[NCManageDatabase sharedInstance] getLockAutomaticUpload];
     
     for (tableAutomaticUpload *tableAutomaticUpload in recordAutomaticUploadInLock) {
         
@@ -1334,13 +1334,13 @@
 
     // ------------------------- <selectorUploadAutomatic> -------------------------
     
-    metadataNet = [[NCManageDatabase sharedInstance] getAutomaticUploadForAccount:self.activeAccount selector:selectorUploadAutomatic];
+    metadataNet = [[NCManageDatabase sharedInstance] getAutomaticUpload:selectorUploadAutomatic];
     counterUpload = [self getNumberUploadInQueues] + [self getNumberUploadInQueuesWWan];
     while (metadataNet && counterUpload < k_maxConcurrentOperationDownloadUpload) {
         
         [[CCNetworking sharedNetworking] uploadFileFromAssetLocalIdentifier:metadataNet.assetLocalIdentifier fileName:metadataNet.fileName serverUrl:metadataNet.serverUrl cryptated:metadataNet.cryptated session:metadataNet.session taskStatus:metadataNet.taskStatus selector:metadataNet.selector selectorPost:metadataNet.selectorPost errorCode:metadataNet.errorCode delegate:app.activeMain];
         
-        metadataNet =  [[NCManageDatabase sharedInstance] getAutomaticUploadForAccount:self.activeAccount selector:selectorUploadAutomatic];
+        metadataNet =  [[NCManageDatabase sharedInstance] getAutomaticUpload:selectorUploadAutomatic];
         counterUpload++;
     }
     
@@ -1355,7 +1355,7 @@
         return;
     }
     
-    metadataNet =  [[NCManageDatabase sharedInstance] getAutomaticUploadForAccount:self.activeAccount selector:selectorUploadAutomaticAll];
+    metadataNet =  [[NCManageDatabase sharedInstance] getAutomaticUpload:selectorUploadAutomaticAll];
     counterUpload = [self getNumberUploadInQueues] + [self getNumberUploadInQueuesWWan];
     while (metadataNet && counterUpload < k_maxConcurrentOperationDownloadUpload) {
         
@@ -1371,10 +1371,10 @@
             
             [[NCManageDatabase sharedInstance] addActivityClient:metadataNet.fileName fileID:metadataNet.assetLocalIdentifier action:k_activityDebugActionUpload selector:selectorUploadAutomatic note:@"Internal error image/video not found [0]" type:k_activityTypeFailure verbose:k_activityVerboseHigh account:_activeAccount activeUrl:_activeUrl];
             
-            [[NCManageDatabase sharedInstance] deleteAutomaticUploadForAccount:_activeAccount assetLocalIdentifier:metadataNet.assetLocalIdentifier];
+            [[NCManageDatabase sharedInstance] deleteAutomaticUpload:metadataNet.assetLocalIdentifier];
         }
         
-        metadataNet =  [[NCManageDatabase sharedInstance] getAutomaticUploadForAccount:self.activeAccount selector:selectorUploadAutomaticAll];
+        metadataNet =  [[NCManageDatabase sharedInstance] getAutomaticUpload:selectorUploadAutomaticAll];
     }
 }
 

iOSClient/FileSystem/NCManageDatabase.swift

@@ -500,11 +500,17 @@ class NCManageDatabase: NSObject {
     //MARK: -
     //MARK: Table Automatic Upload
     
-    func addAutomaticUpload(_ metadataNet: CCMetadataNet, account: String) -> Bool {
+    func addAutomaticUpload(_ metadataNet: CCMetadataNet) -> Bool {
         
         let realm = try! Realm()
         
-        let results = realm.objects(tableAutomaticUpload.self).filter("account = %@ AND assetLocalIdentifier = %@", account, metadataNet.assetLocalIdentifier)
+        let tableAccount = self.getAccountActive()
+        
+        if tableAccount == nil {
+            return false
+        }
+            
+        let results = realm.objects(tableAutomaticUpload.self).filter("account = %@ AND assetLocalIdentifier = %@", tableAccount!.account, metadataNet.assetLocalIdentifier)
         if (results.count > 0) {
             return false
         }
@@ -514,7 +520,7 @@ class NCManageDatabase: NSObject {
             // Add new AutomaticUpload
             let addAutomaticUpload = tableAutomaticUpload()
             
-            addAutomaticUpload.account = account
+            addAutomaticUpload.account = tableAccount!.account
             addAutomaticUpload.assetLocalIdentifier = metadataNet.assetLocalIdentifier
             addAutomaticUpload.fileName = metadataNet.fileName
             addAutomaticUpload.selector = metadataNet.selector
@@ -531,11 +537,17 @@ class NCManageDatabase: NSObject {
         return true
     }
     
-    func getAutomaticUploadForAccount(_ account: String, selector: String) -> CCMetadataNet? {
+    func getAutomaticUpload(_ selector: String) -> CCMetadataNet? {
         
         let realm = try! Realm()
         
-        let results = realm.objects(tableAutomaticUpload.self).filter("account = %@ AND selector = %@ AND lock == false", account, selector)
+        let tableAccount = self.getAccountActive()
+        
+        if tableAccount == nil {
+            return nil
+        }
+        
+        let results = realm.objects(tableAutomaticUpload.self).filter("account = %@ AND selector = %@ AND lock == false", tableAccount!.account, selector)
         if (results.count == 0) {
             return nil
         }
@@ -560,11 +572,17 @@ class NCManageDatabase: NSObject {
         return metadataNet
     }
     
-    func getLockAutomaticUploadForAccount(_ account: String) -> [tableAutomaticUpload] {
+    func getLockAutomaticUpload() -> [tableAutomaticUpload]? {
         
         let realm = try! Realm()
         
-        let results = realm.objects(tableAutomaticUpload.self).filter("account = %@ AND lock = true", account)
+        let tableAccount = self.getAccountActive()
+        
+        if tableAccount == nil {
+            return nil
+        }
+        
+        let results = realm.objects(tableAutomaticUpload.self).filter("account = %@ AND lock = true", tableAccount!.account)
         
         return Array(results)
     }
@@ -583,15 +601,20 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    func deleteAutomaticUploadForAccount(_ account: String, assetLocalIdentifier: String) {
+    func deleteAutomaticUpload(_ assetLocalIdentifier: String) {
         
         let realm = try! Realm()
         
-        let results = realm.objects(tableAutomaticUpload.self).filter("account = %@ AND assetLocalIdentifier = %@", account, assetLocalIdentifier)
-        if (results.count > 0) {
+        let tableAccount = self.getAccountActive()
+        
+        if tableAccount != nil {
+        
+            let results = realm.objects(tableAutomaticUpload.self).filter("account = %@ AND assetLocalIdentifier = %@", tableAccount!.account, assetLocalIdentifier)
+            if (results.count > 0) {
             
-            try! realm.write {
-                realm.delete(results)
+                try! realm.write {
+                    realm.delete(results)
+                }
             }
         }
     }

iOSClient/Networking/CCNetworking.m

@@ -1285,7 +1285,7 @@
         
         // Delete record on Table Automatic Upload
         if ([selector isEqualToString:selectorUploadAutomatic] || [selector isEqualToString:selectorUploadAutomaticAll])
-            [[NCManageDatabase sharedInstance] deleteAutomaticUploadForAccount:_activeAccount assetLocalIdentifier:assetLocalIdentifier];
+            [[NCManageDatabase sharedInstance] deleteAutomaticUpload:assetLocalIdentifier];
         
         NSLog(@"[LOG] Upload file %@ - %@ TaskIdentifier %lu", fileName,fileNamePrint, (unsigned long)uploadTask.taskIdentifier);
     }

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -1284,7 +1284,8 @@
 
                     [[NCManageDatabase sharedInstance] addActivityClient:metadataNet.fileName fileID:metadataNet.assetLocalIdentifier action:k_activityDebugActionUpload selector:metadataNet.selector note:note type:k_activityTypeFailure verbose:k_activityVerboseDefault account:app.activeAccount activeUrl:app.activeUrl];
                     
-                    [[NCManageDatabase sharedInstance] deleteAutomaticUploadForAccount:appDelegate.activeAccount assetLocalIdentifier:metadataNet.assetLocalIdentifier];
+                    [[NCManageDatabase sharedInstance] deleteAutomaticUpload:metadataNet.assetLocalIdentifier];
+                    
                 } else {
                     
                     [self addDatabaseAutomaticUpload:metadataNet assetDate:assetDate assetMediaType:assetMediaType];
@@ -1295,10 +1296,8 @@
 }
 
 - (void)addDatabaseAutomaticUpload:(CCMetadataNet *)metadataNet assetDate:(NSDate *)assetDate assetMediaType:(PHAssetMediaType)assetMediaType
-{
-    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
-    
-    if ([[NCManageDatabase sharedInstance] addAutomaticUpload:metadataNet account:appDelegate.activeAccount]) {
+{    
+    if ([[NCManageDatabase sharedInstance] addAutomaticUpload:metadataNet]) {
         
         [[NCManageDatabase sharedInstance] addActivityClient:metadataNet.fileName fileID:metadataNet.assetLocalIdentifier action:k_activityDebugActionAutomaticUpload selector:metadataNet.selector note:[NSString stringWithFormat:@"Add Automatic Upload, Asset Data: %@", [NSDateFormatter localizedStringFromDate:assetDate dateStyle:NSDateFormatterMediumStyle timeStyle:NSDateFormatterMediumStyle]] type:k_activityTypeInfo verbose:k_activityVerboseHigh account:app.activeAccount activeUrl:app.activeUrl];
        

iOSClient/Share/CCShareOC.m

@@ -150,10 +150,12 @@
 
 - (void)reloadData
 {
-    self.shareLink = [app.sharesLink objectForKey:[self.serverUrl stringByAppendingString:self.metadata.fileName]];
-    self.shareUserAndGroup = [app.sharesUserAndGroup objectForKey:[self.serverUrl stringByAppendingString:self.metadata.fileName]];
+    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    
+    self.shareLink = [appDelegate.sharesLink objectForKey:[self.serverUrl stringByAppendingString:self.metadata.fileName]];
+    self.shareUserAndGroup = [appDelegate.sharesUserAndGroup objectForKey:[self.serverUrl stringByAppendingString:self.metadata.fileName]];
 
-    self.itemShareLink = [app.sharesID objectForKey:self.shareLink];
+    self.itemShareLink = [appDelegate.sharesID objectForKey:self.shareLink];
     if ([self.shareUserAndGroup length] > 0) self.itemsUserAndGroupLink = [self.shareUserAndGroup componentsSeparatedByString:@","];
     else self.itemsUserAndGroupLink = nil;