Upgrade to RxJava 0.20.0

33 files changed, 20 insertions, 20 deletions

diff --git a/main/build.gradle b/main/build.gradle
index aca5981..def102f 100644
--- a/main/build.gradle
+++ b/main/build.gradle
@@ -27,7 +27,7 @@ gradle connectedCheck
 //https://github.com/stephanenicolas/Quality-Tools-for-Android
 
 def AAVersion = '3.0.1'
-def RXVersion = '0.19.6'
+def RXVersion = '0.20.0'
 def JacksonCoreVersion = '2.4.1.1'
 def JacksonDatabindVersion = '2.4.1.3'
 def JacksonAnnotationsVersion = '2.4.1'
diff --git a/main/libs/rxjava-android-0.19.6.jar.properties b/main/libs/rxjava-android-0.19.6.jar.properties
deleted file mode 100644
index 7414a89..0000000
--- a/main/libs/rxjava-android-0.19.6.jar.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-src=src/rxjava-android-0.19.6-sources.jar
-doc=src/rxjava-android-0.19.6-javadoc.jar
diff --git a/main/libs/rxjava-android-0.19.6.jar b/main/libs/rxjava-android-0.20.0.jar
index ccc8b6a..525203a 100644
--- a/main/libs/rxjava-android-0.19.6.jar
+++ b/main/libs/rxjava-android-0.20.0.jar
diff --git a/main/libs/rxjava-android-0.20.0.jar.properties b/main/libs/rxjava-android-0.20.0.jar.properties
new file mode 100644
index 0000000..ca2dc8a
--- /dev/null
+++ b/main/libs/rxjava-android-0.20.0.jar.properties
@@ -0,0 +1,2 @@
+src=src/rxjava-android-0.20.0-sources.jar
+doc=src/rxjava-android-0.20.0-javadoc.jar
diff --git a/main/libs/rxjava-async-util-0.19.6.jar b/main/libs/rxjava-async-util-0.19.6.jar
deleted file mode 100644
index 93c1a9b..0000000
--- a/main/libs/rxjava-async-util-0.19.6.jar
+++ /dev/null
diff --git a/main/libs/rxjava-async-util-0.19.6.jar.properties b/main/libs/rxjava-async-util-0.19.6.jar.properties
deleted file mode 100644
index 0396d9a..0000000
--- a/main/libs/rxjava-async-util-0.19.6.jar.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-src=src/rxjava-async-util-0.19.6-sources.jar
-doc=src/rxjava-async-util-0.19.6-javadoc.jar
diff --git a/main/libs/rxjava-async-util-0.20.0.jar b/main/libs/rxjava-async-util-0.20.0.jar
new file mode 100644
index 0000000..302a39c
--- /dev/null
+++ b/main/libs/rxjava-async-util-0.20.0.jar
diff --git a/main/libs/rxjava-async-util-0.20.0.jar.properties b/main/libs/rxjava-async-util-0.20.0.jar.properties
new file mode 100644
index 0000000..1c19645
--- /dev/null
+++ b/main/libs/rxjava-async-util-0.20.0.jar.properties
@@ -0,0 +1,2 @@
+src=src/rxjava-async-util-0.20.0-sources.jar
+doc=src/rxjava-async-util-0.20.0-javadoc.jar
diff --git a/main/libs/rxjava-core-0.19.6.jar b/main/libs/rxjava-core-0.19.6.jar
deleted file mode 100644
index 9b6cbfa..0000000
--- a/main/libs/rxjava-core-0.19.6.jar
+++ /dev/null
diff --git a/main/libs/rxjava-core-0.19.6.jar.properties b/main/libs/rxjava-core-0.19.6.jar.properties
deleted file mode 100644
index 41b8394..0000000
--- a/main/libs/rxjava-core-0.19.6.jar.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-src=src/rxjava-core-0.19.6-sources.jar
-doc=src/rxjava-core-0.19.6-javadoc.jar
diff --git a/main/libs/rxjava-core-0.20.0.jar b/main/libs/rxjava-core-0.20.0.jar
new file mode 100644
index 0000000..2f28550
--- /dev/null
+++ b/main/libs/rxjava-core-0.20.0.jar
diff --git a/main/libs/rxjava-core-0.20.0.jar.properties b/main/libs/rxjava-core-0.20.0.jar.properties
new file mode 100644
index 0000000..3088052
--- /dev/null
+++ b/main/libs/rxjava-core-0.20.0.jar.properties
@@ -0,0 +1,2 @@
+src=src/rxjava-core-0.20.0-sources.jar
+doc=src/rxjava-core-0.20.0-javadoc.jar
diff --git a/main/libs/src/rxjava-android-0.19.6-javadoc b/main/libs/src/rxjava-android-0.19.6-javadoc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/main/libs/src/rxjava-android-0.19.6-javadoc
diff --git a/main/libs/src/rxjava-android-0.19.6-javadoc.jar b/main/libs/src/rxjava-android-0.19.6-javadoc.jar
deleted file mode 100644
index a92ab4f..0000000
--- a/main/libs/src/rxjava-android-0.19.6-javadoc.jar
+++ /dev/null
diff --git a/main/libs/src/rxjava-android-0.19.6-sources.jar b/main/libs/src/rxjava-android-0.19.6-sources.jar
deleted file mode 100644
index ea4eba0..0000000
--- a/main/libs/src/rxjava-android-0.19.6-sources.jar
+++ /dev/null
diff --git a/main/libs/src/rxjava-android-0.20.0-javadoc.jar b/main/libs/src/rxjava-android-0.20.0-javadoc.jar
new file mode 100644
index 0000000..ee2473a
--- /dev/null
+++ b/main/libs/src/rxjava-android-0.20.0-javadoc.jar
diff --git a/main/libs/src/rxjava-android-0.20.0-sources.jar b/main/libs/src/rxjava-android-0.20.0-sources.jar
new file mode 100644
index 0000000..6e34d88
--- /dev/null
+++ b/main/libs/src/rxjava-android-0.20.0-sources.jar
diff --git a/main/libs/src/rxjava-async-util-0.19.6-javadoc b/main/libs/src/rxjava-async-util-0.19.6-javadoc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/main/libs/src/rxjava-async-util-0.19.6-javadoc
diff --git a/main/libs/src/rxjava-async-util-0.19.6-javadoc.jar b/main/libs/src/rxjava-async-util-0.19.6-javadoc.jar
deleted file mode 100644
index f943e5f..0000000
--- a/main/libs/src/rxjava-async-util-0.19.6-javadoc.jar
+++ /dev/null
diff --git a/main/libs/src/rxjava-async-util-0.20.0-javadoc.jar b/main/libs/src/rxjava-async-util-0.20.0-javadoc.jar
new file mode 100644
index 0000000..e5b248a
--- /dev/null
+++ b/main/libs/src/rxjava-async-util-0.20.0-javadoc.jar
diff --git a/main/libs/src/rxjava-async-util-0.19.6-sources.jar b/main/libs/src/rxjava-async-util-0.20.0-sources.jar
index 82ca499..81c768b 100644
--- a/main/libs/src/rxjava-async-util-0.19.6-sources.jar
+++ b/main/libs/src/rxjava-async-util-0.20.0-sources.jar
diff --git a/main/libs/src/rxjava-core-0.19.6-javadoc b/main/libs/src/rxjava-core-0.19.6-javadoc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/main/libs/src/rxjava-core-0.19.6-javadoc
diff --git a/main/libs/src/rxjava-core-0.19.6-javadoc.jar b/main/libs/src/rxjava-core-0.19.6-javadoc.jar
deleted file mode 100644
index 5523ee0..0000000
--- a/main/libs/src/rxjava-core-0.19.6-javadoc.jar
+++ /dev/null
diff --git a/main/libs/src/rxjava-core-0.19.6-sources.jar b/main/libs/src/rxjava-core-0.19.6-sources.jar
deleted file mode 100644
index 0c2aa68..0000000
--- a/main/libs/src/rxjava-core-0.19.6-sources.jar
+++ /dev/null
diff --git a/main/libs/src/rxjava-core-0.20.0-javadoc.jar b/main/libs/src/rxjava-core-0.20.0-javadoc.jar
new file mode 100644
index 0000000..167f76f
--- /dev/null
+++ b/main/libs/src/rxjava-core-0.20.0-javadoc.jar
diff --git a/main/libs/src/rxjava-core-0.20.0-sources.jar b/main/libs/src/rxjava-core-0.20.0-sources.jar
new file mode 100644
index 0000000..29d1009
--- /dev/null
+++ b/main/libs/src/rxjava-core-0.20.0-sources.jar
diff --git a/main/project/libraries/update-libs.sh b/main/project/libraries/update-libs.sh
index bdf25c4..750cb09 100755
--- a/main/project/libraries/update-libs.sh
+++ b/main/project/libraries/update-libs.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 #
 
