marinofaggiana 4 years ago
parent
commit
d80633d610
2 changed files with 3 additions and 3 deletions
  1. 2 2
      iOSClient/AppDelegate.m
  2. 1 1
      iOSClient/Networking/NCNetworkingE2EE.swift

+ 2 - 2
iOSClient/AppDelegate.m

@@ -545,7 +545,7 @@
 
     [[NCCommunication shared] unsubscribingPushNotificationWithServerUrl:url account:account user:user password:[CCUtility getPassword:account] customUserAgent:nil addCustomHeaders:nil completionHandler:^(NSString *account, NSInteger errorCode, NSString *errorDescription) {
         if (errorCode == 0) {
-            [[NCCommunication shared] unsubscribingPushProxyWithProxyServerUrl:url deviceIdentifier:deviceIdentifier signature:signature publicKey:publicKey completionHandler:^(NSInteger errorCode, NSString *errorDescription) {
+            //[[NCCommunication shared] unsubscribingPushProxyWithProxyServerUrl:url deviceIdentifier:deviceIdentifier signature:signature publicKey:publicKey  completionHandler:^(NSInteger errorCode, NSString *errorDescription) {
                 if (errorCode == 0) {
                 
                     NSLog(@"[LOG] Unsubscribed to Push Notification server & proxy successfully.");
@@ -561,7 +561,7 @@
                         [self subscribingNextcloudServerPushNotification:account url:url user:user];
                     }
                 }
-            }];
+            //}];
         }
     }];
 }

+ 1 - 1
iOSClient/Networking/NCNetworkingE2EE.swift

@@ -187,7 +187,7 @@ import CFNetwork
         var e2eMetadataKey = ""
         var e2eMetadataKeyIndex = 0
         let serverUrl = metadata.serverUrl
-        let fileNameLocalPath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)!
+        let fileNameLocalPath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileName)!
         let serverUrlFileName = serverUrl + "/" + metadata.fileName
         
         if NCEndToEndEncryption.sharedManager()?.encryptFileName(metadata.fileNameView, fileNameIdentifier: metadata.fileName, directory: CCUtility.getDirectoryProviderStorageOcId(metadata.ocId), key: &key, initializationVector: &initializationVector, authenticationTag: &authenticationTag) == false {