From 3958777a5cf254ac2bfbb5cb569cfbd42abfb49f Mon Sep 17 00:00:00 2001
From: rsudev <rasch@munin-soft.de>
Date: Thu, 3 Apr 2014 15:12:59 +0200
Subject: Implements #3692. Add support for new opencaching nodes

Added opencaching nl,us,ro live support and preferences
---
 main/AndroidManifest.xml                           | 54 ++++++++++++++
 main/res/values/preference_keys.xml                | 24 +++++++
 main/res/values/strings.xml                        | 12 ++++
 main/res/xml/preferences.xml                       | 84 ++++++++++++++++++++++
 .../geocaching/connector/ConnectorFactory.java     | 12 +++-
 .../geocaching/connector/oc/OCNLAuthParams.java    | 51 +++++++++++++
 .../connector/oc/OCNLAuthorizationActivity.java    |  8 +++
 .../geocaching/connector/oc/OCROAuthParams.java    | 51 +++++++++++++
 .../connector/oc/OCROAuthorizationActivity.java    |  8 +++
 .../geocaching/connector/oc/OCUSAuthParams.java    | 51 +++++++++++++
 .../connector/oc/OCUSAuthorizationActivity.java    |  8 +++
 .../cgeo/geocaching/settings/OAuthPreference.java  |  6 ++
 .../cgeo/geocaching/settings/SettingsActivity.java | 56 ++++++++++++++-
 main/templates/keys.xml                            | 12 ++--
 14 files changed, 428 insertions(+), 9 deletions(-)
 create mode 100644 main/src/cgeo/geocaching/connector/oc/OCNLAuthParams.java
 create mode 100644 main/src/cgeo/geocaching/connector/oc/OCNLAuthorizationActivity.java
 create mode 100644 main/src/cgeo/geocaching/connector/oc/OCROAuthParams.java
 create mode 100644 main/src/cgeo/geocaching/connector/oc/OCROAuthorizationActivity.java
 create mode 100644 main/src/cgeo/geocaching/connector/oc/OCUSAuthParams.java
 create mode 100644 main/src/cgeo/geocaching/connector/oc/OCUSAuthorizationActivity.java

(limited to 'main')

diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml
index 38f82a8..34017d9 100644
--- a/main/AndroidManifest.xml
+++ b/main/AndroidManifest.xml
@@ -481,6 +481,60 @@
             </intent-filter>
         </activity>
         <activity
+            android:name=".connector.oc.OCNLAuthorizationActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label="@string/app_name"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="stateHidden" >
+            <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.nl/"
+                    android:scheme="callback" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".connector.oc.OCUSAuthorizationActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label="@string/app_name"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="stateHidden" >
+            <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.us/"
+                    android:scheme="callback" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".connector.oc.OCROAuthorizationActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label="@string/app_name"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="stateHidden" >
+            <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.ro/"
+                    android:scheme="callback" />
+            </intent-filter>
+        </activity>
+        <activity
             android:name=".CreateShortcutActivity"
             android:label="@string/cgeo_shortcut" >
             <intent-filter>
diff --git a/main/res/values/preference_keys.xml b/main/res/values/preference_keys.xml
index d231795..dc151e7 100644
--- a/main/res/values/preference_keys.xml
+++ b/main/res/values/preference_keys.xml
@@ -12,17 +12,26 @@
     <string name="preference_screen_basicmembers">fakekey_basicmembers_screen</string>
     <string name="preference_screen_ocde">preference_screen_ocde</string>
     <string name="preference_screen_ocpl">preference_screen_ocpl</string>
+    <string name="preference_screen_ocnl">preference_screen_ocnl</string>
+    <string name="preference_screen_ocus">preference_screen_ocus</string>
+    <string name="preference_screen_ocro">preference_screen_ocro</string>
     <string name="preference_screen_ec">preference_screen_ec</string>
     <string name="preference_screen_twitter">preference_screen_twitter</string>
     <string name="preference_screen_navigation_menu">fakekey_navigation_menu_screen</string>
     <string name="pref_fakekey_ocde_authorization">fakekey_ocde_authorization</string>
     <string name="pref_fakekey_ocpl_authorization">fakekey_ocpl_authorization</string>
