diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-06-09 21:40:53 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-06-09 21:53:18 +0200 |
| commit | c87fc7a6b372539e1e084eb5e50edb7d8e340852 (patch) | |
| tree | cafbe6d4107a1645b84d8612d7a9219a99e1ec7b /main/src/cgeo/geocaching/sensors | |
| parent | b0fc0af35e8fba289e38d06e5536135b4e5b36a6 (diff) | |
| download | cgeo-c87fc7a6b372539e1e084eb5e50edb7d8e340852.zip cgeo-c87fc7a6b372539e1e084eb5e50edb7d8e340852.tar.gz cgeo-c87fc7a6b372539e1e084eb5e50edb7d8e340852.tar.bz2 | |
Upgrade RxJava to version 0.19
Diffstat (limited to 'main/src/cgeo/geocaching/sensors')
| -rw-r--r-- | main/src/cgeo/geocaching/sensors/GeoDataProvider.java | 6 |
1 files changed, 4 insertions, 2 deletions
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<IGeoData> { final private Listener gpsListener = new Listener(LocationManager.GPS_PROVIDER, gpsLocation); @Override - public Subscription connect() { + public void connect(Action1<? super Subscription> connection) { final CompositeSubscription subscription = new CompositeSubscription(); AndroidSchedulers.handlerThread(handlerThread.getHandler()).createWorker().schedule(new Action0() { @Override @@ -133,7 +135,7 @@ public class GeoDataProvider implements OnSubscribe<IGeoData> { })); } }); - return subscription; + connection.call(subscription); } }; |
