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

Commit 77b83bab authored by Nihar Thakkar's avatar Nihar Thakkar
Browse files

Fixed Gmail login sizing issues.

parent b950c52a

k9mail/release/k9mail-release.apk

−92 B (5.58 MiB)

File changed.

No diff preview for this file type.

View original file
View changed file

k9mail/src/main/java/io/eelo/mail/activity/setup/AccountSetupActivity.java

+4 −10
Original line number Diff line number Diff line
@@ -118,14 +118,6 @@ public class AccountSetupActivity extends AppCompatActivity implements AccountSe 


    private CheckBox requireLoginView;



    private Spinner checkFrequencyView;



    private Spinner displayCountView;



    private CheckBox notifyView;

    private CheckBox notifySyncView;

    private CheckBox pushEnable;



    private EditText description;

    private EditText name;

    @SuppressWarnings("FieldCanBeLocal")
@@ -1288,8 +1280,9 @@ public class AccountSetupActivity extends AppCompatActivity implements AccountSe 
        WebView web = (WebView) authDialog.findViewById(io.eelo.mail.R.id.web_view);

        web.getSettings().setSaveFormData(false);

        web.getSettings().setJavaScriptEnabled(true);

        web.getSettings().setUserAgentString("K-9 Mail " + BuildConfig.VERSION_NAME);

        web.getSettings().setUserAgentString("eelo Mail " + BuildConfig.VERSION_NAME);

        web.setWebViewClient(new GmailWebViewClient(presenter));

        web.getSettings().setUseWideViewPort(true);



        authDialog.setTitle(io.eelo.mail.R.string.linked_webview_title_gmail);

        authDialog.setCancelable(true);
@@ -1315,8 +1308,9 @@ public class AccountSetupActivity extends AppCompatActivity implements AccountSe 
        WebView web = (WebView) authDialog.findViewById(io.eelo.mail.R.id.web_view);

        web.getSettings().setSaveFormData(false);

        web.getSettings().setJavaScriptEnabled(true);

        web.getSettings().setUserAgentString("K-9 Mail " + BuildConfig.VERSION_NAME);

        web.getSettings().setUserAgentString("eelo Mail " + BuildConfig.VERSION_NAME);

        web.setWebViewClient(new OutlookWebViewClient(presenter));

        web.getSettings().setUseWideViewPort(true);



        authDialog.setTitle(io.eelo.mail.R.string.linked_webview_title_outlook);

        authDialog.setCancelable(true);

k9mail/src/main/java/io/eelo/mail/activity/setup/AccountSetupPresenter.java

+1 −1
Original line number Diff line number Diff line
@@ -1862,7 +1862,7 @@ public class AccountSetupPresenter implements AccountSetupContract.Presenter, 
    public void onWebViewDismiss() {

        if (!oAuth2CodeGotten) {

            view.goToBasics();

            view.showErrorDialog("Please connect us with Gmail"); // TODO: 8/18/17 A better error message?

            view.showErrorDialog("Couldn't sign in");

        }

    }