Better error handling during auth

chdir · Apr 30, 2017 · 0973ed6 · 0973ed6
1 parent c7e6515
commit 0973ed6
Showing 1 changed file with 22 additions and 3 deletions.
diff --git a/app/src/main/java/ru/drom/gitgrep/AuthActivity.java b/app/src/main/java/ru/drom/gitgrep/AuthActivity.java
@@ -11,6 +11,9 @@
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.trello.rxlifecycle.ActivityEvent;
+import com.trello.rxlifecycle.RxLifecycle;
+
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import ru.drom.gitgrep.server.AuthResults;
@@ -22,10 +25,13 @@
 import ru.drom.gitgrep.util.Utils;
 import ru.drom.gitgrep.view.PasswordPromptFragment;
 import rx.Observable;
+import rx.subjects.PublishSubject;
 
 public final class AuthActivity extends Activity implements PasswordPromptFragment.CredentialsReceiver {
     private static final String TAG = "AuthActivity";
 
+    private final PublishSubject<ActivityEvent> lifecycle = PublishSubject.create();
+
     private Bundle transport;
     private AccountAuthenticatorResponse response;
     private Context appContext;
@@ -84,15 +90,16 @@ protected void onNewIntent(Intent intent) {
             Observable.fromCallable(() -> login(code))
                     .subscribeOn(RxAndroid.bgLooperThread())
                     .observeOn(RxAndroid.mainThread())
-                    .subscribe(this::returnResult);
+                    .compose(RxLifecycle.bindUntilActivityEvent(lifecycle, ActivityEvent.DESTROY))
+                    .subscribe(this::returnResult, err -> Utils.logError(appContext, err));
 
             return;
         }
 
         final String error = uri.getQueryParameter("error");
 
-        if (!TextUtils.isEmpty(code)) {
-            handleGithubAuthError(uri, code);
+        if (!TextUtils.isEmpty(error)) {
+            handleGithubAuthError(uri, error);
         }
     }
 
@@ -105,6 +112,11 @@ private void handleGithubAuthError(Uri uri, String errorCode) {
                 finish();
                 break;
             default:
+                final String desc = uri.getQueryParameter("error_description");
+                if (desc != null) {
+                    Log.w(TAG, "Login failed: " + desc);
+                }
+
                 Utils.toast(this, getString(R.string.auth_err_unknown));
         }
     }
@@ -207,4 +219,11 @@ public void finish() {
         }
         super.finish();
     }
+
+    @Override
+    protected void onDestroy() {
+        lifecycle.onNext(ActivityEvent.DESTROY);
+
+        super.onDestroy();
+    }
 }