dev

iOSClient/AppDelegate.m

@@ -665,8 +665,7 @@
 
 - (void)updateApplicationIconBadgeNumber
 {
-    // Test Maintenance
-    if (self.maintenanceMode)
+    if (self.activeAccount.length == 0 || self.maintenanceMode)
         return;
     
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
@@ -1152,6 +1151,9 @@
 
 - (void)loadAutoDownloadUpload
 {
+    if (self.activeAccount.length == 0 || self.maintenanceMode)
+        return;
+    
     tableMetadata *metadataForUpload, *metadataForDownload;
     long counterDownload = 0, counterUpload = 0;
     NSUInteger sizeDownload = 0, sizeUpload = 0;
@@ -1160,10 +1162,6 @@
     long maxConcurrentOperationDownload = k_maxConcurrentOperationDownload;
     long maxConcurrentOperationUpload = k_maxConcurrentOperationUpload;
     
-    // Test Maintenance
-    if (self.maintenanceMode)
-        return;
-    
     // Detect E2EE
     NSString *saveserverUrl = @"";
     NSArray *metadatasForE2EE = [[NCManageDatabase sharedInstance] getMetadatasWithPredicate:[NSPredicate predicateWithFormat:@"account == %@ AND status != %d", self.activeAccount, k_metadataStatusNormal] sorted:nil ascending:NO];

iOSClient/Database/NCDatabase.swift

@@ -223,7 +223,7 @@ class tableMetadata: Object {
     @objc dynamic var url = ""
 
     override static func primaryKey() -> String {
-        return "metadataID"
+        return "fileID"
     }
 }
 
@@ -254,7 +254,7 @@ class tablePhotos: Object {
     @objc dynamic var url = ""
 
     override static func primaryKey() -> String {
-        return "metadataID"
+        return "fileID"
     }
 }
 

iOSClient/Database/NCManageDatabase.swift

@@ -90,6 +90,7 @@ class NCManageDatabase: NSObject {
 
             migrationBlock: { migration, oldSchemaVersion in
                 // We haven’t migrated anything yet, so oldSchemaVersion == 0
+                /*
                 if (oldSchemaVersion < 37) {
                     migration.enumerateObjects(ofType: tableMetadata.className()) { oldObject, newObject in
                         let account = oldObject!["account"] as! String
@@ -105,6 +106,7 @@ class NCManageDatabase: NSObject {
                         newObject!["metadataID"] = CCUtility.createMetadataID(fromAccount: account, serverUrl: serverUrl, fileName: fileName)
                     }
                 }
+                */
         })
 
         Realm.Configuration.defaultConfiguration = config