Fix:Android:dont clutter sdcard root dir, move maps to /sdcard/navit subdir (Java...

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4218 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/android/src/org/navitproject/navit/Navit.java b/navit/navit/android/src/org/navitproject/navit/Navit.java
index af54be6..f6ed763 100644 (file)
--- a/navit/navit/android/src/org/navitproject/navit/Navit.java
+++ b/navit/navit/android/src/org/navitproject/navit/Navit.java
@@ -52,33 +52,34 @@ import android.widget.Toast;
 \r
 public class Navit extends Activity implements Handler.Callback\r
 {\r
-       public Handler                                                          handler;\r
-       private PowerManager.WakeLock                   wl;\r
-       private NavitActivityResult                     ActivityResults[];\r
-       public static InputMethodManager                mgr                                                                             = null;\r
-       public static DisplayMetrics                    metrics                                                                 = null;\r
-       public static Boolean                                   show_soft_keyboard                                      = false;\r
-       public static Boolean                                   show_soft_keyboard_now_showing  = false;\r
-       public static long                                              last_pressed_menu_key                           = 0L;\r
-       public static long                                              time_pressed_menu_key                           = 0L;\r
-       private static Intent                                   startup_intent                                                  = null;\r
-       private static long                                             startup_intent_timestamp                        = 0L;\r
-       public static String                                            my_display_density                                      = "mdpi";\r
-       private boolean                                                 parseErrorShown                                         = false;\r
-       private static NavitMapDownloader       map_download                                                    = null;\r
-       public static final int                                 MAPDOWNLOAD_PRI_DIALOG                          = 1;\r
-       public static final int                                 MAPDOWNLOAD_SEC_DIALOG                          = 2;\r
-       public ProgressDialog                                   mapdownloader_dialog_pri                        = null;\r
-       public ProgressDialog                                   mapdownloader_dialog_sec                        = null;\r
-       public static NavitMapDownloader                mapdownloader_pri                                               = null;\r
-       public static NavitMapDownloader                mapdownloader_sec                                               = null;\r
-       public static final int                                 NavitDownloaderPriSelectMap_id  = 967;\r
-       public static final int                                 NavitDownloaderSecSelectMap_id  = 968;\r
-       public static int                                                       download_map_id                                         = 0;\r
-       ProgressThread                                                          progressThread_pri                                      = null;\r
-       ProgressThread                                                          progressThread_sec                                      = null;\r
-       public static final int                                 MAP_NUM_PRIMARY                                         = 1;\r
-       public static final int                                 MAP_NUM_SECONDARY                                               = 1;\r
+       public Handler                                                  handler;\r
+       private PowerManager.WakeLock           wl;\r
+       private NavitActivityResult             ActivityResults[];\r
+       public static InputMethodManager        mgr                                                                             = null;\r
+       public static DisplayMetrics            metrics                                                                 = null;\r
+       public static Boolean                           show_soft_keyboard                                      = false;\r
+       public static Boolean                           show_soft_keyboard_now_showing  = false;\r
+       public static long                                      last_pressed_menu_key                           = 0L;\r
+       public static long                                      time_pressed_menu_key                           = 0L;\r
+       private static Intent                           startup_intent                                                  = null;\r
+       private static long                                     startup_intent_timestamp                        = 0L;\r
+       public static String                                    my_display_density                                      = "mdpi";\r
+       private boolean                                         parseErrorShown                                         = false;\r
+       //private static NavitMapDownloader     map_download                                                    = null;\r
+       public static final int                         MAPDOWNLOAD_PRI_DIALOG                          = 1;\r
+       public static final int                         MAPDOWNLOAD_SEC_DIALOG                          = 2;\r
+       public ProgressDialog                           mapdownloader_dialog_pri                        = null;\r
+       public ProgressDialog                           mapdownloader_dialog_sec                        = null;\r
+       public static NavitMapDownloader        mapdownloader_pri                                               = null;\r
+       public static NavitMapDownloader        mapdownloader_sec                                               = null;\r
+       public static final int                         NavitDownloaderPriSelectMap_id  = 967;\r
+       public static final int                         NavitDownloaderSecSelectMap_id  = 968;\r
+       public static int                                               download_map_id                                         = 0;\r
+       ProgressThread                                                  progressThread_pri                                      = null;\r
+       ProgressThread                                                  progressThread_sec                                      = null;\r
+       public static final int                         MAP_NUM_PRIMARY                                         = 11;\r
+       public static final int                         MAP_NUM_SECONDARY                                               = 12;\r
+       static final String                                     MAP_FILENAME_PATH                                               = "/sdcard/navit/";\r
 \r
        private boolean extractRes(String resname, String result)\r
        {\r
@@ -184,6 +185,11 @@ public class Navit extends Activity implements Handler.Callback
                Log.e("Navit", "**1**A " + startup_intent.getAction());\r
                Log.e("Navit", "**1**D " + startup_intent.getDataString());\r
 \r
+               // make sure the new path for the navitmap.bin file(s) exist!!\r
+               File navit_maps_dir = new File(this.MAP_FILENAME_PATH);\r
+               navit_maps_dir.mkdirs();\r
+\r
+\r
                Display display_ = getWindowManager().getDefaultDisplay();\r
                int width_ = display_.getWidth();\r
                int height_ = display_.getHeight();\r
@@ -281,7 +287,7 @@ public class Navit extends Activity implements Handler.Callback
 \r
                NavitActivity(3);\r
 \r
-               this.mgr = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);\r
+               Navit.mgr = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);\r
        }\r
        @Override\r
        public void onStart()\r
