Merge pull request nickbutcher#246 from lineargs/master

Fix DribbbleLogin ProgressBar loading forever on Login cancel
pjpak · Jan 22, 2018 · 9be3604 · 9be3604
2 parents f37bad2 + ce58ba8
commit 9be3604
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/app/src/main/java/io/plaidapp/ui/DribbbleLogin.java b/app/src/main/java/io/plaidapp/ui/DribbbleLogin.java
@@ -84,14 +84,19 @@ protected void onCreate(Bundle savedInstanceState) {
             isLoginFailed = savedInstanceState.getBoolean(STATE_LOGIN_FAILED, false);
             loginFailed.setVisibility(isLoginFailed ? View.VISIBLE : View.GONE);
         }
+    }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
         checkAuthCallback(getIntent());
     }
 
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-        checkAuthCallback(intent);
+        // Update getIntent() to this new Intent
+        setIntent(intent);
     }
 
     public void doLogin(View view) {
@@ -175,6 +180,9 @@ private void checkAuthCallback(Intent intent) {
                 && DribbblePrefs.LOGIN_CALLBACK.equals(intent.getData().getAuthority())) {
             showLoading();
             getAccessToken(intent.getData().getQueryParameter("code"));
+        } else {
+            // Prevent ProgressBar loading forever on Login cancel
+            showLogin();
         }
     }