altosdroid: Save selected map type in AltosDroid object

[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / AltosDroid.java

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 97373ab8da30e70b9890438022e7c5c9a1b501c1..5be9ba84429f38190e9d5038648fa85eab453600 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -76,6 +76,8 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
        public static final int REQUEST_PRELOAD_MAPS   = 3;
        public static final int REQUEST_MAP_TYPE       = 4;
 
+       public int map_type = AltosMap.maptype_hybrid;
+
        public static FragmentManager   fm;
 
        private BluetoothAdapter mBluetoothAdapter = null;
@@ -419,6 +421,7 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
        @Override
        public void onCreate(Bundle savedInstanceState) {
                super.onCreate(savedInstanceState);
+               AltosDebug.init(this);
                AltosDebug.debug("+++ ON CREATE +++");
 
                fm = getSupportFragmentManager();
@@ -676,12 +679,13 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
        }
 
        private void set_map_type(Intent data) {
-               int     mode = data.getIntExtra(MapTypeActivity.EXTRA_MAP_TYPE, -1);
+               int type = data.getIntExtra(MapTypeActivity.EXTRA_MAP_TYPE, -1);
 
-               AltosDebug.debug("intent set_map_type %d\n", mode);
-               if (mode != -1) {
+               AltosDebug.debug("intent set_map_type %d\n", type);
+               if (type != -1) {
+                       map_type = type;
                        for (AltosDroidTab mTab : mTabs)
-                               mTab.set_map_type(mode);
+                               mTab.set_map_type(map_type);
                }
        }