marinofaggiana 5 years ago
parent
commit
0e61146fa0
3 changed files with 11 additions and 6 deletions
  1. 1 1
      Cartfile
  2. 1 1
      Cartfile.resolved
  3. 9 4
      iOSClient/Login/NCAppConfigView.swift

+ 1 - 1
Cartfile

@@ -1,4 +1,4 @@
-github "nextcloud/ios-communication-library" "develop"
+github "nextcloud/ios-communication-library" "v0.52"
 github "tilltue/TLPhotoPicker" "2.0.7"
 github "kishikawakatsumi/UICKeyChainStore" "v2.1.2"
 github "danielsaidi/Sheeeeeeeeet" "3.0.9"

+ 1 - 1
Cartfile.resolved

@@ -18,7 +18,7 @@ github "krzyzanowskim/OpenSSL" "1.0.218"
 github "malcommac/SwiftRichString" "3.7.1"
 github "marinofaggiana/AFNetworking" "2967678c3e0e98c9b8d7e06222ad12d1f49c26f2"
 github "marinofaggiana/FastScroll" "81967c2309d29bc2c330d422da612160a30bade8"
-github "nextcloud/ios-communication-library" "c41e5cb352ad574283ff9e66d387c09702f08125"
+github "nextcloud/ios-communication-library" "v0.52"
 github "realm/realm-cocoa" "v4.3.1"
 github "rechsteiner/Parchment" "v1.7.0"
 github "scenee/FloatingPanel" "v1.7.2"

+ 9 - 4
iOSClient/Login/NCAppConfigView.swift

@@ -42,10 +42,15 @@ class NCAppConfigView: UIViewController {
         
         titleLabel.text = NSLocalizedString("_appconfig_view_title_", comment: "")
         
-        let serverConfig = UserDefaults.standard.dictionary(forKey: NCBrandConfiguration.sharedInstance.configuration_bundleId)
-        serverUrl = serverConfig?[NCBrandConfiguration.sharedInstance.configuration_serverUrl] as? String
-        username = serverConfig?[NCBrandConfiguration.sharedInstance.configuration_username] as? String
-        password = serverConfig?[NCBrandConfiguration.sharedInstance.configuration_password] as? String
+        if let serverConfig = UserDefaults.standard.dictionary(forKey: NCBrandConfiguration.sharedInstance.configuration_bundleId) {
+            serverUrl = serverConfig[NCBrandConfiguration.sharedInstance.configuration_serverUrl] as? String
+            username = serverConfig[NCBrandConfiguration.sharedInstance.configuration_username] as? String
+            password = serverConfig[NCBrandConfiguration.sharedInstance.configuration_password] as? String
+        } else {
+            serverUrl = UserDefaults.standard.string(forKey: NCBrandConfiguration.sharedInstance.configuration_serverUrl)
+            username = UserDefaults.standard.string(forKey: NCBrandConfiguration.sharedInstance.configuration_username)
+            password = UserDefaults.standard.string(forKey: NCBrandConfiguration.sharedInstance.configuration_password)
+        }
     }
     
     override func viewDidAppear(_ animated: Bool) {