aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/MainActivity.java
diff options
context:
space:
mode:
Diffstat (limited to 'main/src/cgeo/geocaching/MainActivity.java')
-rw-r--r--main/src/cgeo/geocaching/MainActivity.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java
index 5898cba..24dd2c8 100644
--- a/main/src/cgeo/geocaching/MainActivity.java
+++ b/main/src/cgeo/geocaching/MainActivity.java
@@ -11,6 +11,9 @@ import cgeo.geocaching.enumerations.StatusCode;
import cgeo.geocaching.geopoint.Geopoint;
import cgeo.geocaching.geopoint.Units;
import cgeo.geocaching.maps.CGeoMap;
+import cgeo.geocaching.settings.NewSettingsActivity;
+import cgeo.geocaching.settings.Settings;
+import cgeo.geocaching.settings.SettingsActivity;
import cgeo.geocaching.ui.Formatter;
import cgeo.geocaching.utils.GeoDirHandler;
import cgeo.geocaching.utils.Log;
@@ -289,9 +292,12 @@ public class MainActivity extends AbstractActivity {
case R.id.menu_helpers:
startActivity(new Intent(this, UsefulAppsActivity.class));
return true;
- case R.id.menu_settings:
+ case R.id.menu_oldsettings:
startActivity(new Intent(this, SettingsActivity.class));
return true;
+ case R.id.menu_settings:
+ startActivity(new Intent(this, NewSettingsActivity.class));
+ return true;
case R.id.menu_history:
cgeocaches.startActivityHistory(this);
return true;
@@ -346,7 +352,7 @@ public class MainActivity extends AbstractActivity {
initialized = true;
Settings.setLanguage(Settings.isUseEnglish());
- Settings.getLogin();
+ Settings.getGcLogin();
if (app.firstRun) {
(new FirstLoginThread()).start();