+    <string name="pref_fakekey_ocnl_authorization">fakekey_ocnl_authorization</string>
+    <string name="pref_fakekey_ocus_authorization">fakekey_ocus_authorization</string>
+    <string name="pref_fakekey_ocro_authorization">fakekey_ocro_authorization</string>
     <string name="pref_fakekey_twitter_authorization">fakekey_twitter_authorization</string>
     <string name="pref_connectorGCActive">connectorGCActive</string>
     <string name="pref_username">username</string>
     <string name="pref_password">password</string>
     <string name="pref_connectorOCActive">connectorOCActive</string>
     <string name="pref_connectorOCPLActive">connectorOCPLActive</string>
+    <string name="pref_connectorOCNLActive">connectorOCNLActive</string>
+    <string name="pref_connectorOCUSActive">connectorOCUSActive</string>
+    <string name="pref_connectorOCROActive">connectorOCROActive</string>
     <string name="pref_ecusername">ecusername</string>
     <string name="pref_ecpassword">ecpassword</string>
     <string name="pref_connectorECActive">connectorECActive</string>
@@ -131,9 +140,24 @@
     <string name="pref_ocpl_tokenpublic">ocpl_tokenpublic</string>
     <string name="pref_temp_ocpl_token_secret">ocpl-temp-token-secret</string>
     <string name="pref_temp_ocpl_token_public">ocpl-temp-token-public</string>
+    <string name="pref_ocnl_tokensecret">ocnl_tokensecret</string>
+    <string name="pref_ocnl_tokenpublic">ocnl_tokenpublic</string>
+    <string name="pref_temp_ocnl_token_secret">ocnl-temp-token-secret</string>
+    <string name="pref_temp_ocnl_token_public">ocnl-temp-token-public</string>
+    <string name="pref_ocus_tokensecret">ocus_tokensecret</string>
+    <string name="pref_ocus_tokenpublic">ocus_tokenpublic</string>
+    <string name="pref_temp_ocus_token_secret">ocus-temp-token-secret</string>
+    <string name="pref_temp_ocus_token_public">ocus-temp-token-public</string>
+    <string name="pref_ocro_tokensecret">ocro_tokensecret</string>
+    <string name="pref_ocro_tokenpublic">ocro_tokenpublic</string>
+    <string name="pref_temp_ocro_token_secret">ocro-temp-token-secret</string>
+    <string name="pref_temp_ocro_token_public">ocro-temp-token-public</string>
     <string name="pref_fakekey_gc_website">fakekey_gc_website</string>
     <string name="pref_fakekey_ocde_website">fakekey_ocde_website</string>
     <string name="pref_fakekey_ocpl_website">fakekey_ocpl_website</string>
+    <string name="pref_fakekey_ocnl_website">fakekey_ocnl_website</string>
+    <string name="pref_fakekey_ocus_website">fakekey_ocus_website</string>
+    <string name="pref_fakekey_ocro_website">fakekey_ocro_website</string>
     <string name="pref_fakekey_ec_website">fakekey_ec_website</string>
     <string name="pref_fakekey_ox_website">fakekey_ox_website</string>
     <string name="pref_fakekey_gcvote_website">fakekey_gcvote_website</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 48cc323..cd7f3be 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -411,6 +411,15 @@
     <string name="init_oc_pl">Opencaching.pl</string>
     <string name="settings_activate_oc_pl">Activate</string>
     <string name="init_oc_pl_description">Authorize c:geo with opencaching.pl to search for caches and access/filter your found caches.</string>
