Merge remote-tracking branch 'rsudev/ocpl'

Conflicts:
	main/res/values/preference_keys.xml
	main/src/cgeo/geocaching/settings/Settings.java
	main/src/cgeo/geocaching/settings/SettingsActivity.java

3 files changed, 30 insertions, 1 deletions

diff --git a/main/res/values/preference_keys.xml b/main/res/values/preference_keys.xml
index bc467f0..e82c9d6 100644
--- a/main/res/values/preference_keys.xml
+++ b/main/res/values/preference_keys.xml
@@ -5,12 +5,14 @@
     <string name="pref_fakekey_services_screen">fakekey_services_screen</string>
     <string name="pref_fakekey_basicmembers_screen">fakekey_basicmembers_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_twitter_authorization">fakekey_twitter_authorization</string>
     <string name="pref_fakekey_navigation_menu_screen">fakekey_navigation_menu_screen</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_pass_vote">pass-vote</string>
     <string name="pref_twitter">twitter</string>
     <string name="pref_webDeviceName">webDeviceName</string>
@@ -106,4 +108,8 @@
     <string name="pref_navigation_menu_cache_beacon">navigationCacheBeacon</string>
     <string name="pref_navigation_menu_gcc">navigationGcc</string>
     <string name="pref_navigation_menu_where_you_go">navigationWhereYouGo</string>
+    <string name="pref_ocpl_tokensecret">ocpl_tokensecret</string>
+    <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>
 </resources>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 7af4b5c..3ca5959 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -394,6 +394,11 @@
     <string name="init_oc_de_description">Authorize c:geo with opencaching.de to search for caches and access/filter your found caches.</string>
     <string name="init_register_oc_de">Authorize c:geo</string>
     <string name="init_reregister_oc_de">Authorize c:geo again</string>
+    <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_register_oc_pl">Authorize c:geo</string>
+    <string name="init_reregister_oc_pl">Authorize c:geo again</string>
     <string name="init_gcvote">GCvote.com</string>
     <string name="init_twitter">Twitter</string>
     <string name="settings_activate_twitter">Activate</string>
@@ -538,6 +543,7 @@
 
     <!-- auth opencaching -->
     <string name="auth_ocde">opencaching.de</string>
+    <string name="auth_ocpl">opencaching.pl</string>
     <string name="auth_authorize_oc">Authorize c:geo</string>
     <string name="auth_start_oc">Start authorization</string>
     <string name="auth_again_oc">Start again</string>
diff --git a/main/res/xml/preferences.xml b/main/res/xml/preferences.xml
index edfcf98..2afb1ad 100644
--- a/main/res/xml/preferences.xml
+++ b/main/res/xml/preferences.xml
@@ -74,13 +74,30 @@
                 android:layout="@layout/text_preference"
                 android:text="@string/init_oc_de_description"
                 android:dependency="@string/pref_connectorOCActive" />
-            <cgeo.geocaching.settings.AuthorizeOcDePreference 
+            <cgeo.geocaching.settings.AuthorizeOcPreference
                 android:key="@string/pref_fakekey_ocde_authorization"
                 android:dependency="@string/pref_connectorOCActive" />
             
         </PreferenceCategory>
 
         <PreferenceCategory
+            android:title="@string/init_oc_pl" >
+
+            <CheckBoxPreference
+                android:key="@string/pref_connectorOCPLActive"
+                android:title="@string/settings_activate_oc_pl"
+                android:defaultValue="false" />
+            <cgeo.geocaching.settings.TextPreference
+                android:layout="@layout/text_preference"
+                android:text="@string/init_oc_pl_description"
+                android:dependency="@string/pref_connectorOCPLActive" />
+            <cgeo.geocaching.settings.AuthorizeOcPreference
+                android:key="@string/pref_fakekey_ocpl_authorization"
+                android:dependency="@string/pref_connectorOCPLActive" />
+
+        </PreferenceCategory>
+
+        <PreferenceCategory
             android:title="@string/init_gcvote" >
             
             <cgeo.geocaching.settings.EditPasswordPreference