Show cancel option only with multiaccount available

Update user in DB
owncloud · Aug 3, 2017 · 4daf95e · 4daf95e
1 parent b92b027
commit 4daf95e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/Owncloud iOs Client/Branding/Customization.h b/Owncloud iOs Client/Branding/Customization.h
@@ -171,6 +171,7 @@
 
 +(BOOL)kHideUrlServer;
 +(BOOL)kForceUpdateOfServerUrl;
++(BOOL)kMultiaccountAvailable;
 +(BOOL)kIsSsoActive;
 +(BOOL)kIsTextLoginStatusBarWhite;
 +(BOOL)kIsShownHelpLinkOnLogin;

diff --git a/Owncloud iOs Client/Branding/Customization.m b/Owncloud iOs Client/Branding/Customization.m
@@ -28,6 +28,10 @@ +(BOOL)kForceUpdateOfServerUrl {
     return k_force_update_of_server_url;
 }
 
++(BOOL)kMultiaccountAvailable {
+    return k_multiaccount_available;
+}
+
 +(BOOL)kIsSsoActive {
     return k_is_sso_active;
 }

diff --git a/Owncloud iOs Client/Login/Login/UniversalLoginViewController.swift b/Owncloud iOs Client/Login/Login/UniversalLoginViewController.swift
@@ -323,7 +323,11 @@ connection_declined  Connection declined by user
             self.textFieldPassword.text = ""
         } else {
 
-            if loginMode == .update {
+            if ( (Customization.kMultiaccountAvailable()
+                    && self.loginMode != .migrate
+                    && self.loginMode != .expire )
+                || self.loginMode == .update) {
+
                 self.setCancelBarButtonSystemItem()
             }
 
@@ -691,7 +695,7 @@ connection_declined  Connection declined by user
                                                 } else {
                                                     ManageAccounts().updateAccountOfUser(self.user!, withCredentials: credentials)
 
-                                                     self.closeLoginView()
+                                                    self.closeLoginView()
                                                 }
 
 

diff --git a/Owncloud iOs Client/Tabs/SettingTab/Account/ManageAccounts.swift b/Owncloud iOs Client/Tabs/SettingTab/Account/ManageAccounts.swift
@@ -50,6 +50,8 @@ import Foundation
 
         user.credDto = credDto.copy() as! CredentialsDto
 
+        ManageUsersDB.updateUser(by: user)
+
         OCKeychain.updateCredentials(ofUser: user)
 
         if user.activeaccount {