From a29efd08e9ad33d87f38e38f4ebde83af4896c86 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 4 Jan 2019 14:08:38 +0000 Subject: [PATCH] Handle account operation cancelled --- app/src/main/java/eu/faircode/email/FragmentAccount.java | 4 +++- app/src/main/java/eu/faircode/email/FragmentSetup.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java index 13acac06a5..314427095c 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAccount.java +++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java @@ -24,6 +24,7 @@ import android.accounts.Account; import android.accounts.AccountManager; import android.accounts.AccountManagerCallback; import android.accounts.AccountManagerFuture; +import android.accounts.OperationCanceledException; import android.app.Activity; import android.app.NotificationManager; import android.content.Context; @@ -1210,7 +1211,8 @@ public class FragmentAccount extends FragmentEx { tilPassword.getEditText().setText(token); } catch (Throwable ex) { Log.e(ex); - Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex); + if (!(ex instanceof OperationCanceledException)) + Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex); } finally { btnAuthorize.setEnabled(true); etUser.setEnabled(true); diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java index 7197b8697c..2015663c28 100644 --- a/app/src/main/java/eu/faircode/email/FragmentSetup.java +++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java @@ -24,6 +24,7 @@ import android.accounts.Account; import android.accounts.AccountManager; import android.accounts.AccountManagerCallback; import android.accounts.AccountManagerFuture; +import android.accounts.OperationCanceledException; import android.annotation.TargetApi; import android.content.ComponentName; import android.content.ContentResolver; @@ -893,7 +894,8 @@ public class FragmentSetup extends FragmentEx { auth_type = Helper.AUTH_TYPE_GMAIL; } catch (Throwable ex) { Log.e(ex); - Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex); + if (!(ex instanceof OperationCanceledException)) + Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex); } finally { etEmail.setEnabled(true); tilPassword.setEnabled(true);