karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Add a fix when UserRecoverableAuthException.getIntent throws a null pointer exception

Browse Source
This commit is contained in:
Jimmy Shih
2013-08-26 11:20:40 -07:00
parent 6ce0db575f
commit 415b0afe38
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/fragments/CheckPermissionFragment.java
+8 -1
View File
@@ -98,7 +98,14 @@ public class CheckPermissionFragment extends Fragment {
SendToGoogleUtils.getGoogleAccountCredential(getActivity(), accountName, scope); SendToGoogleUtils.getGoogleAccountCredential(getActivity(), accountName, scope);
finish(scope, true, null); finish(scope, true, null);
} catch (UserRecoverableAuthException e) { } 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) { } catch (GoogleAuthException e) {
Log.e(TAG, "GoogleAuthException", e); Log.e(TAG, "GoogleAuthException", e);
finish(scope, false, null); finish(scope, false, null);