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

Commit 6fa281ae authored by narinder Rana's avatar narinder Rana
Browse files

Merge branch 'gmail_redirect_AccountManager' into 'main'

Gmail redirect account manager

See merge request e/apps/mail!49
parents 4ac8470a c3cdde12
Loading
Loading
Loading
Loading
Loading
+24 −15
Original line number Diff line number Diff line
package com.fsck.k9.activity.setup;


import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager.NameNotFoundException;
import android.net.Uri;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextWatcher;
import android.util.Log;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
@@ -21,6 +25,7 @@ import com.fsck.k9.EmailAddressValidator;
import com.fsck.k9.Preferences;
import com.fsck.k9.account.AccountCreator;
import com.fsck.k9.mail.oauth.OAuth2Provider;
import com.fsck.k9.preferences.AccountManager;
import com.fsck.k9.ui.base.K9Activity;
import com.fsck.k9.activity.setup.AccountSetupCheckSettings.CheckDirection;
import com.fsck.k9.autodiscovery.api.DiscoveredServerSettings;
@@ -70,6 +75,7 @@ public class AccountSetupBasics extends K9Activity

    private EmailAddressValidator mEmailValidator = new EmailAddressValidator();
    private boolean mCheckedIncoming = false;
    private boolean xoauth2;

    public static void actionNewAccount(Context context) {
        Intent i = new Intent(context, AccountSetupBasics.class);
@@ -184,7 +190,7 @@ public class AccountSetupBasics extends K9Activity
        String clientCertificateAlias = mClientCertificateSpinner.getAlias();
        String email = mEmailView.getText().toString();

        boolean xoauth2 = false;
        xoauth2 = false;

        if (email.contains("@")) {
            String[] split = email.split("@");
@@ -294,14 +300,16 @@ public class AccountSetupBasics extends K9Activity

    private void onNext() {
        if (mClientCertificateCheckBox.isChecked()) {

            // Auto-setup doesn't support client certificates.
            onManualSetup();
            return;
        }

        if(xoauth2){
            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);
@@ -316,6 +324,7 @@ public class AccountSetupBasics extends K9Activity
                onManualSetup();
            }
        }
    }

    @Override
    public void onActivityResult(int requestCode, int resultCode, Intent data) {