From db82757bc4899413f8e5d18c15bcb83aecb84bd4 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Wed, 26 Apr 2017 12:13:41 +0100
Subject: [PATCH] Show an error message when failing to create an account.

---
 .../ui/setup/SetupEncryptionFragment.java     | 29 +++++++++++++++----
 app/src/main/res/values/strings.xml           |  2 ++
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupEncryptionFragment.java b/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupEncryptionFragment.java
index b93165bf..2db72cf4 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupEncryptionFragment.java
+++ b/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupEncryptionFragment.java
@@ -15,6 +15,8 @@ import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.content.ContentResolver;
 import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
 import android.provider.CalendarContract;
@@ -24,6 +26,7 @@ import android.support.v4.app.DialogFragment;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.AsyncTaskLoader;
 import android.support.v4.content.Loader;
+import android.support.v7.app.AlertDialog;
 
 import com.etesync.syncadapter.AccountSettings;
 import com.etesync.syncadapter.App;
@@ -39,7 +42,9 @@ import com.etesync.syncadapter.model.JournalEntity;
 import com.etesync.syncadapter.model.ServiceDB;
 import com.etesync.syncadapter.model.ServiceEntity;
 import com.etesync.syncadapter.resource.LocalTaskList;
+import com.etesync.syncadapter.ui.DebugInfoActivity;
 import com.etesync.syncadapter.ui.setup.BaseConfigurationFinder.Configuration;
+import com.etesync.syncadapter.utils.AndroidCompat;
 
 import java.util.logging.Level;
 
@@ -87,11 +92,23 @@ public class SetupEncryptionFragment extends DialogFragment implements LoaderMan
 
     @Override
     public void onLoadFinished(Loader<Configuration> loader, Configuration config) {
-        if (createAccount(config.userName, config)) {
-            getActivity().setResult(Activity.RESULT_OK);
-            getActivity().finish();
-        } else {
+        try {
+            if (createAccount(config.userName, config)) {
+                getActivity().setResult(Activity.RESULT_OK);
+                getActivity().finish();
+            }
+        } catch (InvalidAccountException e) {
             App.log.severe("Account creation failed!");
+            new AlertDialog.Builder(getActivity())
+                    .setTitle(R.string.account_creation_failed)
+                    .setIcon(R.drawable.ic_error_dark)
+                    .setMessage(e.getLocalizedMessage())
+                    .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            // dismiss
+                        }
+                    }).show();
         }
 
         dismissAllowingStateLoss();
@@ -145,7 +162,7 @@ public class SetupEncryptionFragment extends DialogFragment implements LoaderMan
     }
 
 
-    protected boolean createAccount(String accountName, BaseConfigurationFinder.Configuration config) {
+    protected boolean createAccount(String accountName, BaseConfigurationFinder.Configuration config) throws InvalidAccountException {
         Account account = new Account(accountName, App.getAccountType());
 
         // create Android account
@@ -195,6 +212,8 @@ public class SetupEncryptionFragment extends DialogFragment implements LoaderMan
 
         } catch(InvalidAccountException e) {
             App.log.log(Level.SEVERE, "Couldn't access account settings", e);
+            AndroidCompat.removeAccount(accountManager, account);
+            throw e;
         }
 
         return true;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 31f97d21..bea03001 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -167,6 +167,8 @@
     <string name="login_encryption_setup_title">Setting up encryption</string>
     <string name="login_encryption_setup">Please wait, setting up encryption…</string>
 
+    <string name="account_creation_failed">Account creation failed</string>
+
     <!-- SetupUserInfoFragment -->
     <string name="login_encryption_error_title">Encryption Error</string>