Эх сурвалжийг харах

fix CCActions.swift line 88 2.17.2 (00005)

Marino Faggiana 8 жил өмнө
parent
commit
5f14f3871c

+ 1 - 1
Nextcloud.xcodeproj/project.pbxproj

@@ -3277,6 +3277,7 @@
 				F70F02A81C889183008DAB36 /* Libraries external */,
 				F75EDFA41E8C106900E6F369 /* Analytics */,
 				F7A377131EB2364A002856D3 /* Fabric */,
+				F7C1CDD91E6DFC6F005D92BE /* Brand */,
 				F7A582D71A24DAB500E903D7 /* AppDelegate.h */,
 				F7A582D61A24DAB500E903D7 /* AppDelegate.m */,
 				F7C8C1901B482CEA0048180E /* CCGlobal.h */,
@@ -3284,7 +3285,6 @@
 				F7C1CDCE1E6DFAD1005D92BE /* CCStandardImages.h */,
 				F78088E51DD3A1DB005C5A7C /* cryptocloud.xcdatamodeld */,
 				F7F67BB81A24D27800EE80DA /* Images.xcassets */,
-				F7C1CDD91E6DFC6F005D92BE /* Brand */,
 				F70211F31BAC56E9003FC03E /* Main */,
 				F720E02A1E48C74C001A4B9E /* Actions */,
 				F7A321621E9E37960069AD1B /* Activity */,

BIN
Nextcloud.xcodeproj/project.xcworkspace/xcuserdata/marinofaggiana.xcuserdatad/UserInterfaceState.xcuserstate


+ 6 - 6
Nextcloud.xcodeproj/xcuserdata/marinofaggiana.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -6,16 +6,16 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "No"
+            shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "iOSClient/Networking/CCNetworking.m"
-            timestampString = "515582995.152017"
+            filePath = "iOSClient/Main/CCDetail.m"
+            timestampString = "515584360.274905"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1340"
-            endingLineNumber = "1340"
-            landmarkName = "-uploadFileSuccessFailure:fileName:fileID:rev:date:serverUrl:errorCode:"
+            startingLineNumber = "1083"
+            endingLineNumber = "1083"
+            landmarkName = "-deleteButtonPressed:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

+ 11 - 1
iOSClient/Actions/CCActions.swift

@@ -85,9 +85,19 @@ class CCActions: NSObject {
 
     func deleteFileOrFolder(_ metadata: CCMetadata, delegate: AnyObject) {
         
-        let serverUrl = CCCoreData.getServerUrl(fromDirectoryID: metadata.directoryID, activeAccount: appDelegate.activeAccount)!
+        let serverUrl = CCCoreData.getServerUrl(fromDirectoryID: metadata.directoryID, activeAccount: appDelegate.activeAccount)
         let metadataNet: CCMetadataNet = CCMetadataNet.init(account: appDelegate.activeAccount)
 
+        // fix CCActions.swift line 88 2.17.2 (00005)
+        if (serverUrl == nil) {
+            
+            print("[LOG] Server URL not found \(metadata.directoryID)")
+            
+            appDelegate.messageNotification("_delete_", description: "_file_not_found_reload_", visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error)
+            
+            return
+        }
+        
         if metadata.cryptated == true {
             
             metadataNet.action = actionDeleteFileDirectory