1 files changed, 10 insertions, 8 deletions

diff --git a/main/src/cgeo/geocaching/settings/Settings.java b/main/src/cgeo/geocaching/settings/Settings.java
index 0732866..6c3c984 100644
--- a/main/src/cgeo/geocaching/settings/Settings.java
+++ b/main/src/cgeo/geocaching/settings/Settings.java
@@ -54,8 +54,8 @@ public class Settings {
     private final static int unitsMetric = 1;
 
     // twitter api keys
-    private final static String keyConsumerPublic = CryptUtils.rot13("ESnsCvAv3kEupF1GCR3jGj");
-    private final static String keyConsumerSecret = CryptUtils.rot13("7vQWceACV9umEjJucmlpFe9FCMZSeqIqfkQ2BnhV9x");
+    private final static @NonNull String keyConsumerPublic = CryptUtils.rot13("ESnsCvAv3kEupF1GCR3jGj");
+    private final static @NonNull String keyConsumerSecret = CryptUtils.rot13("7vQWceACV9umEjJucmlpFe9FCMZSeqIqfkQ2BnhV9x");
 
     public enum CoordInputFormatEnum {
         Plain,
@@ -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() {
@@ -694,10 +694,12 @@ public class Settings {
         return getBoolean(R.string.pref_skin, false);
     }
 
+    @NonNull
     public static String getKeyConsumerPublic() {
         return keyConsumerPublic;
     }
 
+    @NonNull
     public static String getKeyConsumerSecret() {
         return keyConsumerSecret;
     }