From: <ri...@us...> - 2012-04-27 18:36:37
|
Revision: 5041 http://navit.svn.sourceforge.net/navit/?rev=5041&view=rev Author: rikky Date: 2012-04-27 18:36:31 +0000 (Fri, 27 Apr 2012) Log Message: ----------- Fix:Android:Properly activate map after downloading Modified Paths: -------------- trunk/navit/navit/android/src/org/navitproject/navit/Navit.java trunk/navit/navit/android/src/org/navitproject/navit/NavitDialogs.java Modified: trunk/navit/navit/android/src/org/navitproject/navit/Navit.java =================================================================== --- trunk/navit/navit/android/src/org/navitproject/navit/Navit.java 2012-04-27 18:36:06 UTC (rev 5040) +++ trunk/navit/navit/android/src/org/navitproject/navit/Navit.java 2012-04-27 18:36:31 UTC (rev 5041) @@ -94,6 +94,7 @@ public static final int MAP_NUM_PRIMARY = 11; public static final int NavitAddressSearch_id = 70; public static final int NavitAddressResultList_id = 71; + public static String NavitLanguage; public static List<NavitAddress> NavitAddressResultList_foundItems = new ArrayList<NavitAddress>(); @@ -266,7 +267,7 @@ // only take arguments here, onResume gets called all the time (e.g. when screenblanks, etc.) Navit.startup_intent = this.getIntent(); - // hack! remeber timstamp, and only allow 4 secs. later in onResume to set target! + // hack! Remember time stamps, and only allow 4 secs. later in onResume to set target! Navit.startup_intent_timestamp = System.currentTimeMillis(); Log.e("Navit", "**1**A " + startup_intent.getAction()); Log.e("Navit", "**1**D " + startup_intent.getDataString()); @@ -294,18 +295,18 @@ if (pos != -1) { langc = langu.substring(0, pos); - langu = langc + langu.substring(pos).toUpperCase(locale); - Log.e("Navit", "substring lang " + langu.substring(pos).toUpperCase(locale)); + NavitLanguage = langc + langu.substring(pos).toUpperCase(locale); + Log.e("Navit", "substring lang " + NavitLanguage.substring(pos).toUpperCase(locale)); // set lang. for translation NavitTextTranslations.main_language = langc; - NavitTextTranslations.sub_language = langu.substring(pos).toUpperCase(locale); + NavitTextTranslations.sub_language = NavitLanguage.substring(pos).toUpperCase(locale); } else { String country = locale.getCountry(); Log.e("Navit", "Country1 " + country); Log.e("Navit", "Country2 " + country.toUpperCase(locale)); - langu = langc + "_" + country.toUpperCase(locale); + NavitLanguage = langc + "_" + country.toUpperCase(locale); // set lang. for translation NavitTextTranslations.main_language = langc; NavitTextTranslations.sub_language = country.toUpperCase(locale); @@ -411,7 +412,7 @@ // --> dont use android.os.Build.VERSION.SDK_INT, needs API >= 4 Log.e("Navit", "android.os.Build.VERSION.SDK_INT=" + Integer.valueOf(android.os.Build.VERSION.SDK)); - NavitMain(this, langu, Integer.valueOf(android.os.Build.VERSION.SDK), my_display_density, NAVIT_DATA_DIR+"/bin/navit"); + NavitMain(this, NavitLanguage, Integer.valueOf(android.os.Build.VERSION.SDK), my_display_density, NAVIT_DATA_DIR+"/bin/navit"); showInfos(); @@ -759,6 +760,10 @@ public native void NavitMain(Navit x, String lang, int version, String display_density_string, String path); public native void NavitDestroy(); + public void activateNewMap() + { + NavitMain(this, NavitLanguage, Integer.valueOf(android.os.Build.VERSION.SDK), my_display_density, NAVIT_DATA_DIR+"/bin/navit"); + } /* * this is used to load the 'navit' native library on * application startup. The library has already been unpacked at Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitDialogs.java =================================================================== --- trunk/navit/navit/android/src/org/navitproject/navit/NavitDialogs.java 2012-04-27 18:36:06 UTC (rev 5040) +++ trunk/navit/navit/android/src/org/navitproject/navit/NavitDialogs.java 2012-04-27 18:36:31 UTC (rev 5041) @@ -41,9 +41,9 @@ private SearchResultsThreadSpinner searchresultsSpinner = null; private NavitMapDownloader mapdownloader = null; - private Activity mActivity; + private Navit mActivity; - public NavitDialogs(Activity activity) { + public NavitDialogs(Navit activity) { super(); mActivity = activity; mHandler = this; @@ -74,6 +74,7 @@ // dismiss dialog, remove dialog mActivity.dismissDialog(DIALOG_MAPDOWNLOAD); mActivity.removeDialog(DIALOG_MAPDOWNLOAD); + mActivity.activateNewMap(); break; case MSG_PROGRESS_BAR : // change progressbar values This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |