diff options
Diffstat (limited to 'main')
29 files changed, 28 insertions, 28 deletions
diff --git a/main/libs/rxjava-android-0.17.0-RC1.jar b/main/libs/rxjava-android-0.17.0-RC1.jar Binary files differdeleted file mode 100644 index ade903b..0000000 --- a/main/libs/rxjava-android-0.17.0-RC1.jar +++ /dev/null diff --git a/main/libs/rxjava-android-0.17.0-RC2.jar b/main/libs/rxjava-android-0.17.0-RC2.jar Binary files differnew file mode 100644 index 0000000..d9c0c7c --- /dev/null +++ b/main/libs/rxjava-android-0.17.0-RC2.jar diff --git a/main/libs/rxjava-core-0.17.0-RC1.jar b/main/libs/rxjava-core-0.17.0-RC1.jar Binary files differdeleted file mode 100644 index 7d48ee4..0000000 --- a/main/libs/rxjava-core-0.17.0-RC1.jar +++ /dev/null diff --git a/main/libs/rxjava-core-0.17.0-RC2.jar b/main/libs/rxjava-core-0.17.0-RC2.jar Binary files differnew file mode 100644 index 0000000..00cc1f8 --- /dev/null +++ b/main/libs/rxjava-core-0.17.0-RC2.jar diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java index 9f39637..52214f4 100644 --- a/main/src/cgeo/geocaching/CacheDetailActivity.java +++ b/main/src/cgeo/geocaching/CacheDetailActivity.java @@ -63,7 +63,7 @@ import rx.Observer; import rx.Subscriber; import rx.android.observables.AndroidObservable; import rx.schedulers.Schedulers; -import rx.util.functions.Action1; +import rx.functions.Action1; import android.R.color; import android.app.AlertDialog; diff --git a/main/src/cgeo/geocaching/CacheListActivity.java b/main/src/cgeo/geocaching/CacheListActivity.java index a12663d..883c70f 100644 --- a/main/src/cgeo/geocaching/CacheListActivity.java +++ b/main/src/cgeo/geocaching/CacheListActivity.java @@ -56,7 +56,7 @@ import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; import org.eclipse.jdt.annotation.NonNull; -import rx.util.functions.Action1; +import rx.functions.Action1; import android.app.Activity; import android.app.AlertDialog; diff --git a/main/src/cgeo/geocaching/CachePopup.java b/main/src/cgeo/geocaching/CachePopup.java index 5d04ab0..c6c7c1c 100644 --- a/main/src/cgeo/geocaching/CachePopup.java +++ b/main/src/cgeo/geocaching/CachePopup.java @@ -11,7 +11,7 @@ import cgeo.geocaching.utils.CancellableHandler; import cgeo.geocaching.utils.Log; import org.apache.commons.lang3.StringUtils; -import rx.util.functions.Action1; +import rx.functions.Action1; import android.content.Context; import android.content.Intent; diff --git a/main/src/cgeo/geocaching/CreateShortcutActivity.java b/main/src/cgeo/geocaching/CreateShortcutActivity.java index 0b91da0..b6ea4f6 100644 --- a/main/src/cgeo/geocaching/CreateShortcutActivity.java +++ b/main/src/cgeo/geocaching/CreateShortcutActivity.java @@ -4,7 +4,7 @@ import cgeo.geocaching.activity.AbstractActivity; import cgeo.geocaching.list.PseudoList; import cgeo.geocaching.list.StoredList; -import rx.util.functions.Action1; +import rx.functions.Action1; import android.content.Intent; import android.content.Intent.ShortcutIconResource; diff --git a/main/src/cgeo/geocaching/DirectionProvider.java b/main/src/cgeo/geocaching/DirectionProvider.java index f6c04ae..49a433e 100644 --- a/main/src/cgeo/geocaching/DirectionProvider.java +++ b/main/src/cgeo/geocaching/DirectionProvider.java @@ -9,7 +9,7 @@ import rx.Subscription; import rx.observables.ConnectableObservable; import rx.subjects.BehaviorSubject; import rx.subscriptions.Subscriptions; -import rx.util.functions.Action0; +import rx.functions.Action0; import android.app.Activity; import android.content.Context; diff --git a/main/src/cgeo/geocaching/GeoDataProvider.java b/main/src/cgeo/geocaching/GeoDataProvider.java index d520c71..e18f735 100644 --- a/main/src/cgeo/geocaching/GeoDataProvider.java +++ b/main/src/cgeo/geocaching/GeoDataProvider.java @@ -12,7 +12,7 @@ import rx.Subscription; import rx.observables.ConnectableObservable; import rx.subjects.BehaviorSubject; import rx.subscriptions.Subscriptions; -import rx.util.functions.Action0; +import rx.functions.Action0; import android.content.Context; import android.location.GpsSatellite; diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java index 900da4b..6d89991 100644 --- a/main/src/cgeo/geocaching/MainActivity.java +++ b/main/src/cgeo/geocaching/MainActivity.java @@ -30,7 +30,7 @@ import rx.Observable.OnSubscribe; import rx.Subscriber; import rx.android.observables.AndroidObservable; import rx.schedulers.Schedulers; -import rx.util.functions.Action1; +import rx.functions.Action1; import android.app.AlertDialog; import android.app.AlertDialog.Builder; diff --git a/main/src/cgeo/geocaching/PocketQueryList.java b/main/src/cgeo/geocaching/PocketQueryList.java index 564790a..9b48f92 100644 --- a/main/src/cgeo/geocaching/PocketQueryList.java +++ b/main/src/cgeo/geocaching/PocketQueryList.java @@ -9,7 +9,7 @@ import rx.Observable.OnSubscribe; import rx.Subscriber; import rx.android.observables.AndroidObservable; import rx.schedulers.Schedulers; -import rx.util.functions.Action1; +import rx.functions.Action1; import android.app.Activity; import android.app.AlertDialog; diff --git a/main/src/cgeo/geocaching/SearchActivity.java b/main/src/cgeo/geocaching/SearchActivity.java index fe9edd0..61ef395 100644 --- a/main/src/cgeo/geocaching/SearchActivity.java +++ b/main/src/cgeo/geocaching/SearchActivity.java @@ -20,7 +20,7 @@ import org.apache.commons.lang3.StringUtils; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import rx.util.functions.Func1; +import rx.functions.Func1; import android.app.Activity; import android.app.SearchManager; diff --git a/main/src/cgeo/geocaching/StatusFragment.java b/main/src/cgeo/geocaching/StatusFragment.java index a4b5973..3672a3b 100644 --- a/main/src/cgeo/geocaching/StatusFragment.java +++ b/main/src/cgeo/geocaching/StatusFragment.java @@ -6,7 +6,7 @@ import cgeo.geocaching.utils.Log; import rx.Subscription; import rx.android.observables.AndroidObservable; -import rx.util.functions.Action1; +import rx.functions.Action1; import android.content.Intent; import android.content.res.Resources; diff --git a/main/src/cgeo/geocaching/connector/AbstractConnector.java b/main/src/cgeo/geocaching/connector/AbstractConnector.java index ca05439..6d8d79e 100644 --- a/main/src/cgeo/geocaching/connector/AbstractConnector.java +++ b/main/src/cgeo/geocaching/connector/AbstractConnector.java @@ -19,7 +19,7 @@ import cgeo.geocaching.geopoint.Geopoint; import org.apache.commons.lang3.StringUtils; import org.eclipse.jdt.annotation.NonNull; -import rx.util.functions.Action1; +import rx.functions.Action1; import java.util.ArrayList; import java.util.Collection; diff --git a/main/src/cgeo/geocaching/connector/ConnectorFactory.java b/main/src/cgeo/geocaching/connector/ConnectorFactory.java index c6cfeb5..18344f5 100644 --- a/main/src/cgeo/geocaching/connector/ConnectorFactory.java +++ b/main/src/cgeo/geocaching/connector/ConnectorFactory.java @@ -30,8 +30,8 @@ import org.eclipse.jdt.annotation.Nullable; import rx.Observable; import rx.schedulers.Schedulers; -import rx.util.functions.Func1; -import rx.util.functions.Func2; +import rx.functions.Func1; +import rx.functions.Func2; import java.util.ArrayList; import java.util.Arrays; diff --git a/main/src/cgeo/geocaching/connector/UserAction.java b/main/src/cgeo/geocaching/connector/UserAction.java index da03a95..e9ee4a3 100644 --- a/main/src/cgeo/geocaching/connector/UserAction.java +++ b/main/src/cgeo/geocaching/connector/UserAction.java @@ -1,7 +1,7 @@ package cgeo.geocaching.connector; import org.eclipse.jdt.annotation.NonNull; -import rx.util.functions.Action1; +import rx.functions.Action1; import android.app.Activity; diff --git a/main/src/cgeo/geocaching/connector/gc/GCConnector.java b/main/src/cgeo/geocaching/connector/gc/GCConnector.java index e90dc16..925f6f0 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCConnector.java +++ b/main/src/cgeo/geocaching/connector/gc/GCConnector.java @@ -35,7 +35,7 @@ import org.apache.commons.lang3.StringUtils; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import rx.util.functions.Action1; +import rx.functions.Action1; import android.content.Context; import android.content.Intent; diff --git a/main/src/cgeo/geocaching/connector/gc/RecaptchaHandler.java b/main/src/cgeo/geocaching/connector/gc/RecaptchaHandler.java index 44ad850..ff3f5ef 100644 --- a/main/src/cgeo/geocaching/connector/gc/RecaptchaHandler.java +++ b/main/src/cgeo/geocaching/connector/gc/RecaptchaHandler.java @@ -10,8 +10,8 @@ import org.apache.commons.io.IOUtils; import rx.Observable; import rx.android.observables.AndroidObservable; import rx.schedulers.Schedulers; -import rx.util.functions.Action1; -import rx.util.functions.Func0; +import rx.functions.Action1; +import rx.functions.Func0; import android.app.Activity; import android.app.AlertDialog; diff --git a/main/src/cgeo/geocaching/filter/FilterUserInterface.java b/main/src/cgeo/geocaching/filter/FilterUserInterface.java index 0033b9a..b6eaa78 100644 --- a/main/src/cgeo/geocaching/filter/FilterUserInterface.java +++ b/main/src/cgeo/geocaching/filter/FilterUserInterface.java @@ -6,7 +6,7 @@ import cgeo.geocaching.enumerations.CacheType; import cgeo.geocaching.settings.Settings; import cgeo.geocaching.utils.Log; -import rx.util.functions.Action1; +import rx.functions.Action1; import android.app.Activity; import android.app.AlertDialog; diff --git a/main/src/cgeo/geocaching/list/StoredList.java b/main/src/cgeo/geocaching/list/StoredList.java index ba8ce35..7e2a83c 100644 --- a/main/src/cgeo/geocaching/list/StoredList.java +++ b/main/src/cgeo/geocaching/list/StoredList.java @@ -9,7 +9,7 @@ import cgeo.geocaching.ui.dialog.Dialogs; import org.apache.commons.lang3.StringUtils; import org.eclipse.jdt.annotation.NonNull; -import rx.util.functions.Action1; +import rx.functions.Action1; import android.app.Activity; import android.app.AlertDialog; diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java index 0537461..1d8e1b4 100644 --- a/main/src/cgeo/geocaching/maps/CGeoMap.java +++ b/main/src/cgeo/geocaching/maps/CGeoMap.java @@ -43,7 +43,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.HashCodeBuilder; -import rx.util.functions.Action1; +import rx.functions.Action1; import android.app.Activity; import android.app.AlertDialog; diff --git a/main/src/cgeo/geocaching/network/HtmlImage.java b/main/src/cgeo/geocaching/network/HtmlImage.java index d68e242..55cee53 100644 --- a/main/src/cgeo/geocaching/network/HtmlImage.java +++ b/main/src/cgeo/geocaching/network/HtmlImage.java @@ -27,8 +27,8 @@ import rx.Subscriber; import rx.schedulers.Schedulers; import rx.subjects.PublishSubject; import rx.subscriptions.CompositeSubscription; -import rx.util.functions.Action1; -import rx.util.functions.Func1; +import rx.functions.Action1; +import rx.functions.Func1; import android.content.res.Resources; import android.graphics.Bitmap; diff --git a/main/src/cgeo/geocaching/network/StatusUpdater.java b/main/src/cgeo/geocaching/network/StatusUpdater.java index 838823b..4055f01 100644 --- a/main/src/cgeo/geocaching/network/StatusUpdater.java +++ b/main/src/cgeo/geocaching/network/StatusUpdater.java @@ -8,7 +8,7 @@ import org.json.JSONObject; import rx.Scheduler; import rx.schedulers.Schedulers; import rx.subjects.BehaviorSubject; -import rx.util.functions.Action1; +import rx.functions.Action1; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; diff --git a/main/src/cgeo/geocaching/search/AutoCompleteAdapter.java b/main/src/cgeo/geocaching/search/AutoCompleteAdapter.java index 123469c..15a45c6 100644 --- a/main/src/cgeo/geocaching/search/AutoCompleteAdapter.java +++ b/main/src/cgeo/geocaching/search/AutoCompleteAdapter.java @@ -2,7 +2,7 @@ package cgeo.geocaching.search; import org.apache.commons.lang3.StringUtils; -import rx.util.functions.Func1; +import rx.functions.Func1; import android.content.Context; import android.widget.ArrayAdapter; diff --git a/main/src/cgeo/geocaching/sorting/ComparatorUserInterface.java b/main/src/cgeo/geocaching/sorting/ComparatorUserInterface.java index 8cf3d9d..7f10353 100644 --- a/main/src/cgeo/geocaching/sorting/ComparatorUserInterface.java +++ b/main/src/cgeo/geocaching/sorting/ComparatorUserInterface.java @@ -3,7 +3,7 @@ package cgeo.geocaching.sorting; import cgeo.geocaching.R; import cgeo.geocaching.utils.Log; -import rx.util.functions.Action1; +import rx.functions.Action1; import android.app.Activity; import android.app.AlertDialog; diff --git a/main/src/cgeo/geocaching/ui/ImagesList.java b/main/src/cgeo/geocaching/ui/ImagesList.java index 4058e15..d2e7993 100644 --- a/main/src/cgeo/geocaching/ui/ImagesList.java +++ b/main/src/cgeo/geocaching/ui/ImagesList.java @@ -11,7 +11,7 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import rx.android.observables.AndroidObservable; import rx.subscriptions.CompositeSubscription; -import rx.util.functions.Action1; +import rx.functions.Action1; import android.app.Activity; import android.content.Intent; diff --git a/main/src/cgeo/geocaching/ui/dialog/Dialogs.java b/main/src/cgeo/geocaching/ui/dialog/Dialogs.java index 1a53aec..cb8926a 100644 --- a/main/src/cgeo/geocaching/ui/dialog/Dialogs.java +++ b/main/src/cgeo/geocaching/ui/dialog/Dialogs.java @@ -6,7 +6,7 @@ import cgeo.geocaching.R; import org.apache.commons.lang3.StringUtils; import org.eclipse.jdt.annotation.Nullable; -import rx.util.functions.Action1; +import rx.functions.Action1; import android.app.Activity; import android.app.AlertDialog; diff --git a/main/src/cgeo/geocaching/utils/GeoDirHandler.java b/main/src/cgeo/geocaching/utils/GeoDirHandler.java index 1ccc4f7..7050e61 100644 --- a/main/src/cgeo/geocaching/utils/GeoDirHandler.java +++ b/main/src/cgeo/geocaching/utils/GeoDirHandler.java @@ -8,7 +8,7 @@ import rx.Scheduler; import rx.Subscription; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -import rx.util.functions.Action1; +import rx.functions.Action1; import java.util.concurrent.TimeUnit; |