From 27668837d1aa756c2b8ee2b73585b77a54203bad Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sun, 20 Apr 2014 11:34:00 +0200
Subject: Take advantage of RxJava's renewed Android operators

---
 .../geocaching/settings/AbstractCheckCredentialsPreference.java  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java')

diff --git a/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java b/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java
index 298270b..917c9c4 100644
--- a/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java
+++ b/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java
@@ -5,12 +5,13 @@ 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;
@@ -64,12 +65,12 @@ public abstract class AbstractCheckCredentialsPreference extends AbstractClickab
             loginDialog.setCancelable(false);
             Cookies.clearCookies();
 
-            RxUtils.subscribeOnIOThenUI(Async.start(new Func0<ImmutablePair<StatusCode, ? extends Drawable>>() {
+            AndroidObservable.bindActivity(activity, Async.start(new Func0<ImmutablePair<StatusCode, ? extends Drawable>>() {
                 @Override
                 public ImmutablePair<StatusCode, ? extends Drawable> call() {
                     return login();
                 }
-            }), new Action1<ImmutablePair<StatusCode, ? extends Drawable>>() {
+            })).subscribe(new Action1<ImmutablePair<StatusCode, ? extends Drawable>>() {
                 @Override
                 public void call(final ImmutablePair<StatusCode, ? extends Drawable> loginInfo) {
                     loginDialog.dismiss();
@@ -85,7 +86,7 @@ public abstract class AbstractCheckCredentialsPreference extends AbstractClickab
                     }
                     activity.initBasicMemberPreferences();
                 }
-            });
+            }, Schedulers.io());
 
             return false; // no shared preference has to be changed
         }
-- 
cgit v1.1