+    <string name="init_oc_nl">Opencaching.nl</string>
+    <string name="settings_activate_oc_nl">Activate</string>
+    <string name="init_oc_nl_description">Authorize c:geo with opencaching.nl to search for caches and access/filter your found caches.</string>
+    <string name="init_oc_us">Opencaching.us</string>
+    <string name="settings_activate_oc_us">Activate</string>
+    <string name="init_oc_us_description">Authorize c:geo with opencaching.us to search for caches and access/filter your found caches.</string>
+    <string name="init_oc_ro">Opencaching.ro</string>
+    <string name="settings_activate_oc_ro">Activate</string>
+    <string name="init_oc_ro_description">Authorize c:geo with opencaching.ro to search for caches and access/filter your found caches.</string>
     <string name="init_gcvote">GCvote.com</string>
     <string name="init_twitter">Twitter</string>
     <string name="settings_activate_twitter">Activate</string>
@@ -583,6 +592,9 @@
     <!-- auth opencaching -->
     <string name="auth_ocde">opencaching.de</string>
     <string name="auth_ocpl">opencaching.pl</string>
+    <string name="auth_ocnl">opencaching.nl</string>
+    <string name="auth_ocus">opencaching.us</string>
+    <string name="auth_ocro">opencaching.ro</string>
     <string name="auth_dialog_completed_oc">c:geo is now authorized to interact with %s.</string>
 
     <!-- cache -->
diff --git a/main/res/xml/preferences.xml b/main/res/xml/preferences.xml
index 454574e..1836dbe 100644
--- a/main/res/xml/preferences.xml
+++ b/main/res/xml/preferences.xml
@@ -132,6 +132,90 @@
                         android:title="@string/settings_open_website" />
                 </PreferenceCategory>
             </PreferenceScreen>
+            <PreferenceScreen
+                android:key="@string/preference_screen_ocnl"
+                android:title="@string/init_oc_nl" >
+                <PreferenceCategory android:title="@string/settings_settings" >
+                    <CheckBoxPreference
+                        android:defaultValue="false"
+                        android:key="@string/pref_connectorOCNLActive"
+                        android:title="@string/settings_activate_oc_nl" />
+
+                    <cgeo.geocaching.settings.TextPreference
+                        android:dependency="@string/pref_connectorOCNLActive"
+                        android:layout="@layout/text_preference"
+                        android:text="@string/init_oc_nl_description" />
+
+                    <cgeo.geocaching.settings.OAuthPreference
+                        android:dependency="@string/pref_connectorOCNLActive"
+                        android:key="@string/pref_fakekey_ocnl_authorization" />
+                </PreferenceCategory>
+                <PreferenceCategory android:title="@string/settings_information" >
+                    <cgeo.geocaching.settings.CapabilitiesPreference
+                        android:title="@string/settings_features"
+                        cgeo:connector="OB" />
+
+                    <Preference
+                        android:key="@string/pref_fakekey_ocnl_website"
+                        android:title="@string/settings_open_website" />
+                </PreferenceCategory>
+            </PreferenceScreen>
+            <PreferenceScreen
+                android:key="@string/preference_screen_ocus"
+                android:title="@string/init_oc_us" >
+                <PreferenceCategory android:title="@string/settings_settings" >
+                    <CheckBoxPreference
+                        android:defaultValue="false"
+                        android:key="@string/pref_connectorOCUSActive"
+                        android:title="@string/settings_activate_oc_us" />
+
+                    <cgeo.geocaching.settings.TextPreference
+                        android:dependency="@string/pref_connectorOCUSActive"
+                        android:layout="@layout/text_preference"
+                        android:text="@string/init_oc_us_description" />
+
+                    <cgeo.geocaching.settings.OAuthPreference
+                        android:dependency="@string/pref_connectorOCUSActive"
+                        android:key="@string/pref_fakekey_ocus_authorization" />
+                </PreferenceCategory>
+                <PreferenceCategory android:title="@string/settings_information" >
+                    <cgeo.geocaching.settings.CapabilitiesPreference
+                        android:title="@string/settings_features"
+                        cgeo:connector="OU" />
+
+                    <Preference
+                        android:key="@string/pref_fakekey_ocus_website"
+                        android:title="@string/settings_open_website" />
+                </PreferenceCategory>
+            </PreferenceScreen>
+            <PreferenceScreen
+                android:key="@string/preference_screen_ocro"
+                android:title="@string/init_oc_ro" >
+                <PreferenceCategory android:title="@string/settings_settings" >
+                    <CheckBoxPreference
+                        android:defaultValue="false"
+                        android:key="@string/pref_connectorOCROActive"
+                        android:title="@string/settings_activate_oc_ro" />
+
+                    <cgeo.geocaching.settings.TextPreference
+                        android:dependency="@string/pref_connectorOCROActive"
+                        android:layout="@layout/text_preference"
+                        android:text="@string/init_oc_ro_description" />
+
+                    <cgeo.geocaching.settings.OAuthPreference
+                        android:dependency="@string/pref_connectorOCROActive"
+                        android:key="@string/pref_fakekey_ocro_authorization" />
+                </PreferenceCategory>
+                <PreferenceCategory android:title="@string/settings_information" >
+                    <cgeo.geocaching.settings.CapabilitiesPreference
+                        android:title="@string/settings_features"
+                        cgeo:connector="OR" />
+
+                    <Preference
+                        android:key="@string/pref_fakekey_ocro_website"
+                        android:title="@string/settings_open_website" />
+                </PreferenceCategory>
+            </PreferenceScreen>
             <PreferenceScreen android:title="@string/settings_title_ec" android:key="@string/preference_screen_ec">
                 <PreferenceCategory android:title="@string/settings_settings" >
                     <CheckBoxPreference
