1 files changed, 7 insertions, 8 deletions
diff --git a/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java b/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java
index 2f83028..7978d76 100644
--- a/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java
+++ b/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java
@@ -11,10 +11,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 
 import rx.Observable;
-import rx.android.observables.AndroidObservable;
+import rx.android.app.AppObservable;
 import rx.functions.Action1;
 import rx.functions.Func0;
-import rx.util.async.Async;
 
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -25,11 +24,11 @@ import android.util.AttributeSet;
 
 public abstract class AbstractCheckCredentialsPreference extends AbstractClickablePreference {
 
-    public AbstractCheckCredentialsPreference(Context context, AttributeSet attrs) {
+    public AbstractCheckCredentialsPreference(final Context context, final AttributeSet attrs) {
         super(context, attrs);
     }
 
-    public AbstractCheckCredentialsPreference(Context context, AttributeSet attrs, int defStyle) {
+    public AbstractCheckCredentialsPreference(final Context context, final AttributeSet attrs, final int defStyle) {
         super(context, attrs, defStyle);
     }
 
@@ -57,7 +56,7 @@ public abstract class AbstractCheckCredentialsPreference extends AbstractClickab
         }
 
         @Override
-        public boolean onPreferenceClick(Preference preference) {
+        public boolean onPreferenceClick(final Preference preference) {
             final Resources res = settingsActivity.getResources();
             final ImmutablePair<String, String> credentials = getCredentials();
 
@@ -74,10 +73,10 @@ public abstract class AbstractCheckCredentialsPreference extends AbstractClickab
             loginDialog.setCancelable(false);
             Cookies.clearCookies();
 
-            AndroidObservable.bindActivity(settingsActivity, Async.start(new Func0<ImmutablePair<StatusCode, Observable<Drawable>>>() {
+            AppObservable.bindActivity(settingsActivity, Observable.defer(new Func0<Observable<ImmutablePair<StatusCode, Observable<Drawable>>>>() {
                 @Override
-                public ImmutablePair<StatusCode, Observable<Drawable>> call() {
-                    return login();
+                public Observable<ImmutablePair<StatusCode, Observable<Drawable>>> call() {
+                    return Observable.just(login());
                 }
             })).subscribeOn(RxUtils.networkScheduler).subscribe(new Action1<ImmutablePair<StatusCode, Observable<Drawable>>>() {
                 @Override