From c87fc7a6b372539e1e084eb5e50edb7d8e340852 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Mon, 9 Jun 2014 21:40:53 +0200 Subject: Upgrade RxJava to version 0.19 --- main/libs/rxjava-android-0.18.3.jar | Bin 35884 -> 0 bytes main/libs/rxjava-android-0.19.0.jar | Bin 0 -> 35882 bytes main/libs/rxjava-async-util-0.18.3.jar | Bin 47693 -> 0 bytes main/libs/rxjava-async-util-0.19.0.jar | Bin 0 -> 47675 bytes main/libs/rxjava-core-0.18.3.jar | Bin 567999 -> 0 bytes main/libs/rxjava-core-0.19.0.jar | Bin 0 -> 584452 bytes .../cgeo/geocaching/AbstractDialogFragment.java | 4 +-- main/src/cgeo/geocaching/CacheDetailActivity.java | 27 +++++++++++---------- main/src/cgeo/geocaching/CgeoApplication.java | 2 +- main/src/cgeo/geocaching/DataStore.java | 4 +-- main/src/cgeo/geocaching/MainActivity.java | 3 ++- main/src/cgeo/geocaching/PocketQueryList.java | 4 +-- main/src/cgeo/geocaching/SearchResult.java | 2 +- main/src/cgeo/geocaching/StatusFragment.java | 5 ++-- .../src/cgeo/geocaching/connector/gc/GCParser.java | 4 +-- .../geocaching/connector/gc/RecaptchaHandler.java | 4 +-- main/src/cgeo/geocaching/network/HtmlImage.java | 2 +- .../cgeo/geocaching/sensors/GeoDataProvider.java | 6 +++-- .../AbstractCheckCredentialsPreference.java | 4 +-- .../settings/RegisterSend2CgeoPreference.java | 4 +-- main/src/cgeo/geocaching/utils/RxUtils.java | 2 +- 21 files changed, 41 insertions(+), 36 deletions(-) delete mode 100644 main/libs/rxjava-android-0.18.3.jar create mode 100644 main/libs/rxjava-android-0.19.0.jar delete mode 100644 main/libs/rxjava-async-util-0.18.3.jar create mode 100644 main/libs/rxjava-async-util-0.19.0.jar delete mode 100644 main/libs/rxjava-core-0.18.3.jar create mode 100644 main/libs/rxjava-core-0.19.0.jar (limited to 'main') diff --git a/main/libs/rxjava-android-0.18.3.jar b/main/libs/rxjava-android-0.18.3.jar deleted file mode 100644 index e8b12ec..0000000 Binary files a/main/libs/rxjava-android-0.18.3.jar and /dev/null differ diff --git a/main/libs/rxjava-android-0.19.0.jar b/main/libs/rxjava-android-0.19.0.jar new file mode 100644 index 0000000..afd9070 Binary files /dev/null and b/main/libs/rxjava-android-0.19.0.jar differ diff --git a/main/libs/rxjava-async-util-0.18.3.jar b/main/libs/rxjava-async-util-0.18.3.jar deleted file mode 100644 index c3cc522..0000000 Binary files a/main/libs/rxjava-async-util-0.18.3.jar and /dev/null differ diff --git a/main/libs/rxjava-async-util-0.19.0.jar b/main/libs/rxjava-async-util-0.19.0.jar new file mode 100644 index 0000000..8f60ba5 Binary files /dev/null and b/main/libs/rxjava-async-util-0.19.0.jar differ diff --git a/main/libs/rxjava-core-0.18.3.jar b/main/libs/rxjava-core-0.18.3.jar deleted file mode 100644 index 699e327..0000000 Binary files a/main/libs/rxjava-core-0.18.3.jar and /dev/null differ diff --git a/main/libs/rxjava-core-0.19.0.jar b/main/libs/rxjava-core-0.19.0.jar new file mode 100644 index 0000000..898a803 Binary files /dev/null and b/main/libs/rxjava-core-0.19.0.jar differ diff --git a/main/src/cgeo/geocaching/AbstractDialogFragment.java b/main/src/cgeo/geocaching/AbstractDialogFragment.java index 84a20ea..6de8fec 100644 --- a/main/src/cgeo/geocaching/AbstractDialogFragment.java +++ b/main/src/cgeo/geocaching/AbstractDialogFragment.java @@ -194,7 +194,7 @@ public abstract class AbstractDialogFragment extends DialogFragment implements C final GCVoteRating rating = GCVote.getRating(cache.getGuid(), geocode); return rating != null ? Observable.just(rating) : Observable.empty(); } - })).subscribe(new Action1() { + })).subscribeOn(Schedulers.io()).subscribe(new Action1() { @Override public void call(final GCVoteRating rating) { cache.setRating(rating.getRating()); @@ -202,7 +202,7 @@ public abstract class AbstractDialogFragment extends DialogFragment implements C DataStore.saveChangedCache(cache); details.addRating(cache); } - }, Schedulers.io()); + }); } protected final void addCacheDetails() { diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java index f0cb392..062c97a 100644 --- a/main/src/cgeo/geocaching/CacheDetailActivity.java +++ b/main/src/cgeo/geocaching/CacheDetailActivity.java @@ -908,17 +908,18 @@ public class CacheDetailActivity extends AbstractViewPagerActivity() { - @Override - public void call(final BitmapDrawable image) { - final Bitmap bitmap = image.getBitmap(); - if (bitmap != null && bitmap.getWidth() > 10) { - final ImageView imageView = (ImageView) view.findViewById(R.id.map_preview); - imageView.setImageDrawable(image); - view.findViewById(R.id.map_preview_box).setVisibility(View.VISIBLE); - } - } - }, Schedulers.io()); + AndroidObservable.bindActivity(CacheDetailActivity.this, previewMap).subscribeOn(Schedulers.io()) + .subscribe(new Action1() { + @Override + public void call(final BitmapDrawable image) { + final Bitmap bitmap = image.getBitmap(); + if (bitmap != null && bitmap.getWidth() > 10) { + final ImageView imageView = (ImageView) view.findViewById(R.id.map_preview); + imageView.setImageDrawable(image); + view.findViewById(R.id.map_preview_box).setVisibility(View.VISIBLE); + } + } + }); detailsList = (LinearLayout) view.findViewById(R.id.details_list); final CacheDetailsCreator details = new CacheDetailsCreator(CacheDetailActivity.this, detailsList); @@ -1572,7 +1573,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity() { + AndroidObservable.bindActivity(this, producer).subscribeOn(Schedulers.io()).subscribe(new Observer() { @Override public void onCompleted() { if (null != loadingIndicatorView) { @@ -1636,7 +1637,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity() { + })).subscribeOn(Schedulers.io()).subscribe(new Action1() { @Override public void call(final Boolean success) { dialog.dismiss(); final String message = success ? fromActivity.getString(R.string.init_dbmove_success) : fromActivity.getString(R.string.init_dbmove_failed); Dialogs.message(fromActivity, R.string.init_dbmove_dbmove, message); } - }, Schedulers.io()); + }); } private static File databasePath(final boolean internal) { diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java index 2ed130f..5be3df7 100644 --- a/main/src/cgeo/geocaching/MainActivity.java +++ b/main/src/cgeo/geocaching/MainActivity.java @@ -572,12 +572,13 @@ public class MainActivity extends AbstractActionBarActivity { } }); AndroidObservable.bindActivity(MainActivity.this, address.onErrorResumeNext(Observable.from(geo.getCoords().toString()))) + .subscribeOn(Schedulers.io()) .subscribe(new Action1() { @Override public void call(final String address) { navLocation.setText(address); } - }, Schedulers.io()); + }); } } else { navLocation.setText(geo.getCoords().toString()); diff --git a/main/src/cgeo/geocaching/PocketQueryList.java b/main/src/cgeo/geocaching/PocketQueryList.java index 2ac137f..4e84881 100644 --- a/main/src/cgeo/geocaching/PocketQueryList.java +++ b/main/src/cgeo/geocaching/PocketQueryList.java @@ -52,13 +52,13 @@ public final class PocketQueryList { subscriber.onNext(GCParser.searchPocketQueryList()); subscriber.onCompleted(); } - })).subscribe(new Action1>() { + })).subscribeOn(Schedulers.io()).subscribe(new Action1>() { @Override public void call(final List pocketQueryLists) { waitDialog.dismiss(); selectFromPocketQueries(activity, pocketQueryLists, runAfterwards); } - }, Schedulers.io()); + }); } private static void selectFromPocketQueries(final Activity activity, final List pocketQueryList, final Action1 runAfterwards) { if (CollectionUtils.isEmpty(pocketQueryList)) { diff --git a/main/src/cgeo/geocaching/SearchResult.java b/main/src/cgeo/geocaching/SearchResult.java index 1916afd..2e8a3f6 100644 --- a/main/src/cgeo/geocaching/SearchResult.java +++ b/main/src/cgeo/geocaching/SearchResult.java @@ -330,7 +330,7 @@ public class SearchResult implements Parcelable { searchResult.addSearchResult(searchResult2); return searchResult; } - }).toBlockingObservable().first(); + }).toBlocking().first(); } } diff --git a/main/src/cgeo/geocaching/StatusFragment.java b/main/src/cgeo/geocaching/StatusFragment.java index f8552d7..553acc1 100644 --- a/main/src/cgeo/geocaching/StatusFragment.java +++ b/main/src/cgeo/geocaching/StatusFragment.java @@ -31,7 +31,8 @@ public class StatusFragment extends Fragment { final ViewGroup statusGroup = (ViewGroup) inflater.inflate(R.layout.status, container, false); final ImageView statusIcon = (ImageView) statusGroup.findViewById(R.id.status_icon); final TextView statusMessage = (TextView) statusGroup.findViewById(R.id.status_message); - statusSubscription = AndroidObservable.bindFragment(this, StatusUpdater.latestStatus).subscribe(new Action1() { + statusSubscription = AndroidObservable.bindFragment(this, StatusUpdater.latestStatus).subscribeOn(Schedulers.io()) + .subscribe(new Action1() { @Override public void call(final Status status) { if (status == null) { @@ -77,7 +78,7 @@ public class StatusFragment extends Fragment { statusGroup.setClickable(false); } } - }, Schedulers.io()); + }); return statusGroup; } diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java index 4ae03bf..6887654 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCParser.java +++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java @@ -371,7 +371,7 @@ public abstract class GCParser { final SearchResult result = new SearchResult(parsed.left); if (parsed.left == StatusCode.NO_ERROR) { result.addAndPutInCache(Collections.singletonList(parsed.right)); - DataStore.saveLogsWithoutTransaction(parsed.right.getGeocode(), getLogsFromDetails(page).toBlockingObservable().toIterable()); + DataStore.saveLogsWithoutTransaction(parsed.right.getGeocode(), getLogsFromDetails(page).toBlocking().toIterable()); } return result; } @@ -1909,7 +1909,7 @@ public abstract class GCParser { } // Wait for completion of logs parsing, retrieving and merging - mergedLogs.toBlockingObservable().last(); + mergedLogs.toBlocking().last(); } /** diff --git a/main/src/cgeo/geocaching/connector/gc/RecaptchaHandler.java b/main/src/cgeo/geocaching/connector/gc/RecaptchaHandler.java index 7cced74..5327bea 100644 --- a/main/src/cgeo/geocaching/connector/gc/RecaptchaHandler.java +++ b/main/src/cgeo/geocaching/connector/gc/RecaptchaHandler.java @@ -57,7 +57,7 @@ public class RecaptchaHandler extends Handler { return Observable.empty(); } }); - AndroidObservable.bindActivity(activity, captcha).subscribe(new Action1() { + AndroidObservable.bindActivity(activity, captcha).subscribeOn(Schedulers.io()).subscribe(new Action1() { @Override public void call(final Bitmap bitmap) { imageView.setImageBitmap(bitmap); @@ -67,7 +67,7 @@ public class RecaptchaHandler extends Handler { public void call(final Throwable throwable) { // Do nothing } - }, Schedulers.io()); + }); reloadButton.setEnabled(true); } diff --git a/main/src/cgeo/geocaching/network/HtmlImage.java b/main/src/cgeo/geocaching/network/HtmlImage.java index 7c3434e..ce832fb 100644 --- a/main/src/cgeo/geocaching/network/HtmlImage.java +++ b/main/src/cgeo/geocaching/network/HtmlImage.java @@ -121,7 +121,7 @@ public class HtmlImage implements Html.ImageGetter { })); return null; } - return drawable.toBlockingObservable().lastOrDefault(null); + return drawable.toBlocking().lastOrDefault(null); } // Caches are loaded from disk on a computation scheduler to avoid using more threads than cores while decoding diff --git a/main/src/cgeo/geocaching/sensors/GeoDataProvider.java b/main/src/cgeo/geocaching/sensors/GeoDataProvider.java index a68f2a6..a4799cb 100644 --- a/main/src/cgeo/geocaching/sensors/GeoDataProvider.java +++ b/main/src/cgeo/geocaching/sensors/GeoDataProvider.java @@ -4,12 +4,14 @@ import cgeo.geocaching.utils.Log; import cgeo.geocaching.utils.StartableHandlerThread; import org.apache.commons.lang3.StringUtils; + import rx.Observable; import rx.Observable.OnSubscribe; import rx.Subscriber; import rx.Subscription; import rx.android.schedulers.AndroidSchedulers; import rx.functions.Action0; +import rx.functions.Action1; import rx.observables.ConnectableObservable; import rx.subjects.BehaviorSubject; import rx.subscriptions.CompositeSubscription; @@ -94,7 +96,7 @@ public class GeoDataProvider implements OnSubscribe { final private Listener gpsListener = new Listener(LocationManager.GPS_PROVIDER, gpsLocation); @Override - public Subscription connect() { + public void connect(Action1 connection) { final CompositeSubscription subscription = new CompositeSubscription(); AndroidSchedulers.handlerThread(handlerThread.getHandler()).createWorker().schedule(new Action0() { @Override @@ -133,7 +135,7 @@ public class GeoDataProvider implements OnSubscribe { })); } }); - return subscription; + connection.call(subscription); } }; diff --git a/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java b/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java index 917c9c4..b209a70 100644 --- a/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java +++ b/main/src/cgeo/geocaching/settings/AbstractCheckCredentialsPreference.java @@ -70,7 +70,7 @@ public abstract class AbstractCheckCredentialsPreference extends AbstractClickab public ImmutablePair call() { return login(); } - })).subscribe(new Action1>() { + })).subscribeOn(Schedulers.io()).subscribe(new Action1>() { @Override public void call(final ImmutablePair loginInfo) { loginDialog.dismiss(); @@ -86,7 +86,7 @@ public abstract class AbstractCheckCredentialsPreference extends AbstractClickab } activity.initBasicMemberPreferences(); } - }, Schedulers.io()); + }); return false; // no shared preference has to be changed } diff --git a/main/src/cgeo/geocaching/settings/RegisterSend2CgeoPreference.java b/main/src/cgeo/geocaching/settings/RegisterSend2CgeoPreference.java index cc2de9f..e899be9 100644 --- a/main/src/cgeo/geocaching/settings/RegisterSend2CgeoPreference.java +++ b/main/src/cgeo/geocaching/settings/RegisterSend2CgeoPreference.java @@ -75,7 +75,7 @@ public class RegisterSend2CgeoPreference extends AbstractClickablePreference { return Observable.empty(); } - }).firstOrDefault(0)).subscribe(new Action1() { + }).firstOrDefault(0)).subscribeOn(Schedulers.io()).subscribe(new Action1() { @Override public void call(final Integer pin) { progressDialog.dismiss(); @@ -87,7 +87,7 @@ public class RegisterSend2CgeoPreference extends AbstractClickablePreference { Dialogs.message(activity, R.string.init_sendToCgeo, R.string.init_sendToCgeo_register_fail); } } - }, Schedulers.io()); + }); return true; } diff --git a/main/src/cgeo/geocaching/utils/RxUtils.java b/main/src/cgeo/geocaching/utils/RxUtils.java index a5cdc5f..b865f0b 100644 --- a/main/src/cgeo/geocaching/utils/RxUtils.java +++ b/main/src/cgeo/geocaching/utils/RxUtils.java @@ -18,6 +18,6 @@ public class RxUtils { } public static void waitForCompletion(final Observable... observables) { - waitForCompletion(Observable.merge(observables).toBlockingObservable()); + waitForCompletion(Observable.merge(observables).toBlocking()); } } -- cgit v1.1