-RXJAVA=0.19.6
+RXJAVA=0.20.0
 JACKSONCORE=2.4.1.1
 JACKSONDATABIND=2.4.1.3
 JACKSONANNOTATIONS=2.4.1
diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java
index 3723116..7fe1e6d 100644
--- a/main/src/cgeo/geocaching/MainActivity.java
+++ b/main/src/cgeo/geocaching/MainActivity.java
@@ -558,7 +558,7 @@ public class MainActivity extends AbstractActionBarActivity {
                             }
                         }
                     });
-                    AndroidObservable.bindActivity(MainActivity.this, address.onErrorResumeNext(Observable.from(geo.getCoords().toString())))
+                    AndroidObservable.bindActivity(MainActivity.this, address.onErrorResumeNext(Observable.just(geo.getCoords().toString())))
                             .subscribeOn(RxUtils.networkScheduler)
                             .subscribe(new Action1<String>() {
                                 @Override
diff --git a/main/src/cgeo/geocaching/SearchResult.java b/main/src/cgeo/geocaching/SearchResult.java
index 74cc59d..6015872 100644
--- a/main/src/cgeo/geocaching/SearchResult.java
+++ b/main/src/cgeo/geocaching/SearchResult.java
@@ -320,7 +320,7 @@ public class SearchResult implements Parcelable {
                 return cObservable.flatMap(new Func1<C, Observable<? extends SearchResult>>() {
                     @Override
                     public Observable<? extends SearchResult> call(final C c) {
-                        return c.isActive() ? Observable.from(func.call(c)) : Observable.<SearchResult>empty();
+                        return c.isActive() ? Observable.just(func.call(c)) : Observable.<SearchResult>empty();
                     }
                 });
             }
diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java
index d1c81fe..e1fbd37 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCParser.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java
@@ -1677,9 +1677,9 @@ public abstract class GCParser {
      * @return Observable<LogEntry> The logs
      */
     private static Observable<LogEntry> getSpecialLogs(final String page, final SpecialLogs logType) {
-        return Observable.defer(new Func0<Observable<? extends LogEntry>>() {
+        return Observable.defer(new Func0<Observable<LogEntry>>() {
             @Override
-            public Observable<? extends LogEntry> call() {
+            public Observable<LogEntry> call() {
                 final MatcherWrapper userTokenMatcher = new MatcherWrapper(GCConstants.PATTERN_USERTOKEN, page);
                 if (!userTokenMatcher.find()) {
                     Log.e("GCParser.loadLogsFromDetails: unable to extract userToken");
diff --git a/main/src/cgeo/geocaching/connector/gc/RecaptchaHandler.java b/main/src/cgeo/geocaching/connector/gc/RecaptchaHandler.java
index 6095514..affeb7d 100644
--- a/main/src/cgeo/geocaching/connector/gc/RecaptchaHandler.java
+++ b/main/src/cgeo/geocaching/connector/gc/RecaptchaHandler.java
@@ -42,15 +42,15 @@ public class RecaptchaHandler extends Handler {
     }
 
     private void loadChallenge(final ImageView imageView, final View reloadButton) {
-        final Observable<Bitmap> captcha = Observable.defer(new Func0<Observable<? extends Bitmap>>() {
+        final Observable<Bitmap> captcha = Observable.defer(new Func0<Observable<Bitmap>>() {
             @Override
-            public Observable<? extends Bitmap> call() {
+            public Observable<Bitmap> call() {
                 final String url = "http://www.google.com/recaptcha/api/image?c=" + recaptchaReceiver.getChallenge();
                 final InputStream is = Network.getResponseStream(Network.getRequest(url));
                 if (is != null) {
                     try {
                         final Bitmap img = BitmapFactory.decodeStream(is);
-                        return Observable.from(img);
+                        return Observable.just(img);
                     } catch (final Exception e) {
                         Log.e("RecaptchaHandler.getCaptcha", e);
                         return Observable.error(e);
diff --git a/main/src/cgeo/geocaching/network/HtmlImage.java b/main/src/cgeo/geocaching/network/HtmlImage.java
index 4a5c506..c8dfbfa 100644
--- a/main/src/cgeo/geocaching/network/HtmlImage.java
+++ b/main/src/cgeo/geocaching/network/HtmlImage.java
@@ -162,17 +162,17 @@ public class HtmlImage implements Html.ImageGetter {
     public Observable<BitmapDrawable> fetchDrawable(final String url) {
 
         if (StringUtils.isBlank(url) || ImageUtils.containsPattern(url, BLOCKED)) {
-            return Observable.from(ImageUtils.getTransparent1x1Drawable(resources));
+            return Observable.just(ImageUtils.getTransparent1x1Drawable(resources));
         }
 
         // Explicit local file URLs are loaded from the filesystem regardless of their age. The IO part is short
         // enough to make the whole operation on the computation scheduler.
         if (FileUtils.isFileUrl(url)) {
-            return Observable.defer(new Func0<Observable<? extends BitmapDrawable>>() {
+            return Observable.defer(new Func0<Observable<BitmapDrawable>>() {
                 @Override
-                public Observable<? extends BitmapDrawable> call() {
+                public Observable<BitmapDrawable> call() {
                     final Bitmap bitmap = loadCachedImage(FileUtils.urlToFile(url), true).getLeft();
-                    return bitmap != null ? Observable.from(ImageUtils.scaleBitmapToFitDisplay(bitmap)) : Observable.<BitmapDrawable>empty();
+                    return bitmap != null ? Observable.just(ImageUtils.scaleBitmapToFitDisplay(bitmap)) : Observable.<BitmapDrawable>empty();
                 }
             }).subscribeOn(RxUtils.computationScheduler);
         }
diff --git a/main/src/cgeo/geocaching/settings/RegisterSend2CgeoPreference.java b/main/src/cgeo/geocaching/settings/RegisterSend2CgeoPreference.java
index 84c343a..93480ee 100644
--- a/main/src/cgeo/geocaching/settings/RegisterSend2CgeoPreference.java
+++ b/main/src/cgeo/geocaching/settings/RegisterSend2CgeoPreference.java
@@ -69,7 +69,7 @@ public class RegisterSend2CgeoPreference extends AbstractClickablePreference {
                             final String[] strings = StringUtils.split(Network.getResponseData(response), ',');
                             Settings.setWebNameCode(nam, strings[0]);
                             try {
-                                return Observable.from(Integer.parseInt(strings[1].trim()));
+                                return Observable.just(Integer.parseInt(strings[1].trim()));
                             } catch (final Exception e) {
                                 Log.e("RegisterSend2CgeoPreference", e);
                             }