1 files changed, 8 insertions, 8 deletions

diff --git a/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java b/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java
index 8a9d1c7..298270b 100644
--- a/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java
+++ b/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java
@@ -5,13 +5,12 @@ import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.enumerations.StatusCode;
 import cgeo.geocaching.network.Cookies;
 import cgeo.geocaching.ui.dialog.Dialogs;
+import cgeo.geocaching.utils.RxUtils;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
-import rx.android.observables.AndroidObservable;
 import rx.functions.Action1;
 import rx.functions.Func0;
-import rx.schedulers.Schedulers;
 import rx.util.async.Async;
 
 import android.app.ProgressDialog;
@@ -38,7 +37,7 @@ public abstract class AbstractCheckCredentialsPreference extends AbstractClickab
 
     protected abstract ImmutablePair<String, String> getCredentials();
 
-    protected abstract ImmutablePair<StatusCode, Drawable> login();
+    protected abstract ImmutablePair<StatusCode, ? extends Drawable> login();
 
     private class LoginCheckClickListener implements OnPreferenceClickListener {
         final private SettingsActivity activity;
@@ -65,14 +64,14 @@ public abstract class AbstractCheckCredentialsPreference extends AbstractClickab
             loginDialog.setCancelable(false);
             Cookies.clearCookies();
 
-            AndroidObservable.bindActivity(activity, Async.start(new Func0<ImmutablePair<StatusCode, Drawable>>() {
+            RxUtils.subscribeOnIOThenUI(Async.start(new Func0<ImmutablePair<StatusCode, ? extends Drawable>>() {
                 @Override
-                public ImmutablePair<StatusCode, Drawable> call() {
+                public ImmutablePair<StatusCode, ? extends Drawable> call() {
                     return login();
                 }
-            }, Schedulers.io())).subscribe(new Action1<ImmutablePair<StatusCode, Drawable>>() {
+            }), new Action1<ImmutablePair<StatusCode, ? extends Drawable>>() {
                 @Override
-                public void call(final ImmutablePair<StatusCode, Drawable> loginInfo) {
+                public void call(final ImmutablePair<StatusCode, ? extends Drawable> loginInfo) {
                     loginDialog.dismiss();
                     if (loginInfo.getLeft() == StatusCode.NO_ERROR) {
                         Dialogs.message(activity, R.string.init_login_popup, R.string.init_login_popup_ok, loginInfo.getRight());
@@ -81,7 +80,8 @@ public abstract class AbstractCheckCredentialsPreference extends AbstractClickab
                                 res.getString(R.string.init_login_popup_failed_reason)
                                         + " "
                                         + loginInfo.getLeft().getErrorString(res)
-                                        + ".");
+                                        + "."
+                        );
                     }
                     activity.initBasicMemberPreferences();
                 }