aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/settings
diff options
context:
space:
mode:
authorBananeweizen <bananeweizen@gmx.de>2013-12-16 15:09:26 +0100
committerBananeweizen <bananeweizen@gmx.de>2013-12-16 15:09:26 +0100
commit3719de7a754c103a3e841ec68ba8af31eda30d76 (patch)
tree0f3d0d2b5fae4d821f3bf8643b0fa7e970703176 /main/src/cgeo/geocaching/settings
parent755c21382c08953db22dc7ed958f72eff6760632 (diff)
downloadcgeo-3719de7a754c103a3e841ec68ba8af31eda30d76.zip
cgeo-3719de7a754c103a3e841ec68ba8af31eda30d76.tar.gz
cgeo-3719de7a754c103a3e841ec68ba8af31eda30d76.tar.bz2
rename Login to GCLogin
* easier to differentiate, as there are other login providers now
Diffstat (limited to 'main/src/cgeo/geocaching/settings')
-rw-r--r--main/src/cgeo/geocaching/settings/CheckGcCredentialsPreference.java8
-rw-r--r--main/src/cgeo/geocaching/settings/Settings.java4
-rw-r--r--main/src/cgeo/geocaching/settings/SettingsActivity.java6
3 files changed, 9 insertions, 9 deletions
diff --git a/main/src/cgeo/geocaching/settings/CheckGcCredentialsPreference.java b/main/src/cgeo/geocaching/settings/CheckGcCredentialsPreference.java
index 434f7d7..566ed7c 100644
--- a/main/src/cgeo/geocaching/settings/CheckGcCredentialsPreference.java
+++ b/main/src/cgeo/geocaching/settings/CheckGcCredentialsPreference.java
@@ -1,6 +1,6 @@
package cgeo.geocaching.settings;
-import cgeo.geocaching.connector.gc.Login;
+import cgeo.geocaching.connector.gc.GCLogin;
import cgeo.geocaching.enumerations.StatusCode;
import org.apache.commons.lang3.tuple.ImmutablePair;
@@ -29,11 +29,11 @@ public class CheckGcCredentialsPreference extends AbstractCheckCredentialsPrefer
@Override
protected Object login() {
- final StatusCode loginResult = Login.login();
+ final StatusCode loginResult = GCLogin.login();
Object payload = loginResult;
if (loginResult == StatusCode.NO_ERROR) {
- Login.detectGcCustomDate();
- payload = Login.downloadAvatarAndGetMemberStatus();
+ GCLogin.detectGcCustomDate();
+ payload = GCLogin.downloadAvatarAndGetMemberStatus();
}
return payload;
}
diff --git a/main/src/cgeo/geocaching/settings/Settings.java b/main/src/cgeo/geocaching/settings/Settings.java
index 88d4344..176e07d 100644
--- a/main/src/cgeo/geocaching/settings/Settings.java
+++ b/main/src/cgeo/geocaching/settings/Settings.java
@@ -4,7 +4,7 @@ import cgeo.geocaching.CgeoApplication;
import cgeo.geocaching.R;
import cgeo.geocaching.apps.cache.navi.NavigationAppFactory.NavigationAppsEnum;
import cgeo.geocaching.connector.gc.GCConstants;
-import cgeo.geocaching.connector.gc.Login;
+import cgeo.geocaching.connector.gc.GCLogin;
import cgeo.geocaching.enumerations.CacheType;
import cgeo.geocaching.enumerations.LiveMapStrategy.Strategy;
import cgeo.geocaching.enumerations.LogType;
@@ -489,7 +489,7 @@ public class Settings {
/**
* @return User selected date format on GC.com
- * @see Login#GC_CUSTOM_DATE_FORMATS
+ * @see GCLogin#GC_CUSTOM_DATE_FORMATS
*/
public static String getGcCustomDate() {
return getString(R.string.pref_gccustomdate, null);
diff --git a/main/src/cgeo/geocaching/settings/SettingsActivity.java b/main/src/cgeo/geocaching/settings/SettingsActivity.java
index c25e796..f9c23b3 100644
--- a/main/src/cgeo/geocaching/settings/SettingsActivity.java
+++ b/main/src/cgeo/geocaching/settings/SettingsActivity.java
@@ -9,7 +9,7 @@ import cgeo.geocaching.apps.cache.navi.NavigationAppFactory;
import cgeo.geocaching.apps.cache.navi.NavigationAppFactory.NavigationAppsEnum;
import cgeo.geocaching.compatibility.Compatibility;
import cgeo.geocaching.connector.gc.GCConnector;
-import cgeo.geocaching.connector.gc.Login;
+import cgeo.geocaching.connector.gc.GCLogin;
import cgeo.geocaching.files.SimpleDirChooser;
import cgeo.geocaching.maps.MapProviderFactory;
import cgeo.geocaching.maps.interfaces.MapSource;
@@ -528,8 +528,8 @@ public class SettingsActivity extends PreferenceActivity {
}
if ((isPreference(preference, R.string.pref_username) && !stringValue.equals(Settings.getUsername())) || (isPreference(preference, R.string.pref_password) && !stringValue.equals(Settings.getGcLogin().getRight()))) {
// reset log-in if gc user or password is changed
- if (Login.isActualLoginStatus()) {
- Login.logout();
+ if (GCLogin.isActualLoginStatus()) {
+ GCLogin.logout();
}
CgeoApplication.getInstance().checkLogin = true;
}