Implements #3692. Add support for new opencaching nodes

Added opencaching nl,us,ro live support and preferences

3 files changed, 120 insertions, 0 deletions

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