mirror of https://github.com/M66B/FairEmail.git
Handle account operation cancelled
This commit is contained in:
parent
b95820ea63
commit
a29efd08e9
|
@ -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.OperationCanceledException;
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
import android.app.NotificationManager;
|
import android.app.NotificationManager;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
|
@ -1210,7 +1211,8 @@ 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);
|
||||||
Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
|
if (!(ex instanceof OperationCanceledException))
|
||||||
|
Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
|
||||||
} finally {
|
} finally {
|
||||||
btnAuthorize.setEnabled(true);
|
btnAuthorize.setEnabled(true);
|
||||||
etUser.setEnabled(true);
|
etUser.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.OperationCanceledException;
|
||||||
import android.annotation.TargetApi;
|
import android.annotation.TargetApi;
|
||||||
import android.content.ComponentName;
|
import android.content.ComponentName;
|
||||||
import android.content.ContentResolver;
|
import android.content.ContentResolver;
|
||||||
|
@ -893,7 +894,8 @@ 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);
|
||||||
Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
|
if (!(ex instanceof OperationCanceledException))
|
||||||
|
Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
|
||||||
} finally {
|
} finally {
|
||||||
etEmail.setEnabled(true);
|
etEmail.setEnabled(true);
|
||||||
tilPassword.setEnabled(true);
|
tilPassword.setEnabled(true);
|
||||||
|
|
Loading…
Reference in New Issue