Merge pull request #26 from binsheng/master

fix ProgressBar didn’t hide when host error in SignInActivity use custom host.
leanote · Apr 6, 2017 · 5d20a2e · 5d20a2e
2 parents 5d43387 + 4e8ae67
commit 5d20a2e
Showing 1 changed file with 16 additions and 17 deletions.
diff --git a/app/src/main/java/org/houxg/leamonax/ui/SignInActivity.java b/app/src/main/java/org/houxg/leamonax/ui/SignInActivity.java
@@ -70,6 +70,18 @@ public class SignInActivity extends BaseActivity implements TextWatcher {
     @BindView(R.id.tv_example)
     TextView mExampleTv;
 
+    /**
+     * @param data
+     * @return account local id or -1
+     */
+    public static long getAccountIdFromData(Intent data) {
+        if (data == null) {
+            return -1;
+        } else {
+            return data.getLongExtra(EXTRA_ACCOUNT_LOCAL_ID, -1);
+        }
+    }
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -211,8 +223,8 @@ public void onError(Throwable e) {
                             ToastUtils.show(SignInActivity.this, R.string.illegal_host);
                         } else {
                             ToastUtils.showNetworkError(SignInActivity.this);
-                            animateFinish(mSignInBtn, mSignInProgress);
                         }
+                        animateFinish(mSignInBtn, mSignInProgress);
                     }
 
                     @Override
@@ -299,19 +311,6 @@ private void handleAuthResponse(Authentication authentication, String host) {
         }
     }
 
-    /**
-     *
-     * @param data
-     * @return account local id or -1
-     */
-    public static long getAccountIdFromData(Intent data) {
-        if (data == null) {
-            return -1;
-        } else {
-            return data.getLongExtra(EXTRA_ACCOUNT_LOCAL_ID, -1);
-        }
-    }
-
     private Observable<String> initHost() {
         return Observable.create(new Observable.OnSubscribe<String>() {
             @Override
@@ -330,9 +329,6 @@ public void call(Subscriber<? super String> subscriber) {
         });
     }
 
-    private static class IllegalHostException extends Exception {
-    }
-
     private void animateProgress(View button, final View progressBar) {
         button.animate()
                 .scaleX(0)
@@ -385,4 +381,7 @@ public void afterTextChanged(Editable s) {
         String password = mPasswordEt.getText().toString();
         mSignInBtn.setEnabled(!TextUtils.isEmpty(email) && !TextUtils.isEmpty(password));
     }
+
+    private static class IllegalHostException extends Exception {
+    }
 }