refactoring: premium membership is specific to geocaching.com

10 files changed, 31 insertions, 31 deletions

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 4068e38..23caf47 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -1368,7 +1368,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
             final LinearLayout layout = (LinearLayout) view.findViewById(R.id.favpoint_box);
             final boolean supportsFavoritePoints = cache.supportsFavoritePoints();
             layout.setVisibility(supportsFavoritePoints ? View.VISIBLE : View.GONE);
-            if (!supportsFavoritePoints || cache.isOwner() || !Settings.isPremiumMember()) {
+            if (!supportsFavoritePoints || cache.isOwner() || !Settings.isGCPremiumMember()) {
                 return;
             }
             final Button buttonAdd = (Button) view.findViewById(R.id.add_to_favpoint);
diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java
index a834c1a..4927b10 100644
--- a/main/src/cgeo/geocaching/MainActivity.java
+++ b/main/src/cgeo/geocaching/MainActivity.java
@@ -273,7 +273,7 @@ public class MainActivity extends AbstractActivity {
     @Override
     public boolean onPrepareOptionsMenu(final Menu menu) {
         super.onPrepareOptionsMenu(menu);
-        menu.findItem(R.id.menu_pocket_queries).setVisible(Settings.isPremiumMember());
+        menu.findItem(R.id.menu_pocket_queries).setVisible(Settings.isGCPremiumMember());
         return true;
     }
 
@@ -297,7 +297,7 @@ public class MainActivity extends AbstractActivity {
                 startScannerApplication();
                 return true;
             case R.id.menu_pocket_queries:
-                if (!Settings.isPremiumMember()) {
+                if (!Settings.isGCPremiumMember()) {
                     return true;
                 }
                 new PocketQueryList.UserInterface(MainActivity.this).promptForListSelection(new RunnableWithArgument<PocketQueryList>() {
diff --git a/main/src/cgeo/geocaching/connector/gc/GCConnector.java b/main/src/cgeo/geocaching/connector/gc/GCConnector.java
index 34e99d2..9c6b831 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCConnector.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCConnector.java
@@ -91,7 +91,7 @@ public class GCConnector extends AbstractConnector implements ISearchByGeocode,
 
     @Override
     public boolean supportsPersonalNote() {
-        return Settings.isPremiumMember();
+        return Settings.isGCPremiumMember();
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/connector/gc/GCLogin.java b/main/src/cgeo/geocaching/connector/gc/GCLogin.java
index a7cf6cf..f747911 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCLogin.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCLogin.java
@@ -97,7 +97,7 @@ public class GCLogin extends AbstractLogin {
         }
 
         if (getLoginStatus(loginData)) {
-            Log.i("Already logged in Geocaching.com as " + username + " (" + Settings.getMemberStatus() + ')');
+            Log.i("Already logged in Geocaching.com as " + username + " (" + Settings.getGCMemberStatus() + ')');
             if (switchToEnglish(loginData) && retry) {
                 return login(false);
             }
@@ -132,7 +132,7 @@ public class GCLogin extends AbstractLogin {
         assert loginData != null;  // Caught above
 
         if (getLoginStatus(loginData)) {
-            Log.i("Successfully logged in Geocaching.com as " + username + " (" + Settings.getMemberStatus() + ')');
+            Log.i("Successfully logged in Geocaching.com as " + username + " (" + Settings.getGCMemberStatus() + ')');
 
             if (switchToEnglish(loginData) && retry) {
                 return login(false);
@@ -204,9 +204,9 @@ public class GCLogin extends AbstractLogin {
                 Log.e("getLoginStatus: bad cache count", e);
             }
             setActualCachesFound(cachesCount);
-            Settings.setMemberStatus(TextUtils.getMatch(page, GCConstants.PATTERN_MEMBER_STATUS, true, null));
+            Settings.setGCMemberStatus(TextUtils.getMatch(page, GCConstants.PATTERN_MEMBER_STATUS, true, null));
             if ( page.contains(GCConstants.MEMBER_STATUS_RENEW) ) {
-                Settings.setMemberStatus(GCConstants.MEMBER_STATUS_PM);
+                Settings.setGCMemberStatus(GCConstants.MEMBER_STATUS_PM);
             }
             return true;
         }
@@ -259,9 +259,9 @@ public class GCLogin extends AbstractLogin {
             final String responseData = StringUtils.defaultString(Network.getResponseData(Network.getRequest("http://www.geocaching.com/my/")));
             final String profile = TextUtils.replaceWhitespace(responseData);
 
-            Settings.setMemberStatus(TextUtils.getMatch(profile, GCConstants.PATTERN_MEMBER_STATUS, true, null));
+            Settings.setGCMemberStatus(TextUtils.getMatch(profile, GCConstants.PATTERN_MEMBER_STATUS, true, null));
             if (profile.contains(GCConstants.MEMBER_STATUS_RENEW)) {
-                Settings.setMemberStatus(GCConstants.MEMBER_STATUS_PM);
+                Settings.setGCMemberStatus(GCConstants.MEMBER_STATUS_PM);
             }
 
             setActualCachesFound(Integer.parseInt(TextUtils.getMatch(profile, GCConstants.PATTERN_CACHES_FOUND, true, "-1").replaceAll("[,.]", "")));
diff --git a/main/src/cgeo/geocaching/connector/gc/GCMap.java b/main/src/cgeo/geocaching/connector/gc/GCMap.java
index 6c94150..2782b64 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCMap.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCMap.java
@@ -368,7 +368,7 @@ public class GCMap {
             }
         }
 
-        if (strategy.flags.contains(StrategyFlag.SEARCH_NEARBY) && Settings.isPremiumMember()) {
+        if (strategy.flags.contains(StrategyFlag.SEARCH_NEARBY) && Settings.isGCPremiumMember()) {
             final Geopoint center = viewport.getCenter();
             if ((lastSearchViewport == null) || !lastSearchViewport.contains(center)) {
                 //FIXME We don't have a RecaptchaReceiver!?
diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java
index f553707..632c630 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCParser.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java
@@ -282,7 +282,7 @@ public abstract class GCParser {
             recaptchaText = thread.getText();
         }
 
-        if (!cids.isEmpty() && (Settings.isPremiumMember() || showCaptcha) && ((thread == null || StringUtils.isBlank(thread.getChallenge())) || StringUtils.isNotBlank(recaptchaText))) {
+        if (!cids.isEmpty() && (Settings.isGCPremiumMember() || showCaptcha) && ((thread == null || StringUtils.isBlank(thread.getChallenge())) || StringUtils.isNotBlank(recaptchaText))) {
             Log.i("Trying to get .loc for " + cids.size() + " caches");
 
             try {
diff --git a/main/src/cgeo/geocaching/settings/Settings.java b/main/src/cgeo/geocaching/settings/Settings.java
index 0732866..ee97c13 100644
--- a/main/src/cgeo/geocaching/settings/Settings.java
+++ b/main/src/cgeo/geocaching/settings/Settings.java
@@ -313,16 +313,16 @@ public class Settings {
         return getBoolean(R.string.pref_connectorOXActive, false);
     }
 
-    public static boolean isPremiumMember() {
+    public static boolean isGCPremiumMember() {
         // Basic Member, Premium Member, ???
-        return GCConstants.MEMBER_STATUS_PM.equalsIgnoreCase(Settings.getMemberStatus());
+        return GCConstants.MEMBER_STATUS_PM.equalsIgnoreCase(Settings.getGCMemberStatus());
     }
 
-    public static String getMemberStatus() {
+    public static String getGCMemberStatus() {
         return getString(R.string.pref_memberstatus, "");
     }
 
-    public static boolean setMemberStatus(final String memberStatus) {
+    public static boolean setGCMemberStatus(final String memberStatus) {
         if (StringUtils.isBlank(memberStatus)) {
             return remove(R.string.pref_memberstatus);
         }
@@ -478,7 +478,7 @@ public class Settings {
     }
 
     public static boolean getLoadDirImg() {
-        return !isPremiumMember() && getBoolean(R.string.pref_loaddirectionimg, true);
+        return !isGCPremiumMember() && getBoolean(R.string.pref_loaddirectionimg, true);
     }
 
     public static void setGcCustomDate(final String format) {
@@ -506,7 +506,7 @@ public class Settings {
     }
 
     public static boolean isShowCaptcha() {
-        return !isPremiumMember() && getBoolean(R.string.pref_showcaptcha, false);
+        return !isGCPremiumMember() && getBoolean(R.string.pref_showcaptcha, false);
     }
 
     public static boolean isExcludeDisabledCaches() {
diff --git a/main/src/cgeo/geocaching/settings/SettingsActivity.java b/main/src/cgeo/geocaching/settings/SettingsActivity.java
index dcc6281..04880c4 100644
--- a/main/src/cgeo/geocaching/settings/SettingsActivity.java
+++ b/main/src/cgeo/geocaching/settings/SettingsActivity.java
@@ -146,7 +146,7 @@ public class SettingsActivity extends PreferenceActivity {
             }
         }
         getPreference(R.string.pref_fakekey_basicmembers_screen)
-                .setEnabled(!Settings.isPremiumMember());
+                .setEnabled(!Settings.isGCPremiumMember());
         redrawScreen(R.string.pref_fakekey_navigation_menu_screen);
     }
 
@@ -370,11 +370,11 @@ public class SettingsActivity extends PreferenceActivity {
 
     void initBasicMemberPreferences() {
         getPreference(R.string.pref_fakekey_basicmembers_screen)
-                .setEnabled(!Settings.isPremiumMember());
+                .setEnabled(!Settings.isGCPremiumMember());
         getPreference(R.string.pref_loaddirectionimg)
-                .setEnabled(!Settings.isPremiumMember());
+                .setEnabled(!Settings.isGCPremiumMember());
         getPreference(R.string.pref_showcaptcha)
-                .setEnabled(!Settings.isPremiumMember());
+                .setEnabled(!Settings.isGCPremiumMember());
 
         redrawScreen(R.string.pref_fakekey_services_screen);
     }
diff --git a/tests/src/cgeo/geocaching/CgeoApplicationTest.java b/tests/src/cgeo/geocaching/CgeoApplicationTest.java
index 067a4b8..730aff6 100644
--- a/tests/src/cgeo/geocaching/CgeoApplicationTest.java
+++ b/tests/src/cgeo/geocaching/CgeoApplicationTest.java
@@ -112,7 +112,7 @@ public class CgeoApplicationTest extends CGeoTestCase {
     public static Geocache testSearchByGeocode(final String geocode) {
         final SearchResult search = Geocache.searchByGeocode(geocode, null, 0, true, null);
         assertNotNull(search);
-        if (Settings.isPremiumMember() || search.getError() == null) {
+        if (Settings.isGCPremiumMember() || search.getError() == null) {
             assertEquals(1, search.getGeocodes().size());
             assertTrue(search.getGeocodes().contains(geocode));
             return DataStore.loadCache(geocode, LoadFlags.LOAD_CACHE_OR_DB);
@@ -138,14 +138,14 @@ public class CgeoApplicationTest extends CGeoTestCase {
      */
     private static void withMockedLoginDo(final Runnable runnable) {
         final ImmutablePair<String, String> login = Settings.getGcCredentials();
-        final String memberStatus = Settings.getMemberStatus();
+        final String memberStatus = Settings.getGCMemberStatus();
 
         try {
             runnable.run();
         } finally {
             // restore user and password
             TestSettings.setLogin(login.left, login.right);
-            Settings.setMemberStatus(memberStatus);
+            Settings.setGCMemberStatus(memberStatus);
             GCLogin.getInstance().login();
         }
     }
@@ -308,8 +308,8 @@ public class CgeoApplicationTest extends CGeoTestCase {
                     assertTrue(search.getGeocodes().contains(mockedCache.getGeocode()));
                     Geocache parsedCache = DataStore.loadCache(mockedCache.getGeocode(), LoadFlags.LOAD_CACHE_OR_DB);
 
-                    assertEquals(Settings.isPremiumMember(), mockedCache.getCoords().equals(parsedCache.getCoords()));
-                    assertEquals(Settings.isPremiumMember(), parsedCache.isReliableLatLon());
+                    assertEquals(Settings.isGCPremiumMember(), mockedCache.getCoords().equals(parsedCache.getCoords()));
+                    assertEquals(Settings.isGCPremiumMember(), parsedCache.isReliableLatLon());
 
                     // check update after switch strategy to FAST
                     Settings.setLiveMapStrategy(Strategy.FAST);
@@ -320,8 +320,8 @@ public class CgeoApplicationTest extends CGeoTestCase {
                     assertTrue(search.getGeocodes().contains(mockedCache.getGeocode()));
                     parsedCache = DataStore.loadCache(mockedCache.getGeocode(), LoadFlags.LOAD_CACHE_OR_DB);
 
-                    assertEquals(Settings.isPremiumMember(), mockedCache.getCoords().equals(parsedCache.getCoords()));
-                    assertEquals(Settings.isPremiumMember(), parsedCache.isReliableLatLon());
+                    assertEquals(Settings.isGCPremiumMember(), mockedCache.getCoords().equals(parsedCache.getCoords()));
+                    assertEquals(Settings.isGCPremiumMember(), parsedCache.isReliableLatLon());
 
                 } finally {
                     // restore user settings
@@ -421,7 +421,7 @@ public class CgeoApplicationTest extends CGeoTestCase {
         GCLogin.getInstance().logout();
         // Modify login data to avoid an automatic login again
         TestSettings.setLogin("c:geo", "c:geo");
-        Settings.setMemberStatus("Basic member");
+        Settings.setGCMemberStatus("Basic member");
     }
 
 }
diff --git a/tests/src/cgeo/geocaching/SettingsTest.java b/tests/src/cgeo/geocaching/SettingsTest.java
index c58db08..90a0209 100644
--- a/tests/src/cgeo/geocaching/SettingsTest.java
+++ b/tests/src/cgeo/geocaching/SettingsTest.java
@@ -27,7 +27,7 @@ public class SettingsTest extends ActivityInstrumentationTestCase2<MainActivity>
 
     public static void testSettings() {
         // unfortunately, several other tests depend on being a premium member and will fail if run by a basic member
-        assertEquals(GCConstants.MEMBER_STATUS_PM, Settings.getMemberStatus());
+        assertEquals(GCConstants.MEMBER_STATUS_PM, Settings.getGCMemberStatus());
     }
 
     public static void testDeviceHasNormalLogin() {