diff options
| -rw-r--r-- | main/build.xml | 6 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/search/AutoCompleteAdapter.java | 4 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/sensors/GeoDirHandler.java | 3 | ||||
| -rw-r--r-- | main/templates/keys.xml | 14 | ||||
| -rw-r--r-- | main/templates/private.properties | 21 |
5 files changed, 43 insertions, 5 deletions
diff --git a/main/build.xml b/main/build.xml index 257aaf3..a888e9b 100644 --- a/main/build.xml +++ b/main/build.xml @@ -112,6 +112,12 @@ <filter token="ocde.okapi.consumer.secret" value="${ocde.okapi.consumer.secret}"/> <filter token="ocpl.okapi.consumer.key" value="${ocpl.okapi.consumer.key}"/> <filter token="ocpl.okapi.consumer.secret" value="${ocpl.okapi.consumer.secret}"/> + <filter token="ocus.okapi.consumer.key" value="${ocus.okapi.consumer.key}"/> + <filter token="ocus.okapi.consumer.secret" value="${ocus.okapi.consumer.secret}"/> + <filter token="ocnl.okapi.consumer.key" value="${ocnl.okapi.consumer.key}"/> + <filter token="ocnl.okapi.consumer.secret" value="${ocnl.okapi.consumer.secret}"/> + <filter token="ocro.okapi.consumer.key" value="${ocro.okapi.consumer.key}"/> + <filter token="ocro.okapi.consumer.secret" value="${ocro.okapi.consumer.secret}"/> </filterset> </copy> </target> diff --git a/main/src/cgeo/geocaching/search/AutoCompleteAdapter.java b/main/src/cgeo/geocaching/search/AutoCompleteAdapter.java index 885ed48..45559f4 100644 --- a/main/src/cgeo/geocaching/search/AutoCompleteAdapter.java +++ b/main/src/cgeo/geocaching/search/AutoCompleteAdapter.java @@ -1,7 +1,6 @@ package cgeo.geocaching.search; import org.apache.commons.lang3.StringUtils; - import rx.functions.Func1; import android.content.Context; @@ -36,7 +35,7 @@ public class AutoCompleteAdapter extends ArrayAdapter<String> { @Override public Filter getFilter() { - Filter filter = new Filter() { + return new Filter() { @Override protected FilterResults performFiltering(CharSequence constraint) { @@ -67,6 +66,5 @@ public class AutoCompleteAdapter extends ArrayAdapter<String> { } } }; - return filter; } }
\ No newline at end of file diff --git a/main/src/cgeo/geocaching/sensors/GeoDirHandler.java b/main/src/cgeo/geocaching/sensors/GeoDirHandler.java index 37a0c5b..df19a92 100644 --- a/main/src/cgeo/geocaching/sensors/GeoDirHandler.java +++ b/main/src/cgeo/geocaching/sensors/GeoDirHandler.java @@ -4,6 +4,7 @@ import cgeo.geocaching.CgeoApplication; import cgeo.geocaching.settings.Settings; import org.apache.commons.lang3.tuple.ImmutablePair; + import rx.Observable; import rx.Subscription; import rx.android.schedulers.AndroidSchedulers; @@ -16,7 +17,7 @@ import rx.subscriptions.CompositeSubscription; * GeoData and Direction handler. * <p> * To use this class, override {@link #updateGeoDir(IGeoData, float)}. You need to start the handler using - * {@link #start()}. A good place to do so might be the {@code onResume} method of the Activity. Stop the Handler + * {@link #start(int)}. A good place to do so might be the {@code onResume} method of the Activity. Stop the Handler * accordingly in {@code onPause}. */ public abstract class GeoDirHandler { diff --git a/main/templates/keys.xml b/main/templates/keys.xml index e667df5..63f7e58 100644 --- a/main/templates/keys.xml +++ b/main/templates/keys.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<resources> +<resources xmlns:tools="http://schemas.android.com/tools"> <!-- Google Maps --> <string name="maps_api_key" translatable="false">@maps.api.key@</string> @@ -10,4 +10,16 @@ <!-- Opencaching.pl --> <string name="oc_pl_okapi_consumer_key" translatable="false">@ocpl.okapi.consumer.key@</string> <string name="oc_pl_okapi_consumer_secret" translatable="false">@ocpl.okapi.consumer.secret@</string> + <!-- disable unused resource warning until remaining implementation has been merged --> + <!-- Opencaching.us --> + <string name="oc_us_okapi_consumer_key" translatable="false" tools:ignore="UnusedResources">@ocus.okapi.consumer.key@</string> + <string name="oc_us_okapi_consumer_secret" translatable="false" tools:ignore="UnusedResources">@ocus.okapi.consumer.secret@</string> + + <!-- Opencaching.nl --> + <string name="oc_nl_okapi_consumer_key" translatable="false" tools:ignore="UnusedResources">@ocnl.okapi.consumer.key@</string> + <string name="oc_nl_okapi_consumer_secret" translatable="false" tools:ignore="UnusedResources">@ocnl.okapi.consumer.secret@</string> + + <!-- Opencaching.ro --> + <string name="oc_ro_okapi_consumer_key" translatable="false" tools:ignore="UnusedResources">@ocro.okapi.consumer.key@</string> + <string name="oc_ro_okapi_consumer_secret" translatable="false" tools:ignore="UnusedResources">@ocro.okapi.consumer.secret@</string> </resources> diff --git a/main/templates/private.properties b/main/templates/private.properties index 0c40fda..2451048 100644 --- a/main/templates/private.properties +++ b/main/templates/private.properties @@ -30,3 +30,24 @@ ocde.okapi.consumer.secret= ocpl.okapi.consumer.key= ocpl.okapi.consumer.secret= + +# These keys allow c:geo to be registered at openaching.us and +# to search and log caches in your name +# You can request your own at http://www.opencaching.us/okapi/signup.html + +ocus.okapi.consumer.key= +ocus.okapi.consumer.secret= + +# These keys allow c:geo to be registered at openaching.nl and +# to search and log caches in your name +# You can request your own at http://www.opencaching.nl/okapi/signup.html + +ocnl.okapi.consumer.key= +ocnl.okapi.consumer.secret= + +# These keys allow c:geo to be registered at openaching.ro and +# to search and log caches in your name +# You can request your own at http://oc.opencaching.ro/okapi/signup.html + +ocro.okapi.consumer.key= +ocro.okapi.consumer.secret= |