Implements #4047, Live-map support for opencaching.org.uk

10 files changed, 87 insertions, 31 deletions

diff --git a/main/res/values/preference_keys.xml b/main/res/values/preference_keys.xml
index 9d20c05..0993452 100644
--- a/main/res/values/preference_keys.xml
+++ b/main/res/values/preference_keys.xml
@@ -15,6 +15,7 @@
     <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_ocuk">preference_screen_ocuk</string>
     <string name="preference_screen_ec">preference_screen_ec</string>
     <string name="preference_screen_ox">preference_screen_ox</string>
     <string name="preference_screen_twitter">preference_screen_twitter</string>
@@ -25,6 +26,7 @@
     <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_ocuk_authorization">fakekey_ocuk_authorization</string>
     <string name="pref_fakekey_twitter_authorization">fakekey_twitter_authorization</string>
     <string name="pref_connectorGCActive">connectorGCActive</string>
     <string name="pref_username">username</string>
@@ -34,6 +36,7 @@
     <string name="pref_connectorOCNLActive">connectorOCNLActive</string>
     <string name="pref_connectorOCUSActive">connectorOCUSActive</string>
     <string name="pref_connectorOCROActive">connectorOCROActive</string>
+    <string name="pref_connectorOCUKActive">connectorOCUKActive</string>
     <string name="pref_ecusername">ecusername</string>
     <string name="pref_ecpassword">ecpassword</string>
     <string name="pref_connectorECActive">connectorECActive</string>
@@ -153,12 +156,17 @@
     <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_ocuk_tokensecret">ocuk_tokensecret</string>
+    <string name="pref_ocuk_tokenpublic">ocuk_tokenpublic</string>
+    <string name="pref_temp_ocuk_token_secret">ocuk-temp-token-secret</string>
+    <string name="pref_temp_ocuk_token_public">ocuk-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_ocuk_website">fakekey_ocuk_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 74b2ab7..2e08d9e 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -407,6 +407,9 @@
     <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_oc_uk">Opencaching.org.uk</string>
+    <string name="settings_activate_oc_uk">Activate</string>
+    <string name="init_oc_uk_description">Authorize c:geo with opencaching.org.uk 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>
@@ -586,6 +589,7 @@
     <string name="auth_ocnl">opencaching.nl</string>
     <string name="auth_ocus">opencaching.us</string>
     <string name="auth_ocro">opencaching.ro</string>
+    <string name="auth_ocuk">opencaching.org.uk</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 49f0515..1f1838b 100644
--- a/main/res/xml/preferences.xml
+++ b/main/res/xml/preferences.xml
@@ -217,6 +217,34 @@
                 </PreferenceCategory>
             </PreferenceScreen>
             <PreferenceScreen
+                android:key="@string/preference_screen_ocuk"
+                android:title="@string/init_oc_uk" >
+                <PreferenceCategory android:title="@string/settings_settings" >
+                    <CheckBoxPreference
+                        android:defaultValue="false"
+                        android:key="@string/pref_connectorOCUKActive"
+                        android:title="@string/settings_activate_oc_uk" />
+
+                    <cgeo.geocaching.settings.TextPreference
+                        android:dependency="@string/pref_connectorOCUKActive"
+                        android:layout="@layout/text_preference"
+                        android:text="@string/init_oc_uk_description" />
+
+                    <cgeo.geocaching.settings.OAuthPreference
+                        android:dependency="@string/pref_connectorOCUKActive"
+                        android:key="@string/pref_fakekey_ocuk_authorization" />
+                </PreferenceCategory>
+                <PreferenceCategory android:title="@string/settings_information" >
+                    <cgeo.geocaching.settings.CapabilitiesPreference
+                        android:title="@string/settings_features"
+                        app:connector="OK" />
+
+                    <Preference
+                        android:key="@string/pref_fakekey_ocuk_website"
+                        android:title="@string/settings_open_website" />
+                </PreferenceCategory>
+            </PreferenceScreen>
+            <PreferenceScreen
                 android:key="@string/preference_screen_ec"
                 android:title="@string/settings_title_ec" >
                 <PreferenceCategory android:title="@string/settings_settings" >
