Marino Faggiana 6 anni fa
parent
commit
76a296e563

+ 3 - 1
File Provider Extension/FileProviderExtension+Thumbnail.swift

@@ -43,7 +43,9 @@ extension FileProviderExtension {
                 
                 if (metadata!.typeFile == k_metadataTypeFile_image || metadata!.typeFile == k_metadataTypeFile_video) {
                     
-                    let serverUrl = NCManageDatabase.sharedInstance.getServerUrl(metadata!.directoryID)
+                    guard let serverUrl = NCManageDatabase.sharedInstance.getServerUrl(metadata!.directoryID) else {
+                        continue
+                    }
                     let fileNamePath = CCUtility.returnFileNamePath(fromFileName: metadata!.fileName, serverUrl: serverUrl, activeUrl: providerData.accountUrl)
                     
                     let ocNetworking = OCnetworking.init(delegate: nil, metadataNet: nil, withUser: providerData.accountUser, withUserID: providerData.accountUserID, withPassword: providerData.accountPassword, withUrl: providerData.accountUrl)

+ 3 - 1
iOSClient/Favorites/CCFavorites.m

@@ -178,6 +178,8 @@
     for (tableMetadata *metadata in metadatas) {
         
         NSString *serverUrl = [[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID];
+        if (!serverUrl)
+            continue;
         
         [ocNetworking deleteFileOrFolder:metadata.fileName serverUrl:serverUrl completion:^(NSString *message, NSInteger errorCode) {
             
@@ -757,7 +759,7 @@
         
         // File do not exists
         NSString *serverUrl = [[NCManageDatabase sharedInstance] getServerUrl:_metadata.directoryID];
-
+        
         if (serverUrl) {
             
             if ([CCUtility fileProviderStorageExists:_metadata.fileID fileName:_metadata.fileNameView]) {

+ 2 - 0
iOSClient/Main/CCDetail.m

@@ -909,6 +909,8 @@
     for (tableMetadata *metadata in metadatas) {
         
         NSString *serverUrl = [[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID];
+        if (!serverUrl)
+            continue;
         
         [ocNetworking deleteFileOrFolder:metadata.fileName serverUrl:serverUrl completion:^(NSString *message, NSInteger errorCode) {
             

+ 2 - 0
iOSClient/Main/CCMain.m

@@ -1805,6 +1805,8 @@
     for (tableMetadata *metadata in metadatas) {
         
         NSString *serverUrl = [[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID];
+        if (!serverUrl)
+            continue;
         
         [ocNetworking deleteFileOrFolder:metadata.fileName serverUrl:serverUrl completion:^(NSString *message, NSInteger errorCode) {
             

+ 4 - 0
iOSClient/Photos/CCPhotos.m

@@ -406,6 +406,8 @@
     for (tableMetadata *metadata in metadatas) {
     
         NSString *serverUrl = [[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID];
+        if (!serverUrl)
+            continue;
         
         [ocNetworking deleteFileOrFolder:metadata.fileName serverUrl:serverUrl completion:^(NSString *message, NSInteger errorCode) {
             
@@ -487,6 +489,8 @@
     if (![saveDirectoryID isEqualToString:metadata.directoryID]) {
         saveDirectoryID = metadata.directoryID;
         saveServerUrl = [[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID];
+        if (!saveServerUrl)
+            return;
     }
     
     OCnetworking *ocNetworking = [[OCnetworking alloc] initWithDelegate:nil metadataNet:nil withUser:appDelegate.activeUser withUserID:appDelegate.activeUserID withPassword:appDelegate.activePassword withUrl:appDelegate.activeUrl];

+ 2 - 1
iOSClient/Settings/CCSettings.m

@@ -386,7 +386,8 @@
         if (metadata.directory) {
         
             NSString *serverUrl = [[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID];
-            if (!serverUrl) continue;
+            if (!serverUrl)
+                continue;
             
             serverUrl = [CCUtility stringAppendServerUrl:serverUrl addFileName:metadata.fileName];
 

+ 1 - 1
iOSClient/Synchronize/CCSynchronize.m

@@ -382,9 +382,9 @@
         // Clear date for dorce refresh view
         if (![oldDirectoryID isEqualToString:metadata.directoryID]) {
             serverUrl = [[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID];
-            oldDirectoryID = metadata.directoryID;
             if (!serverUrl)
                 continue;
+            oldDirectoryID = metadata.directoryID;
             [[NCManageDatabase sharedInstance] clearDateReadWithServerUrl:serverUrl directoryID:nil];
         }