From 415b0afe387955272eb337629443f346b8241c06 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Mon, 26 Aug 2013 11:20:40 -0700
Subject: [PATCH] Add a fix when UserRecoverableAuthException.getIntent throws
 a null pointer exception

---
 .../apps/mytracks/fragments/CheckPermissionFragment.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/CheckPermissionFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/CheckPermissionFragment.java
index 8d9503878..7200c5b21 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/CheckPermissionFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/CheckPermissionFragment.java
@@ -98,7 +98,14 @@ public class CheckPermissionFragment extends Fragment {
           SendToGoogleUtils.getGoogleAccountCredential(getActivity(), accountName, scope);
           finish(scope, true, null);
         } catch (UserRecoverableAuthException e) {
-          finish(scope, false, e.getIntent());
+          Intent intent = null;
+          try {
+            // HACK: UserRecoverableAuthException.getIntent can throw a null pointer exception. 
+            intent = e.getIntent();
+          } catch (Exception e1) {
+            Log.e(TAG, "Exception in getIntent", e1);
+          }
+          finish(scope, false, intent);
         } catch (GoogleAuthException e) {
           Log.e(TAG, "GoogleAuthException", e);
           finish(scope, false, null);