aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBananeweizen <bananeweizen@gmx.de>2015-02-13 18:38:13 +0100
committerBananeweizen <bananeweizen@gmx.de>2015-02-13 18:38:13 +0100
commitbfcefc77a7f245143f3a007d3fd92ec4ef625df1 (patch)
treec8a62d17d5b337e6103e6690c5aba4e58fb4add6
parent3e1a3dcf13987044dc6ebe016f3bb8c944689c21 (diff)
downloadcgeo-bfcefc77a7f245143f3a007d3fd92ec4ef625df1.zip
cgeo-bfcefc77a7f245143f3a007d3fd92ec4ef625df1.tar.gz
cgeo-bfcefc77a7f245143f3a007d3fd92ec4ef625df1.tar.bz2
#4670: register for geocaching.com.au swaggy links
-rw-r--r--main/AndroidManifest.xml21
-rw-r--r--main/src/cgeo/geocaching/TrackableActivity.java13
2 files changed, 22 insertions, 12 deletions
diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml
index 9364d41..a0ab94d 100644
--- a/main/AndroidManifest.xml
+++ b/main/AndroidManifest.xml
@@ -280,6 +280,8 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
+
+ <!-- geocaching.com cache related URLs -->
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<action android:name="android.nfc.action.NDEF_DISCOVERED" />
@@ -328,6 +330,8 @@
android:pathPrefix="/seek/cache_details.aspx"
android:scheme="http" />
</intent-filter>
+
+ <!-- opencaching.DE related URLs -->
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<action android:name="android.nfc.action.NDEF_DISCOVERED" />
@@ -364,6 +368,8 @@
android:pathPrefix="/viewcache.php"
android:scheme="http" />
</intent-filter>
+
+ <!-- opencaching.FR related URLs -->
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<action android:name="android.nfc.action.NDEF_DISCOVERED" />
@@ -401,6 +407,7 @@
android:scheme="http" />
</intent-filter>
</activity>
+
<activity
android:name="cgeo.geocaching.TrackableActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
@@ -458,6 +465,20 @@
android:scheme="http" />
</intent-filter>
+ <!-- geocaching.com.au swaggies -->
+ <intent-filter>
+ <action android:name="android.intent.action.VIEW" />
+ <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.BROWSABLE" />
+
+ <data
+ android:host="geocaching.com.au"
+ android:pathPrefix="/swaggie/sw"
+ android:scheme="http" />
+ </intent-filter>
+
<!-- GeoKrety URLs -->
<intent-filter>
<action android:name="android.intent.action.VIEW" />
diff --git a/main/src/cgeo/geocaching/TrackableActivity.java b/main/src/cgeo/geocaching/TrackableActivity.java
index 139b136..d921acb 100644
--- a/main/src/cgeo/geocaching/TrackableActivity.java
+++ b/main/src/cgeo/geocaching/TrackableActivity.java
@@ -127,7 +127,7 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
geocode = ConnectorFactory.getTrackableFromURL(uri.toString());
final String uriHost = uri.getHost().toLowerCase(Locale.US);
- if (uriHost.contains("geocaching.com")) {
+ if (uriHost.endsWith("geocaching.com")) {
geocode = uri.getQueryParameter("tracker");
guid = uri.getQueryParameter("guid");
id = uri.getQueryParameter("id");
@@ -149,17 +149,6 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
finish();
return;
}
- } else if (uriHost.contains("coord.info")) {
- final String uriPath = uri.getPath().toLowerCase(Locale.US);
- if (StringUtils.startsWith(uriPath, "/tb")) {
- geocode = uriPath.substring(1).toUpperCase(Locale.US);
- guid = null;
- id = null;
- } else {
- showToast(res.getString(R.string.err_tb_details_open));
- finish();
- return;
- }
}
}