refactoring: premium membership is specific to geocaching.com

2 files changed, 10 insertions, 10 deletions

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);
     }