1 files changed, 14 insertions, 12 deletions

diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java
index f20df8d..4a8451b 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCParser.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java
@@ -57,7 +57,6 @@ import rx.functions.Action1;
 import rx.functions.Func0;
 import rx.functions.Func2;
 import rx.schedulers.Schedulers;
-import rx.util.async.Async;
 
 import android.net.Uri;
 import android.text.Html;
@@ -65,6 +64,7 @@ import android.text.Html;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.text.Collator;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -304,12 +304,13 @@ public abstract class GCParser {
 
         if (!cids.isEmpty() && (Settings.isGCPremiumMember() || showCaptcha) && ((recaptchaReceiver == null || StringUtils.isBlank(recaptchaReceiver.getChallenge())) || StringUtils.isNotBlank(recaptchaText))) {
             Log.i("Trying to get .loc for " + cids.size() + " caches");
-            final Observable<Set<Geocache>> storedCaches = Async.start(new Func0<Set<Geocache>>() {
+            final Observable<Set<Geocache>> storedCaches = Observable.defer(new Func0<Observable<Set<Geocache>>>() {
                 @Override
-                public Set<Geocache> call() {
-                    return DataStore.loadCaches(Geocache.getGeocodes(caches), LoadFlags.LOAD_CACHE_OR_DB);
+                public Observable<Set<Geocache>> call() {
+                    return Observable.just(DataStore.loadCaches(Geocache.getGeocodes(caches), LoadFlags.LOAD_CACHE_OR_DB));
                 }
-            }, Schedulers.io());
+            }).subscribeOn(Schedulers.io()).cache();
+            storedCaches.subscribe();  // Force asynchronous start of database loading
 
             try {
                 // get coordinates for parsed caches
@@ -979,22 +980,22 @@ public abstract class GCParser {
      * Observable that fetches a list of pocket queries. Returns a single element (which may be an empty list).
      * Executes on the network scheduler.
      */
-    public static final Observable<List<PocketQueryList>> searchPocketQueryListObservable = Async.fromCallable(new Func0<List<PocketQueryList>>() {
+    public static final Observable<List<PocketQueryList>> searchPocketQueryListObservable = Observable.defer(new Func0<Observable<List<PocketQueryList>>>() {
         @Override
-        public List<PocketQueryList> call() {
+        public Observable<List<PocketQueryList>> call() {
             final Parameters params = new Parameters();
 
             final String page = GCLogin.getInstance().getRequestLogged("http://www.geocaching.com/pocket/default.aspx", params);
 
             if (StringUtils.isBlank(page)) {
                 Log.e("GCParser.searchPocketQueryList: No data from server");
-                return Collections.emptyList();
+                return Observable.just(Collections.<PocketQueryList>emptyList());
             }
 
             final String subPage = StringUtils.substringAfter(page, "class=\"PocketQueryListTable");
             if (StringUtils.isEmpty(subPage)) {
                 Log.e("GCParser.searchPocketQueryList: class \"PocketQueryListTable\" not found on page");
-                return Collections.emptyList();
+                return Observable.just(Collections.<PocketQueryList>emptyList());
             }
 
             final List<PocketQueryList> list = new ArrayList<>();
@@ -1016,17 +1017,18 @@ public abstract class GCParser {
             }
 
             // just in case, lets sort the resulting list
+            final Collator collator = TextUtils.getCollator();
             Collections.sort(list, new Comparator<PocketQueryList>() {
 
                 @Override
                 public int compare(final PocketQueryList left, final PocketQueryList right) {
-                    return String.CASE_INSENSITIVE_ORDER.compare(left.getName(), right.getName());
+                    return collator.compare(left.getName(), right.getName());
                 }
             });
 
-            return list;
+            return Observable.just(list);
         }
-    }, RxUtils.networkScheduler);
+    }).subscribeOn(RxUtils.networkScheduler);
 
     public static ImmutablePair<StatusCode, String> postLog(final String geocode, final String cacheid, final String[] viewstates,
             final LogType logType, final int year, final int month, final int day,