mirror of https://github.com/M66B/FairEmail.git
Improved select account error handling
This commit is contained in:
parent
c474be373c
commit
0c95bc75ac
|
@ -24,6 +24,7 @@ import android.accounts.Account;
|
||||||
import android.accounts.AccountManager;
|
import android.accounts.AccountManager;
|
||||||
import android.accounts.AccountManagerCallback;
|
import android.accounts.AccountManagerCallback;
|
||||||
import android.accounts.AccountManagerFuture;
|
import android.accounts.AccountManagerFuture;
|
||||||
|
import android.accounts.AuthenticatorException;
|
||||||
import android.accounts.OperationCanceledException;
|
import android.accounts.OperationCanceledException;
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
import android.app.NotificationManager;
|
import android.app.NotificationManager;
|
||||||
|
@ -63,6 +64,7 @@ import com.google.android.material.textfield.TextInputLayout;
|
||||||
import com.sun.mail.imap.IMAPFolder;
|
import com.sun.mail.imap.IMAPFolder;
|
||||||
import com.sun.mail.imap.IMAPStore;
|
import com.sun.mail.imap.IMAPStore;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
import java.net.UnknownHostException;
|
import java.net.UnknownHostException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
@ -1211,7 +1213,11 @@ public class FragmentAccount extends FragmentEx {
|
||||||
tilPassword.getEditText().setText(token);
|
tilPassword.getEditText().setText(token);
|
||||||
} catch (Throwable ex) {
|
} catch (Throwable ex) {
|
||||||
Log.e(ex);
|
Log.e(ex);
|
||||||
if (!(ex instanceof OperationCanceledException))
|
if (ex instanceof OperationCanceledException ||
|
||||||
|
ex instanceof AuthenticatorException ||
|
||||||
|
ex instanceof IOException)
|
||||||
|
Snackbar.make(view, Helper.formatThrowable(ex), Snackbar.LENGTH_LONG).show();
|
||||||
|
else
|
||||||
Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
|
Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
|
||||||
} finally {
|
} finally {
|
||||||
btnAuthorize.setEnabled(true);
|
btnAuthorize.setEnabled(true);
|
||||||
|
|
|
@ -24,6 +24,7 @@ import android.accounts.Account;
|
||||||
import android.accounts.AccountManager;
|
import android.accounts.AccountManager;
|
||||||
import android.accounts.AccountManagerCallback;
|
import android.accounts.AccountManagerCallback;
|
||||||
import android.accounts.AccountManagerFuture;
|
import android.accounts.AccountManagerFuture;
|
||||||
|
import android.accounts.AuthenticatorException;
|
||||||
import android.accounts.OperationCanceledException;
|
import android.accounts.OperationCanceledException;
|
||||||
import android.annotation.TargetApi;
|
import android.annotation.TargetApi;
|
||||||
import android.content.ComponentName;
|
import android.content.ComponentName;
|
||||||
|
@ -894,7 +895,11 @@ public class FragmentSetup extends FragmentEx {
|
||||||
auth_type = Helper.AUTH_TYPE_GMAIL;
|
auth_type = Helper.AUTH_TYPE_GMAIL;
|
||||||
} catch (Throwable ex) {
|
} catch (Throwable ex) {
|
||||||
Log.e(ex);
|
Log.e(ex);
|
||||||
if (!(ex instanceof OperationCanceledException))
|
if (ex instanceof OperationCanceledException ||
|
||||||
|
ex instanceof AuthenticatorException ||
|
||||||
|
ex instanceof IOException)
|
||||||
|
Snackbar.make(view, Helper.formatThrowable(ex), Snackbar.LENGTH_LONG).show();
|
||||||
|
else
|
||||||
Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
|
Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
|
||||||
} finally {
|
} finally {
|
||||||
etEmail.setEnabled(true);
|
etEmail.setEnabled(true);
|
||||||
|
|
Loading…
Reference in New Issue