Przeglądaj źródła

renamed userHasCanceledOauth to SkipOauth

Bastian van de Wetering 6 lat temu
rodzic
commit
9685e3742d

+ 4 - 4
deltachat-ios/Controller/AccountSetupController.swift

@@ -14,7 +14,7 @@ class AccountSetupController: UITableViewController {
 
 
 	weak var coordinator: AccountSetupCoordinator?
 	weak var coordinator: AccountSetupCoordinator?
 
 
-	private var userHasCancelledOAuth = false
+	private var skipOauth = false
 	private var useCustomSettings = false
 	private var useCustomSettings = false
 
 
 	private var backupProgressObserver: Any?
 	private var backupProgressObserver: Any?
@@ -373,7 +373,7 @@ class AccountSetupController: UITableViewController {
 
 
 	// returns true if needed
 	// returns true if needed
 	private func showOAuthAlertIfNeeded(emailAddress: String, handleCancel: (() -> Void)?) -> Bool {
 	private func showOAuthAlertIfNeeded(emailAddress: String, handleCancel: (() -> Void)?) -> Bool {
-		if userHasCancelledOAuth {
+		if skipOauth {
 			assert(MRConfig.getAuthFlags() == Int(DC_LP_AUTH_NORMAL))
 			assert(MRConfig.getAuthFlags() == Int(DC_LP_AUTH_NORMAL))
 			// user has previously denied oAuth2-setup
 			// user has previously denied oAuth2-setup
 			return false
 			return false
@@ -401,7 +401,7 @@ class AccountSetupController: UITableViewController {
 			let cancel = UIAlertAction(title: "Cancel", style: .cancel, handler: {
 			let cancel = UIAlertAction(title: "Cancel", style: .cancel, handler: {
 				_ in
 				_ in
 				MRConfig.setAuthFlags(flags: Int(DC_LP_AUTH_NORMAL))
 				MRConfig.setAuthFlags(flags: Int(DC_LP_AUTH_NORMAL))
-				self.userHasCancelledOAuth = true
+				self.skipOauth = true
 				handleCancel?()
 				handleCancel?()
 
 
 			})
 			})
@@ -565,7 +565,7 @@ extension AccountSetupController: UITextFieldDelegate {
 	func textFieldDidBeginEditing(_ textField: UITextField) {
 	func textFieldDidBeginEditing(_ textField: UITextField) {
 		if textField.accessibilityIdentifier == "emailTextField" {
 		if textField.accessibilityIdentifier == "emailTextField" {
 			// this will re-enable possible oAuth2-login
 			// this will re-enable possible oAuth2-login
-			userHasCancelledOAuth = false
+			skipOauth = false
 		}
 		}
 	}
 	}