Build 6

Brand/Database.swift

@@ -26,4 +26,4 @@ import Foundation
 // Database Realm
 //
 let databaseName                    = "nextcloud.realm"
-let databaseSchemaVersion: UInt64   = 320
+let databaseSchemaVersion: UInt64   = 321

Nextcloud.xcodeproj/project.pbxproj

@@ -4713,7 +4713,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -4778,7 +4778,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;

iOSClient/Utility/NCKeychain.swift

@@ -311,7 +311,11 @@ import KeychainAccess
 
     private func migrate(key: String) {
         let keychainOLD = Keychain(service: "Crypto Cloud")
-        if let value = keychainOLD[key], !value.isEmpty {
+        if key.starts(with: "PNPublicKey") || key.starts(with: "PNPrivateKey") {
+            if let data = try? keychainOLD.getData(key), !data.isEmpty {
+                keychain[data: key] = data
+            }
+        } else if let value = keychainOLD[key], !value.isEmpty {
             keychain[key] = value
             keychainOLD[key] = nil
         }