diff --git a/main/src/cgeo/geocaching/connector/ConnectorFactory.java b/main/src/cgeo/geocaching/connector/ConnectorFactory.java
index 1f23df8..a6deba9 100644
--- a/main/src/cgeo/geocaching/connector/ConnectorFactory.java
+++ b/main/src/cgeo/geocaching/connector/ConnectorFactory.java
@@ -13,7 +13,6 @@ import cgeo.geocaching.connector.capability.ISearchByViewPort;
 import cgeo.geocaching.connector.ec.ECConnector;
 import cgeo.geocaching.connector.gc.GCConnector;
 import cgeo.geocaching.connector.gc.MapTokens;
-import cgeo.geocaching.connector.oc.OCApiConnector;
 import cgeo.geocaching.connector.oc.OCApiConnector.ApiSupport;
 import cgeo.geocaching.connector.oc.OCApiLiveConnector;
 import cgeo.geocaching.connector.oc.OCConnector;
@@ -45,7 +44,9 @@ public final class ConnectorFactory {
                     R.string.oc_de_okapi_consumer_key, R.string.oc_de_okapi_consumer_secret,
                     R.string.pref_connectorOCActive, R.string.pref_ocde_tokenpublic, R.string.pref_ocde_tokensecret, ApiSupport.current),
             new OCConnector("OpenCaching.CZ", "www.opencaching.cz", "OZ"),
-            new OCApiConnector("OpenCaching.CO.UK", "www.opencaching.org.uk", "OK", "arU4okouc4GEjMniE2fq", "CC BY-NC-SA 2.5", ApiSupport.oldapi),
+            new OCApiLiveConnector("opencaching.org.uk", "www.opencaching.org.uk", "OK", "CC BY-NC-SA 2.5",
+                    R.string.oc_uk_okapi_consumer_key, R.string.oc_uk_okapi_consumer_secret,
+                    R.string.pref_connectorOCUKActive, R.string.pref_ocuk_tokenpublic, R.string.pref_ocuk_tokensecret, ApiSupport.oldapi),
             new OCConnector("OpenCaching.ES", "www.opencachingspain.es", "OC"),
             new OCConnector("OpenCaching.IT", "www.opencaching.it", "OC"),
             new OCConnector("OpenCaching.JP", "www.opencaching.jp", "OJ"),
@@ -143,16 +144,16 @@ public final class ConnectorFactory {
     }
 
     public static @NonNull