diff --git a/main/src/cgeo/geocaching/connector/ConnectorFactory.java b/main/src/cgeo/geocaching/connector/ConnectorFactory.java
index 35eae81..9e4e02e 100644
--- a/main/src/cgeo/geocaching/connector/ConnectorFactory.java
+++ b/main/src/cgeo/geocaching/connector/ConnectorFactory.java
@@ -29,6 +29,7 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 
 import rx.functions.Func1;
+import rx.schedulers.Schedulers;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -50,11 +51,18 @@ public final class ConnectorFactory {
             new OCConnector("OpenCaching.IT", "www.opencaching.it", "OC"),
             new OCConnector("OpenCaching.JP", "www.opencaching.jp", "OJ"),
             new OCConnector("OpenCaching.NO/SE", "www.opencaching.se", "OS"),
-            new OCApiConnector("OpenCaching.NL", "www.opencaching.nl", "OB", "PdzU8jzIlcfMADXaYN8j", "CC BY-SA 3.0", ApiSupport.current),
+            new OCApiLiveConnector("opencaching.nl", "www.opencaching.nl", "OB", "CC BY-SA 3.0",
+                    R.string.oc_nl_okapi_consumer_key, R.string.oc_nl_okapi_consumer_secret,
+                    R.string.pref_connectorOCNLActive, R.string.pref_ocnl_tokenpublic, R.string.pref_ocnl_tokensecret, ApiSupport.current),
             new OCApiLiveConnector("opencaching.pl", "www.opencaching.pl", "OP", "CC BY-SA 3.0",
                     R.string.oc_pl_okapi_consumer_key, R.string.oc_pl_okapi_consumer_secret,
                     R.string.pref_connectorOCPLActive, R.string.pref_ocpl_tokenpublic, R.string.pref_ocpl_tokensecret, ApiSupport.current),
-            new OCApiConnector("OpenCaching.US", "www.opencaching.us", "OU", "pTsYAYSXFcfcRQnYE6uA", "CC BY-NC-SA 2.5", ApiSupport.current),
+            new OCApiLiveConnector("opencaching.us", "www.opencaching.us", "OU", "CC BY-NC-SA 2.5",
+                    R.string.oc_us_okapi_consumer_key, R.string.oc_us_okapi_consumer_secret,
+                    R.string.pref_connectorOCUSActive, R.string.pref_ocus_tokenpublic, R.string.pref_ocus_tokensecret, ApiSupport.current),
+            new OCApiLiveConnector("opencaching.ro", "oc.opencaching.ro", "OR", "CC BY-SA 3.0",
+                    R.string.oc_ro_okapi_consumer_key, R.string.oc_ro_okapi_consumer_secret,
+                    R.string.pref_connectorOCROActive, R.string.pref_ocro_tokenpublic, R.string.pref_ocro_tokensecret, ApiSupport.current),
             new OXConnector(),
             new GeocachingAustraliaConnector(),
             new GeopeitusConnector(),
diff --git a/main/src/cgeo/geocaching/connector/oc/OCNLAuthParams.java b/main/src/cgeo/geocaching/connector/oc/OCNLAuthParams.java
new file mode 100644
index 0000000..31d8590
--- /dev/null
+++ b/main/src/cgeo/geocaching/connector/oc/OCNLAuthParams.java
@@ -0,0 +1,51 @@
+package cgeo.geocaching.connector.oc;
+
+import cgeo.geocaching.R;
+
+public class OCNLAuthParams implements IOCAuthParams {
+
+    @Override
+    public String getSite() {
+        return "www.opencaching.nl";
+    }
+
+    @Override
+    public int getCKResId() {
+        return R.string.oc_nl_okapi_consumer_key;
+    }
+
+    @Override
+    public int getCSResId() {
+        return R.string.oc_nl_okapi_consumer_secret;
+    }
+
+    @Override
+    public int getAuthTitleResId() {
+        return R.string.auth_ocnl;
+    }
+
+    @Override
+    public int getTokenPublicPrefKey() {
+        return R.string.pref_ocnl_tokenpublic;
+    }
+
+    @Override
+    public int getTokenSecretPrefKey() {
+        return R.string.pref_ocnl_tokensecret;
+    }
+
+    @Override
+    public int getTempTokenPublicPrefKey() {
+        return R.string.pref_temp_ocnl_token_public;
+    }
+
+    @Override
+    public int getTempTokenSecretPrefKey() {
+        return R.string.pref_temp_ocnl_token_secret;
+    }
+
+    @Override
+    public String getCallbackUri() {
+        return "callback://www.cgeo.org/opencaching.nl/";
+    }
+}
diff --git a/main/src/cgeo/geocaching/connector/oc/OCNLAuthorizationActivity.java b/main/src/cgeo/geocaching/connector/oc/OCNLAuthorizationActivity.java
new file mode 100644
index 0000000..dfd21ec
--- /dev/null
+++ b/main/src/cgeo/geocaching/connector/oc/OCNLAuthorizationActivity.java
@@ -0,0 +1,8 @@
+package cgeo.geocaching.connector.oc;
+
+public final class OCNLAuthorizationActivity extends OCAuthorizationActivity {
+
+    public OCNLAuthorizationActivity() {
+        super(new OCNLAuthParams());
+    }
+}
diff --git a/main/src/cgeo/geocaching/connector/oc/OCROAuthParams.java b/main/src/cgeo/geocaching/connector/oc/OCROAuthParams.java
new file mode 100644
index 0000000..6805001
--- /dev/null
+++ b/main/src/cgeo/geocaching/connector/oc/OCROAuthParams.java
@@ -0,0 +1,51 @@
+package cgeo.geocaching.connector.oc;
+
+import cgeo.geocaching.R;
+
+public class OCROAuthParams implements IOCAuthParams {
+
+    @Override
+    public String getSite() {
+        return "oc.opencaching.ro";
+    }
+
+    @Override
+    public int getCKResId() {
+        return R.string.oc_ro_okapi_consumer_key;
+    }
+
+    @Override
+    public int getCSResId() {
+        return R.string.oc_ro_okapi_consumer_secret;
+    }
+
+    @Override
+    public int getAuthTitleResId() {
+        return R.string.auth_ocro;
+    }
+
+    @Override
+    public int getTokenPublicPrefKey() {
+        return R.string.pref_ocro_tokenpublic;
+    }
+
+    @Override
+    public int getTokenSecretPrefKey() {
+        return R.string.pref_ocro_tokensecret;
+    }
+
+    @Override
+    public int getTempTokenPublicPrefKey() {
+        return R.string.pref_temp_ocro_token_public;
+    }
+
+    @Override
+    public int getTempTokenSecretPrefKey() {
+        return R.string.pref_temp_ocro_token_secret;
+    }
+
+    @Override
+    public String getCallbackUri() {
+        return "callback://www.cgeo.org/opencaching.ro/";
+    }
+}
diff --git a/main/src/cgeo/geocaching/connector/oc/OCROAuthorizationActivity.java b/main/src/cgeo/geocaching/connector/oc/OCROAuthorizationActivity.java
new file mode 100644
index 0000000..6f3c52a
--- /dev/null
+++ b/main/src/cgeo/geocaching/connector/oc/OCROAuthorizationActivity.java
@@ -0,0 +1,8 @@
+package cgeo.geocaching.connector.oc;
+
+public final class OCROAuthorizationActivity extends OCAuthorizationActivity {
+
+    public OCROAuthorizationActivity() {
+        super(new OCROAuthParams());
+    }
+}
diff --git a/main/src/cgeo/geocaching/connector/oc/OCUSAuthParams.java b/main/src/cgeo/geocaching/connector/oc/OCUSAuthParams.java
new file mode 100644
index 0000000..b01d70d
--- /dev/null
+++ b/main/src/cgeo/geocaching/connector/oc/OCUSAuthParams.java
@@ -0,0 +1,51 @@
+package cgeo.geocaching.connector.oc;
+
+import cgeo.geocaching.R;
+
+public class OCUSAuthParams implements IOCAuthParams {
+
+    @Override
+    public String getSite() {
+        return "www.opencaching.us";
+    }
+
+    @Override
+    public int getCKResId() {
+        return R.string.oc_us_okapi_consumer_key;
+    }
+
+    @Override
+    public int getCSResId() {
+        return R.string.oc_us_okapi_consumer_secret;
+    }
+
+    @Override
+    public int getAuthTitleResId() {
+        return R.string.auth_ocus;
+    }
+
+    @Override
+    public int getTokenPublicPrefKey() {
+        return R.string.pref_ocus_tokenpublic;
+    }
+
+    @Override
+    public int getTokenSecretPrefKey() {
+        return R.string.pref_ocus_tokensecret;
+    }
+
+    @Override
+    public int getTempTokenPublicPrefKey() {
+        return R.string.pref_temp_ocus_token_public;
+    }
+
+    @Override
+    public int getTempTokenSecretPrefKey() {
+        return R.string.pref_temp_ocus_token_secret;
+    }
+
+    @Override
+    public String getCallbackUri() {
+        return "callback://www.cgeo.org/opencaching.us/";
+    }
+}
diff --git a/main/src/cgeo/geocaching/connector/oc/OCUSAuthorizationActivity.java b/main/src/cgeo/geocaching/connector/oc/OCUSAuthorizationActivity.java
new file mode 100644
index 0000000..05d91df
--- /dev/null
+++ b/main/src/cgeo/geocaching/connector/oc/OCUSAuthorizationActivity.java
@@ -0,0 +1,8 @@
+package cgeo.geocaching.connector.oc;
+
+public final class OCUSAuthorizationActivity extends OCAuthorizationActivity {
+
+    public OCUSAuthorizationActivity() {
+        super(new OCUSAuthParams());
+    }
+}
diff --git a/main/src/cgeo/geocaching/settings/OAuthPreference.java b/main/src/cgeo/geocaching/settings/OAuthPreference.java
index df77197..c662f37 100644
--- a/main/src/cgeo/geocaching/settings/OAuthPreference.java
+++ b/main/src/cgeo/geocaching/settings/OAuthPreference.java
@@ -3,7 +3,10 @@ package cgeo.geocaching.settings;
 import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.R;
 import cgeo.geocaching.connector.oc.OCDEAuthorizationActivity;
+import cgeo.geocaching.connector.oc.OCNLAuthorizationActivity;
 import cgeo.geocaching.connector.oc.OCPLAuthorizationActivity;
+import cgeo.geocaching.connector.oc.OCROAuthorizationActivity;
+import cgeo.geocaching.connector.oc.OCUSAuthorizationActivity;
 import cgeo.geocaching.twitter.TwitterAuthorizationActivity;
 
 import android.content.Context;
@@ -19,6 +22,9 @@ public class OAuthPreference extends AbstractClickablePreference {
         NONE(NO_KEY, null),
         OCDE(R.string.pref_fakekey_ocde_authorization, OCDEAuthorizationActivity.class),
         OCPL(R.string.pref_fakekey_ocpl_authorization, OCPLAuthorizationActivity.class),
+        OCNL(R.string.pref_fakekey_ocnl_authorization, OCNLAuthorizationActivity.class),
+        OCUS(R.string.pref_fakekey_ocus_authorization, OCUSAuthorizationActivity.class),
+        OCRO(R.string.pref_fakekey_ocro_authorization, OCROAuthorizationActivity.class),
         TWITTER(R.string.pref_fakekey_twitter_authorization, TwitterAuthorizationActivity.class);
 
         public final int prefKeyId;
diff --git a/main/src/cgeo/geocaching/settings/SettingsActivity.java b/main/src/cgeo/geocaching/settings/SettingsActivity.java
index 8834a3b..63f6398 100644
--- a/main/src/cgeo/geocaching/settings/SettingsActivity.java
+++ b/main/src/cgeo/geocaching/settings/SettingsActivity.java
@@ -156,11 +156,17 @@ public class SettingsActivity extends PreferenceActivity {
     private void initServicePreferences() {
         getPreference(R.string.pref_connectorOCActive).setOnPreferenceChangeListener(VALUE_CHANGE_LISTENER);
         getPreference(R.string.pref_connectorOCPLActive).setOnPreferenceChangeListener(VALUE_CHANGE_LISTENER);
+        getPreference(R.string.pref_connectorOCNLActive).setOnPreferenceChangeListener(VALUE_CHANGE_LISTENER);
+        getPreference(R.string.pref_connectorOCUSActive).setOnPreferenceChangeListener(VALUE_CHANGE_LISTENER);
+        getPreference(R.string.pref_connectorOCROActive).setOnPreferenceChangeListener(VALUE_CHANGE_LISTENER);
         getPreference(R.string.pref_connectorGCActive).setOnPreferenceChangeListener(VALUE_CHANGE_LISTENER);
         getPreference(R.string.pref_connectorECActive).setOnPreferenceChangeListener(VALUE_CHANGE_LISTENER);
         setWebsite(R.string.pref_fakekey_gc_website, GCConnector.getInstance().getHost());
         setWebsite(R.string.pref_fakekey_ocde_website, "opencaching.de");
         setWebsite(R.string.pref_fakekey_ocpl_website, "opencaching.pl");
+        setWebsite(R.string.pref_fakekey_ocnl_website, "opencaching.nl");
+        setWebsite(R.string.pref_fakekey_ocus_website, "opencaching.us");
+        setWebsite(R.string.pref_fakekey_ocro_website, "opencaching.ro");
         setWebsite(R.string.pref_fakekey_ec_website, "extremcaching.com");
         setWebsite(R.string.pref_fakekey_gcvote_website, "gcvote.com");
         setWebsite(R.string.pref_fakekey_sendtocgeo_website, "send2.cgeo.org");
@@ -413,6 +419,15 @@ public class SettingsActivity extends PreferenceActivity {
             case R.string.pref_fakekey_ocpl_authorization:
                 setOCPLAuthTitle();
                 break;
+            case R.string.pref_fakekey_ocnl_authorization:
+                setOCNLAuthTitle();
+                break;
+            case R.string.pref_fakekey_ocus_authorization:
+                setOCUSAuthTitle();
+                break;
+            case R.string.pref_fakekey_ocro_authorization:
+                setOCROAuthTitle();
+                break;
             case R.string.pref_fakekey_twitter_authorization:
                 setTwitterAuthTitle();
                 break;
@@ -435,6 +450,27 @@ public class SettingsActivity extends PreferenceActivity {
                         : R.string.settings_authorize));
     }
 
+    void setOCNLAuthTitle() {
+        getPreference(R.string.pref_fakekey_ocnl_authorization)
+                .setTitle(getString(Settings.hasOCAuthorization(R.string.pref_ocnl_tokenpublic, R.string.pref_ocnl_tokensecret)
+                        ? R.string.settings_reauthorize
+                        : R.string.settings_authorize));
+    }
+
+    void setOCUSAuthTitle() {
+        getPreference(R.string.pref_fakekey_ocus_authorization)
+                .setTitle(getString(Settings.hasOCAuthorization(R.string.pref_ocus_tokenpublic, R.string.pref_ocus_tokensecret)
+                        ? R.string.settings_reauthorize
+                        : R.string.settings_authorize));
+    }
+
+    void setOCROAuthTitle() {
+        getPreference(R.string.pref_fakekey_ocro_authorization)
+                .setTitle(getString(Settings.hasOCAuthorization(R.string.pref_ocro_tokenpublic, R.string.pref_ocro_tokensecret)
+                        ? R.string.settings_reauthorize
+                        : R.string.settings_authorize));
+    }
+
     void setTwitterAuthTitle() {
         getPreference(R.string.pref_fakekey_twitter_authorization)
                 .setTitle(getString(Settings.hasTwitterAuthorization()
@@ -494,6 +530,18 @@ public class SettingsActivity extends PreferenceActivity {
                 setOCPLAuthTitle();
                 redrawScreen(R.string.preference_screen_ocpl);
                 break;
+            case R.string.pref_fakekey_ocnl_authorization:
+                setOCNLAuthTitle();
+                redrawScreen(R.string.preference_screen_ocnl);
+                break;
+            case R.string.pref_fakekey_ocus_authorization:
+                setOCUSAuthTitle();
+                redrawScreen(R.string.preference_screen_ocus);
+                break;
+            case R.string.pref_fakekey_ocro_authorization:
+                setOCROAuthTitle();
+                redrawScreen(R.string.preference_screen_ocro);
+                break;
             case R.string.pref_fakekey_twitter_authorization:
                 setTwitterAuthTitle();
                 redrawScreen(R.string.preference_screen_twitter);
@@ -535,7 +583,13 @@ public class SettingsActivity extends PreferenceActivity {
                 }
                 Settings.setMapSource(mapSource);
                 preference.setSummary(mapSource.getName());
-            } else if (isPreference(preference, R.string.pref_connectorOCActive) || isPreference(preference, R.string.pref_connectorOCPLActive) || isPreference(preference, R.string.pref_connectorGCActive) || isPreference(preference, R.string.pref_connectorECActive)) {
+            } else if (isPreference(preference, R.string.pref_connectorOCActive)
+                    || isPreference(preference, R.string.pref_connectorOCPLActive)
+                    || isPreference(preference, R.string.pref_connectorOCNLActive)
+                    || isPreference(preference, R.string.pref_connectorOCUSActive)
+                    || isPreference(preference, R.string.pref_connectorOCROActive)
+                    || isPreference(preference, R.string.pref_connectorGCActive)
+                    || isPreference(preference, R.string.pref_connectorECActive)) {
                 // // reset log-in status if connector activation was changed
                 CgeoApplication.getInstance().forceRelog();
             } else if (preference instanceof ListPreference) {
diff --git a/main/templates/keys.xml b/main/templates/keys.xml
index 63f7e58..2c41a2a 100644
--- a/main/templates/keys.xml
+++ b/main/templates/keys.xml
@@ -12,14 +12,14 @@
     <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>
+    <string name="oc_us_okapi_consumer_key" translatable="false">@ocus.okapi.consumer.key@</string>
+    <string name="oc_us_okapi_consumer_secret" translatable="false">@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>
+    <string name="oc_nl_okapi_consumer_key" translatable="false">@ocnl.okapi.consumer.key@</string>
+    <string name="oc_nl_okapi_consumer_secret" translatable="false">@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>
+    <string name="oc_ro_okapi_consumer_key" translatable="false">@ocro.okapi.consumer.key@</string>
+    <string name="oc_ro_okapi_consumer_secret" translatable="false">@ocro.okapi.consumer.secret@</string>
 </resources>
-- 
cgit v1.1