From 64e944c4fb12d1f1a3f6bc8484357cd593f63275 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Fri, 13 Sep 2013 21:08:04 +0200
Subject: Enable in-band registration for opencaching.de

The strings still refer to the PIN code. That will be changed when
opencaching.pl, which shares the same interface, gets migrated as well
to the callback mechanism.
---
 main/AndroidManifest.xml                                   | 14 +++++++++++++-
 main/src/cgeo/geocaching/connector/oc/IOCAuthParams.java   |  7 +++++++
 .../geocaching/connector/oc/OCAuthorizationActivity.java   |  2 +-
 main/src/cgeo/geocaching/connector/oc/OCDEAuthParams.java  |  5 +++++
 main/src/cgeo/geocaching/connector/oc/OCPLAuthParams.java  |  5 +++++
 5 files changed, 31 insertions(+), 2 deletions(-)

(limited to 'main')

diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml
index 39ef9d8..99afa67 100644
--- a/main/AndroidManifest.xml
+++ b/main/AndroidManifest.xml
@@ -387,7 +387,19 @@
             android:name=".connector.oc.OCDEAuthorizationActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="@string/app_name"
-            android:windowSoftInputMode="stateHidden" >
+            android:windowSoftInputMode="stateHidden"
+            android:launchMode="singleTask">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="www.cgeo.org"
+                    android:pathPrefix="/opencaching.de/"
+                    android:scheme="callback" />
+            </intent-filter>
         </activity>
         <activity
             android:name=".connector.oc.OCPLAuthorizationActivity"
diff --git a/main/src/cgeo/geocaching/connector/oc/IOCAuthParams.java b/main/src/cgeo/geocaching/connector/oc/IOCAuthParams.java
index 5a140a1..414ec80 100644
--- a/main/src/cgeo/geocaching/connector/oc/IOCAuthParams.java
+++ b/main/src/cgeo/geocaching/connector/oc/IOCAuthParams.java
@@ -57,4 +57,11 @@ public interface IOCAuthParams {
      * @return
      */
     int getTempTokenSecretPrefKey();
+
+    /**
+     * The URI to use as a callback (OAuth)
+     *
+     * @return
+     */
+    String getCallbackUri();
 }
diff --git a/main/src/cgeo/geocaching/connector/oc/OCAuthorizationActivity.java b/main/src/cgeo/geocaching/connector/oc/OCAuthorizationActivity.java
index 45a4475..bae5c1b 100644
--- a/main/src/cgeo/geocaching/connector/oc/OCAuthorizationActivity.java
+++ b/main/src/cgeo/geocaching/connector/oc/OCAuthorizationActivity.java
@@ -20,7 +20,7 @@ public class OCAuthorizationActivity extends OAuthAuthorizationActivity {
                 false,
                 CgeoApplication.getInstance().getResources().getString(authParams.getCKResId()),
                 CgeoApplication.getInstance().getResources().getString(authParams.getCSResId()),
-                null);
+                authParams.getCallbackUri());
         this.authParams = authParams;
     }
 
diff --git a/main/src/cgeo/geocaching/connector/oc/OCDEAuthParams.java b/main/src/cgeo/geocaching/connector/oc/OCDEAuthParams.java
index 734b383..fff840b 100644
--- a/main/src/cgeo/geocaching/connector/oc/OCDEAuthParams.java
+++ b/main/src/cgeo/geocaching/connector/oc/OCDEAuthParams.java
@@ -43,4 +43,9 @@ public class OCDEAuthParams implements IOCAuthParams {
     public int getTempTokenSecretPrefKey() {
         return R.string.pref_temp_ocde_token_secret;
     }
+
+    @Override
+    public String getCallbackUri() {
+        return "callback://www.cgeo.org/opencaching.de/";
+    }
 }
diff --git a/main/src/cgeo/geocaching/connector/oc/OCPLAuthParams.java b/main/src/cgeo/geocaching/connector/oc/OCPLAuthParams.java
index 117e990..c1e0ea3 100644
--- a/main/src/cgeo/geocaching/connector/oc/OCPLAuthParams.java
+++ b/main/src/cgeo/geocaching/connector/oc/OCPLAuthParams.java
@@ -43,4 +43,9 @@ public class OCPLAuthParams implements IOCAuthParams {
     public int getTempTokenSecretPrefKey() {
         return R.string.pref_temp_ocpl_token_secret;
     }
+
+    @Override
+    public String getCallbackUri() {
+        return null;
+    }
 }
-- 
cgit v1.1