Finish calling activity when login is cancelled

kevinsawicki · kevinsawicki · commit add286a4a37f · 2012-07-02T16:23:18.000-07:00
Closes issue pockethub#70
diff --git a/app/src/main/java/com/github/mobile/accounts/AccountUtils.java b/app/src/main/java/com/github/mobile/accounts/AccountUtils.java
@@ -86,8 +86,7 @@ private static Account[] getAccounts(final AccountManager manager)
             throws OperationCanceledException, AuthenticatorException,
             IOException {
         final AccountManagerFuture<Account[]> future = manager
-                .getAccountsByTypeAndFeatures(ACCOUNT_TYPE, null, null,
-                        null);
+                .getAccountsByTypeAndFeatures(ACCOUNT_TYPE, null, null, null);
         final Account[] accounts = future.getResult();
         return accounts != null ? accounts : new Account[0];
     }
@@ -114,14 +113,18 @@ public static Account getAccount(final AccountManager manager,
                 if (loggable)
                     Log.d(TAG, "No GitHub accounts for activity=" + activity);
 
-                Bundle result = manager.addAccount(ACCOUNT_TYPE, null,
-                        null, null, activity, null, null).getResult();
+                Bundle result = manager.addAccount(ACCOUNT_TYPE, null, null,
+                        null, activity, null, null).getResult();
 
                 if (loggable)
                     Log.d(TAG,
                             "Added account "
                                     + result.getString(KEY_ACCOUNT_NAME));
             }
+        } catch (OperationCanceledException e) {
+            Log.d(TAG, "Excepting retrieving account", e);
+            activity.finish();
+            throw new RuntimeException(e);
         } catch (AccountsException e) {
             Log.d(TAG, "Excepting retrieving account", e);
             throw new RuntimeException(e);
