Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9073dba7 authored by narinder Rana's avatar narinder Rana
Browse files

Merge branch '5366-redirect-accountManager' into 'main'

update redirect condition check only for Google Domain not all xoauth

See merge request !68
parents 75de0862 67bd1710
Loading
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ public class AccountSetupBasics extends K9Activity
            if (split.length == 2) {
                String domain = split[1];
                xoauth2 = OAuth2Provider.Companion.isXOAuth2(domain);

            }
        }

@@ -306,12 +307,13 @@ public class AccountSetupBasics extends K9Activity
            onManualSetup();
            return;
        }
        if(xoauth2){
        String email = mEmailView.getText().toString();

        if(OAuth2Provider.Companion.getProvider(email).toString().trim().equals("GMAIL")){
            Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);
            startActivity(intent);
        }
        else {
            String email = mEmailView.getText().toString();
            ConnectionSettings extraConnectionSettings = ExtraAccountDiscovery.discover(email);
            if (extraConnectionSettings != null) {
                finishAutoSetup(extraConnectionSettings);