-    IConnector getConnector(ICache cache) {
+    IConnector getConnector(final ICache cache) {
         return getConnector(cache.getGeocode());
     }
 
-    public static TrackableConnector getConnector(Trackable trackable) {
+    public static TrackableConnector getConnector(final Trackable trackable) {
         return getTrackableConnector(trackable.getGeocode());
     }
 
     @NonNull
-    public static TrackableConnector getTrackableConnector(String geocode) {
+    public static TrackableConnector getTrackableConnector(final String geocode) {
         for (final TrackableConnector connector : TRACKABLE_CONNECTORS) {
             if (connector.canHandleTrackable(geocode)) {
                 return connector;
@@ -188,7 +189,7 @@ public final class ConnectorFactory {
     public static SearchResult searchByViewport(final @NonNull Viewport viewport, final MapTokens tokens) {
         return SearchResult.parallelCombineActive(searchByViewPortConns, new Func1<ISearchByViewPort, SearchResult>() {
             @Override
-            public SearchResult call(ISearchByViewPort connector) {
+            public SearchResult call(final ISearchByViewPort connector) {
                 return connector.searchByViewport(viewport, tokens);
             }
         });
diff --git a/main/src/cgeo/geocaching/connector/oc/OCApiLiveConnector.java b/main/src/cgeo/geocaching/connector/oc/OCApiLiveConnector.java
index 3771443..dd25c5e 100644
--- a/main/src/cgeo/geocaching/connector/oc/OCApiLiveConnector.java
+++ b/main/src/cgeo/geocaching/connector/oc/OCApiLiveConnector.java
@@ -35,7 +35,7 @@ public class OCApiLiveConnector extends OCApiConnector implements ISearchByCente
     private final int tokenSecretPrefKeyId;
     private UserInfo userInfo = new UserInfo(StringUtils.EMPTY, 0, UserInfoStatus.NOT_RETRIEVED);
 
-    public OCApiLiveConnector(String name, String host, String prefix, String licenseString, int cKResId, int cSResId, int isActivePrefKeyId, int tokenPublicPrefKeyId, int tokenSecretPrefKeyId, ApiSupport apiSupport) {
+    public OCApiLiveConnector(final String name, final String host, final String prefix, final String licenseString, final int cKResId, final int cSResId, final int isActivePrefKeyId, final int tokenPublicPrefKeyId, final int tokenSecretPrefKeyId, final ApiSupport apiSupport) {
         super(name, host, prefix, CryptUtils.rot13(CgeoApplication.getInstance().getResources().getString(cKResId)), licenseString, apiSupport);
 
         cS = CryptUtils.rot13(CgeoApplication.getInstance().getResources().getString(cSResId));
@@ -50,22 +50,22 @@ public class OCApiLiveConnector extends OCApiConnector implements ISearchByCente
     }
 
     @Override
-    public SearchResult searchByViewport(@NonNull Viewport viewport, MapTokens tokens) {
+    public SearchResult searchByViewport(@NonNull final Viewport viewport, final MapTokens tokens) {
         return new SearchResult(OkapiClient.getCachesBBox(viewport, this));
     }
 
     @Override
-    public SearchResult searchByCenter(@NonNull Geopoint center, final @NonNull RecaptchaReceiver recaptchaReceiver) {
+    public SearchResult searchByCenter(@NonNull final Geopoint center, final @NonNull RecaptchaReceiver recaptchaReceiver) {
         return new SearchResult(OkapiClient.getCachesAround(center, this));
     }
 
     @Override
-    public SearchResult searchByOwner(@NonNull String username, final @NonNull RecaptchaReceiver recaptchaReceiver) {
+    public SearchResult searchByOwner(@NonNull final String username, final @NonNull RecaptchaReceiver recaptchaReceiver) {
         return new SearchResult(OkapiClient.getCachesByOwner(username, this));
     }
 
     @Override
-    public SearchResult searchByFinder(@NonNull String username, final @NonNull RecaptchaReceiver recaptchaReceiver) {
+    public SearchResult searchByFinder(@NonNull final String username, final @NonNull RecaptchaReceiver recaptchaReceiver) {
         return new SearchResult(OkapiClient.getCachesByFinder(username, this));
     }
 
@@ -95,11 +95,11 @@ public class OCApiLiveConnector extends OCApiConnector implements ISearchByCente
 
     @Override
     public boolean supportsWatchList() {
-        return true;
+        return ApiSupport.current == getApiSupport();
     }
 
     @Override
-    public boolean addToWatchlist(Geocache cache) {
+    public boolean addToWatchlist(final Geocache cache) {
         final boolean added = OkapiClient.setWatchState(cache, true, this);
 
         if (added) {
@@ -110,7 +110,7 @@ public class OCApiLiveConnector extends OCApiConnector implements ISearchByCente
     }
 
     @Override
-    public boolean removeFromWatchlist(Geocache cache) {
+    public boolean removeFromWatchlist(final Geocache cache) {
         final boolean removed = OkapiClient.setWatchState(cache, false, this);
 
         if (removed) {
@@ -131,7 +131,7 @@ public class OCApiLiveConnector extends OCApiConnector implements ISearchByCente
     }
 
     @Override
-    public boolean canLog(Geocache cache) {
+    public boolean canLog(final Geocache cache) {
         return true;
     }
 
@@ -140,7 +140,7 @@ public class OCApiLiveConnector extends OCApiConnector implements ISearchByCente
     }
 
     @Override
-    public boolean login(Handler handler, Context fromActivity) {
+    public boolean login(final Handler handler, final Context fromActivity) {
         if (supportsPersonalization()) {
             userInfo = OkapiClient.getUserInfo(this);
         } else {
@@ -150,7 +150,7 @@ public class OCApiLiveConnector extends OCApiConnector implements ISearchByCente
     }
 
     @Override
-    public boolean isOwner(ICache cache) {
+    public boolean isOwner(final ICache cache) {
         return StringUtils.isNotEmpty(getUserName()) && StringUtils.equals(cache.getOwnerDisplayName(), getUserName());
     }
 
@@ -181,7 +181,7 @@ public class OCApiLiveConnector extends OCApiConnector implements ISearchByCente
     }
 
     @Override
-    public boolean isSearchForMyCaches(String username) {
+    public boolean isSearchForMyCaches(final String username) {
         return StringUtils.equalsIgnoreCase(username, getUserName());
     }
 
diff --git a/main/src/cgeo/geocaching/connector/oc/OCAuthParams.java b/main/src/cgeo/geocaching/connector/oc/OCAuthParams.java
index 131ddad..a1030f0 100644
--- a/main/src/cgeo/geocaching/connector/oc/OCAuthParams.java
+++ b/main/src/cgeo/geocaching/connector/oc/OCAuthParams.java
@@ -31,14 +31,18 @@ public class OCAuthParams extends OAuthParameters {
             R.string.oc_ro_okapi_consumer_key, R.string.oc_ro_okapi_consumer_secret, "callback://www.cgeo.org/opencaching.ro/",
             R.string.auth_ocro, R.string.pref_ocro_tokenpublic, R.string.pref_ocro_tokensecret, R.string.pref_temp_ocro_token_public, R.string.pref_temp_ocro_token_secret);
 
+    public static final OCAuthParams OC_UK_AUTH_PARAMS = new OCAuthParams("www.opencaching.org.uk", false,
+            R.string.oc_uk_okapi_consumer_key, R.string.oc_uk_okapi_consumer_secret, "callback://www.cgeo.org/opencaching.org.uk/",
+            R.string.auth_ocuk, R.string.pref_ocuk_tokenpublic, R.string.pref_ocuk_tokensecret, R.string.pref_temp_ocuk_token_public, R.string.pref_temp_ocuk_token_secret);
+
     public final int authTitleResId;
     public final int tokenPublicPrefKey;
     public final int tokenSecretPrefKey;
     public final int tempTokenPublicPrefKey;
     public final int tempTokenSecretPrefKey;
 
-    public OCAuthParams(@NonNull String host, boolean https, int consumerKeyResId, int consumerSecretResId, @NonNull String callback,
-            int authTitleResId, int tokenPublicPrefKey, int tokenSecretPrefKey, int tempTokePublicPrefKey, int tempTokenSecretPrefKey) {
+    public OCAuthParams(@NonNull final String host, final boolean https, final int consumerKeyResId, final int consumerSecretResId, @NonNull final String callback,
+            final int authTitleResId, final int tokenPublicPrefKey, final int tokenSecretPrefKey, final int tempTokePublicPrefKey, final int tempTokenSecretPrefKey) {
         super(host, "/okapi/services/oauth/request_token",
                 "/okapi/services/oauth/authorize",
                 "/okapi/services/oauth/access_token",
@@ -54,7 +58,7 @@ public class OCAuthParams extends OAuthParameters {
     }
 
     @Override
-    public void setOAuthExtras(Intent intent) {
+    public void setOAuthExtras(final Intent intent) {
         super.setOAuthExtras(intent);
 
         if (intent != null) {
diff --git a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
index 5e438cb..910654d 100644
--- a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
+++ b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
@@ -123,7 +123,8 @@ final class OkapiClient {
     private static final String SERVICE_CACHE_CORE_L3_FIELDS = "is_found";
     private static final String SERVICE_CACHE_ADDITIONAL_FIELDS = "owner|founds|notfounds|rating|rating_votes|recommendations|description|hint|images|latest_logs|alt_wpts|attrnames|req_passwd|trackables";
     private static final String SERVICE_CACHE_ADDITIONAL_CURRENT_FIELDS = "gc_code|attribution_note|attr_acodes|willattends";
-    private static final String SERVICE_CACHE_ADDITIONAL_L3_FIELDS = "is_watched|my_notes";
+    private static final String SERVICE_CACHE_ADDITIONAL_L3_FIELDS = "my_notes";
+    private static final String SERVICE_CACHE_ADDITIONAL_CURRENT_L3_FIELDS = "is_watched";
 
     private static final String METHOD_SEARCH_ALL = "services/caches/search/all";
     private static final String METHOD_SEARCH_BBOX = "services/caches/search/bbox";
@@ -722,6 +723,9 @@ final class OkapiClient {
         }
         if (connector.getApiSupport() == ApiSupport.current) {
             res.append(SEPARATOR).append(SERVICE_CACHE_ADDITIONAL_CURRENT_FIELDS);
+            if (connector.getSupportedAuthLevel() == OAuthLevel.Level3) {
+                res.append(SEPARATOR).append(SERVICE_CACHE_ADDITIONAL_CURRENT_L3_FIELDS);
+            }
         }
 
         return res.toString();
diff --git a/main/src/cgeo/geocaching/settings/OAuthPreference.java b/main/src/cgeo/geocaching/settings/OAuthPreference.java
index 54f8023..54bad6d 100644
--- a/main/src/cgeo/geocaching/settings/OAuthPreference.java
+++ b/main/src/cgeo/geocaching/settings/OAuthPreference.java
@@ -23,13 +23,14 @@ public class OAuthPreference extends AbstractClickablePreference {
         OCNL(R.string.pref_fakekey_ocnl_authorization, OCAuthorizationActivity.class, OCAuthParams.OC_NL_AUTH_PARAMS),
         OCUS(R.string.pref_fakekey_ocus_authorization, OCAuthorizationActivity.class, OCAuthParams.OC_US_AUTH_PARAMS),
         OCRO(R.string.pref_fakekey_ocro_authorization, OCAuthorizationActivity.class, OCAuthParams.OC_RO_AUTH_PARAMS),
+        OCUK(R.string.pref_fakekey_ocuk_authorization, OCAuthorizationActivity.class, OCAuthParams.OC_UK_AUTH_PARAMS),
         TWITTER(R.string.pref_fakekey_twitter_authorization, TwitterAuthorizationActivity.class, TwitterAuthorizationActivity.TWITTER_OAUTH_PARAMS);
 
         public final int prefKeyId;
         public final Class<?> authActivity;
         public final OAuthParameters authParams;
 
-        OAuthActivityMapping(int prefKeyId, Class<?> authActivity, OAuthParameters authParams) {
+        OAuthActivityMapping(final int prefKeyId, final Class<?> authActivity, final OAuthParameters authParams) {
             this.prefKeyId = prefKeyId;
             this.authActivity = authActivity;
             this.authParams = authParams;
@@ -40,7 +41,7 @@ public class OAuthPreference extends AbstractClickablePreference {
 
     private OAuthActivityMapping getAuthorization() {
         final String prefKey = getKey();
-        for (OAuthActivityMapping auth : OAuthActivityMapping.values()) {
+        for (final OAuthActivityMapping auth : OAuthActivityMapping.values()) {
             if (auth.prefKeyId != NO_KEY && prefKey.equals(CgeoApplication.getInstance().getString(auth.prefKeyId))) {
                 return auth;
             }
@@ -48,12 +49,12 @@ public class OAuthPreference extends AbstractClickablePreference {
         return OAuthActivityMapping.NONE;
     }
 
-    public OAuthPreference(Context context, AttributeSet attrs) {
+    public OAuthPreference(final Context context, final AttributeSet attrs) {
         super(context, attrs);
         this.oAuthMapping = getAuthorization();
     }
 
-    public OAuthPreference(Context context, AttributeSet attrs, int defStyle) {
+    public OAuthPreference(final Context context, final AttributeSet attrs, final int defStyle) {
         super(context, attrs, defStyle);
         this.oAuthMapping = getAuthorization();
     }
@@ -63,9 +64,9 @@ public class OAuthPreference extends AbstractClickablePreference {
         activity.setAuthTitle(oAuthMapping.prefKeyId);
         return new OnPreferenceClickListener() {
             @Override
-            public boolean onPreferenceClick(Preference preference) {
+            public boolean onPreferenceClick(final Preference preference) {
                 if (oAuthMapping.authActivity != null && oAuthMapping.authParams != null) {
-                    Intent authIntent = new Intent(preference.getContext(),
+                    final Intent authIntent = new Intent(preference.getContext(),
                             oAuthMapping.authActivity);
                     oAuthMapping.authParams.setOAuthExtras(authIntent);
                     activity.startActivityForResult(authIntent,
diff --git a/main/src/cgeo/geocaching/settings/OCPreferenceKeys.java b/main/src/cgeo/geocaching/settings/OCPreferenceKeys.java
index e3c5aca..39d4776 100644
--- a/main/src/cgeo/geocaching/settings/OCPreferenceKeys.java
+++ b/main/src/cgeo/geocaching/settings/OCPreferenceKeys.java
@@ -26,7 +26,10 @@ public enum OCPreferenceKeys {
             R.string.pref_ocnl_tokenpublic, R.string.pref_ocnl_tokensecret, OCAuthParams.OC_NL_AUTH_PARAMS),
     OC_RO("oc.ro", R.string.pref_connectorOCROActive, R.string.preference_screen_ocro,
             R.string.pref_fakekey_ocro_authorization, R.string.pref_fakekey_ocro_website,
-            R.string.pref_ocro_tokenpublic, R.string.pref_ocro_tokensecret, OCAuthParams.OC_RO_AUTH_PARAMS);
+            R.string.pref_ocro_tokenpublic, R.string.pref_ocro_tokensecret, OCAuthParams.OC_RO_AUTH_PARAMS),
+    OC_UK("oc.uk", R.string.pref_connectorOCUKActive, R.string.preference_screen_ocuk,
+            R.string.pref_fakekey_ocuk_authorization, R.string.pref_fakekey_ocuk_website,
+            R.string.pref_ocuk_tokenpublic, R.string.pref_ocuk_tokensecret, OCAuthParams.OC_UK_AUTH_PARAMS);
 
 
     private OCPreferenceKeys(final String siteId, final int isActivePrefId, final int prefScreenId, final int authPrefId,
@@ -48,8 +51,8 @@ public enum OCPreferenceKeys {
     static {
         FIND_BY_ISACTIVE_ID = new SparseArray<OCPreferenceKeys>(values().length);
         FIND_BY_AUTH_PREF_ID = new SparseArray<OCPreferenceKeys>(values().length);
-        Map<String, OCPreferenceKeys> byIsactiveKey = new HashMap<String, OCPreferenceKeys>();
-        for (OCPreferenceKeys key : values()) {
+        final Map<String, OCPreferenceKeys> byIsactiveKey = new HashMap<String, OCPreferenceKeys>();
+        for (final OCPreferenceKeys key : values()) {
             FIND_BY_ISACTIVE_ID.put(key.isActivePrefId, key);
             FIND_BY_AUTH_PREF_ID.put(key.authPrefId, key);
             byIsactiveKey.put(CgeoApplication.getInstance().getString(key.isActivePrefId), key);
diff --git a/main/src/cgeo/geocaching/settings/SettingsActivity.java b/main/src/cgeo/geocaching/settings/SettingsActivity.java
index f1f3897..f4097b2 100644
--- a/main/src/cgeo/geocaching/settings/SettingsActivity.java
+++ b/main/src/cgeo/geocaching/settings/SettingsActivity.java
@@ -462,6 +462,7 @@ public class SettingsActivity extends PreferenceActivity {
             case R.string.pref_fakekey_ocnl_authorization:
             case R.string.pref_fakekey_ocus_authorization:
             case R.string.pref_fakekey_ocro_authorization:
+            case R.string.pref_fakekey_ocuk_authorization:
                 setOCAuthTitle(OCPreferenceKeys.getByAuthId(prefKeyId));
                 break;
             case R.string.pref_fakekey_twitter_authorization:
@@ -537,6 +538,7 @@ public class SettingsActivity extends PreferenceActivity {
             case R.string.pref_fakekey_ocnl_authorization:
             case R.string.pref_fakekey_ocus_authorization:
             case R.string.pref_fakekey_ocro_authorization:
+            case R.string.pref_fakekey_ocuk_authorization:
                 final OCPreferenceKeys key = OCPreferenceKeys.getByAuthId(requestCode);
                 if (key != null) {
                     setOCAuthTitle(key);
@@ -589,6 +591,7 @@ public class SettingsActivity extends PreferenceActivity {
                     || isPreference(preference, R.string.pref_connectorOCNLActive)
                     || isPreference(preference, R.string.pref_connectorOCUSActive)
                     || isPreference(preference, R.string.pref_connectorOCROActive)
+                    || isPreference(preference, R.string.pref_connectorOCUKActive)
                     || isPreference(preference, R.string.pref_connectorGCActive)
                     || isPreference(preference, R.string.pref_connectorOXActive)
                     || isPreference(preference, R.string.pref_connectorECActive)) {