Marino Faggiana hai 1 ano
pai
achega
e5fa84af6c
Modificáronse 2 ficheiros con 4 adicións e 3 borrados
  1. 0 1
      iOSClient/NCGlobal.swift
  2. 4 2
      iOSClient/Utility/NCKeychain.swift

+ 0 - 1
iOSClient/NCGlobal.swift

@@ -79,7 +79,6 @@ class NCGlobal: NSObject {
 
 
     // Service
     // Service
     //
     //
-    @objc let serviceShareKeyChain                  = "Crypto Cloud"
     let metadataKeyedUnarchiver                     = "it.twsweb.nextcloud.metadata"
     let metadataKeyedUnarchiver                     = "it.twsweb.nextcloud.metadata"
     let refreshTask                                 = "com.nextcloud.refreshTask"
     let refreshTask                                 = "com.nextcloud.refreshTask"
     let processingTask                              = "com.nextcloud.processingTask"
     let processingTask                              = "com.nextcloud.processingTask"

+ 4 - 2
iOSClient/Utility/NCKeychain.swift

@@ -56,7 +56,7 @@ import KeychainAccess
 
 
     @objc var requestPasscodeAtStart: Bool {
     @objc var requestPasscodeAtStart: Bool {
         get {
         get {
-            let keychainOLD = Keychain(service: NCGlobal.shared.serviceShareKeyChain)
+            let keychainOLD = Keychain(service: "Crypto Cloud")
             if let value = keychainOLD["notPasscodeAtStart"], !value.isEmpty {
             if let value = keychainOLD["notPasscodeAtStart"], !value.isEmpty {
                 if value == "true" {
                 if value == "true" {
                     keychain["requestPasscodeAtStart"] = "false"
                     keychain["requestPasscodeAtStart"] = "false"
@@ -310,7 +310,7 @@ import KeychainAccess
     // MARK: -
     // MARK: -
 
 
     private func migrate(key: String) {
     private func migrate(key: String) {
-        let keychainOLD = Keychain(service: NCGlobal.shared.serviceShareKeyChain)
+        let keychainOLD = Keychain(service: "Crypto Cloud")
         if let value = keychainOLD[key], !value.isEmpty {
         if let value = keychainOLD[key], !value.isEmpty {
             keychain[key] = value
             keychain[key] = value
             keychainOLD[key] = nil
             keychainOLD[key] = nil
@@ -321,6 +321,8 @@ import KeychainAccess
         try? keychain.removeAll()
         try? keychain.removeAll()
     }
     }
 
 
+    // MARK: -
+
     @objc func getPassword(account: String) -> String {
     @objc func getPassword(account: String) -> String {
         let key = "password" + account
         let key = "password" + account
         migrate(key: key)
         migrate(key: key)