@@ -580,11 +586,12 @@ public class Navit extends Activity implements Handler.Callback
                                        {\r
                                                try\r
                                                {\r
-                                                       Log.d("Navit", "id=" + Integer.parseInt(data.getStringExtra("selected_id")));\r
+                                                       Log.d("Navit", "PRI id="\r
+                                                                       + Integer.parseInt(data.getStringExtra("selected_id")));\r
                                                        // set map id to download\r
                                                        Navit.download_map_id = Integer.parseInt(data.getStringExtra("selected_id"));\r
                                                        // show the map download progressbar, and download the map\r
-                                                       showDialog(Navit.MAP_NUM_PRIMARY);\r
+                                                       showDialog(Navit.MAPDOWNLOAD_PRI_DIALOG);\r
                                                }\r
                                                catch (NumberFormatException e)\r
                                                {\r
@@ -608,11 +615,12 @@ public class Navit extends Activity implements Handler.Callback
                                        {\r
                                                try\r
                                                {\r
-                                                       Log.d("Navit", "id=" + Integer.parseInt(data.getStringExtra("selected_id")));\r
+                                                       Log.d("Navit", "SEC id="\r
+                                                                       + Integer.parseInt(data.getStringExtra("selected_id")));\r
                                                        // set map id to download\r
                                                        Navit.download_map_id = Integer.parseInt(data.getStringExtra("selected_id"));\r
                                                        // show the map download progressbar, and download the map\r
-                                                       showDialog(Navit.MAP_NUM_SECONDARY);\r
+                                                       showDialog(Navit.MAPDOWNLOAD_SEC_DIALOG);\r
                                                }\r
                                                catch (NumberFormatException e)\r
                                                {\r
@@ -716,7 +724,7 @@ public class Navit extends Activity implements Handler.Callback
                                mapdownloader_dialog_pri.setCancelable(true);\r
                                mapdownloader_dialog_pri.setProgress(0);\r
                                mapdownloader_dialog_pri.setMax(200);\r
-                               DialogInterface.OnDismissListener mOnDismissListener = new DialogInterface.OnDismissListener()\r
+                               DialogInterface.OnDismissListener mOnDismissListener1 = new DialogInterface.OnDismissListener()\r
                                {\r
                                        public void onDismiss(DialogInterface dialog)\r
                                        {\r
@@ -726,9 +734,8 @@ public class Navit extends Activity implements Handler.Callback
                                                progressThread_pri.stop_thread();\r
                                        }\r
                                };\r
-                               mapdownloader_dialog_pri.setOnDismissListener(mOnDismissListener);\r
+                               mapdownloader_dialog_pri.setOnDismissListener(mOnDismissListener1);\r
                                mapdownloader_pri = new NavitMapDownloader(this);\r
-                               //map_download.download_osm_map(NavitMapDownloader.austria);\r
                                progressThread_pri = mapdownloader_pri.new ProgressThread(progress_handler,\r
                                                NavitMapDownloader.OSM_MAPS[Navit.download_map_id], MAP_NUM_PRIMARY);\r
                                progressThread_pri.start();\r
@@ -753,7 +760,6 @@ public class Navit extends Activity implements Handler.Callback
                                };\r
                                mapdownloader_dialog_sec.setOnDismissListener(mOnDismissListener2);\r
                                mapdownloader_sec = new NavitMapDownloader(this);\r
-                               //map_download.download_osm_map(NavitMapDownloader.austria);\r
                                progressThread_sec = mapdownloader_sec.new ProgressThread(progress_handler,\r
                                                NavitMapDownloader.OSM_MAPS[Navit.download_map_id], MAP_NUM_SECONDARY);\r
                                progressThread_sec.start();\r

diff --git a/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java b/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
index 4609bff..0ab65a7 100644 (file)
--- a/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
+++ b/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
@@ -585,7 +585,7 @@ public class NavitMapDownloader
        static final String                                     DOWNLOAD_FILENAME                                                               = "navitmap.tmp";\r
        static final String                                     MAP_FILENAME_PRI                                                                = "navitmap.bin";\r
        static final String                                     MAP_FILENAME_SEC                                                                = "navitmap_002.bin";\r
-       static final String                                     MAP_FILENAME_PATH                                                               = "/sdcard/";\r
+       static final String                                     MAP_FILENAME_PATH                                                               = Navit.MAP_FILENAME_PATH;\r
 \r
 \r
        public class ProgressThread extends Thread\r
@@ -595,11 +595,11 @@ public class NavitMapDownloader
                int                             map_num;\r
                int                             my_dialog_num;\r
 \r
-               ProgressThread(Handler h, osm_map_values map_values, int map_num)\r
+               ProgressThread(Handler h, osm_map_values map_values, int map_num2)\r
                {\r
                        this.mHandler = h;\r
                        this.map_values = map_values;\r
-                       this.map_num = map_num;\r
+                       this.map_num = map_num2;\r
                        if (this.map_num == Navit.MAP_NUM_PRIMARY)\r
                        {\r
                                this.my_dialog_num = Navit.MAPDOWNLOAD_PRI_DIALOG;\r
@@ -639,19 +639,23 @@ public class NavitMapDownloader
                this.navit_jmain = main;\r
        }\r
 \r
-       public int download_osm_map(Handler handler, osm_map_values map_values, int map_num)\r
+       public int download_osm_map(Handler handler, osm_map_values map_values, int map_num3)\r
        {\r
                int exit_code = 1;\r
 \r
+               //Log.v("NavitMapDownloader", "map_num3=" + map_num3);\r
                int my_dialog_num = 0;\r
-               if (map_num == Navit.MAP_NUM_PRIMARY)\r
+               if (map_num3 == Navit.MAP_NUM_PRIMARY)\r
                {\r
                        my_dialog_num = Navit.MAPDOWNLOAD_PRI_DIALOG;\r
+                       //Log.v("NavitMapDownloader", "PRI");\r
                }\r
-               else if (map_num == Navit.MAP_NUM_SECONDARY)\r
+               else if (map_num3 == Navit.MAP_NUM_SECONDARY)\r
                {\r
                        my_dialog_num = Navit.MAPDOWNLOAD_SEC_DIALOG;\r
+                       //Log.v("NavitMapDownloader", "SEC");\r
                }\r
+               //Log.v("NavitMapDownloader", "map_num3=" + map_num3);\r
 \r
                Message msg = handler.obtainMessage();\r
                Bundle b = new Bundle();\r
@@ -673,16 +677,20 @@ public class NavitMapDownloader
                }\r
 \r
                // output filename\r
+               String PATH = MAP_FILENAME_PATH;\r
                String fileName = DOWNLOAD_FILENAME;\r
-               String final_fileName = MAP_FILENAME_PRI;\r
-               if (map_num == Navit.MAP_NUM_SECONDARY)\r
+               String final_fileName = "xxx";\r
+               //Log.v("NavitMapDownloader", "map_num3=" + map_num3);\r
+               if (map_num3 == Navit.MAP_NUM_SECONDARY)\r
                {\r
                        final_fileName = this.MAP_FILENAME_SEC;\r
                }\r
+               else if (map_num3 == Navit.MAP_NUM_PRIMARY)\r
+               {\r
+                       final_fileName = this.MAP_FILENAME_PRI;\r
+               }\r
                // output path for output filename\r
                // String PATH = Environment.getExternalStorageDirectory() + "/download/";\r
-               String PATH = MAP_FILENAME_PATH;\r
-               Log.v("log_tag", "mapfilename tmp: " + PATH + fileName);\r
 \r
                try\r
                {\r