From 627d699aa84ad67b92b516fd294ac941e5db6fc5 Mon Sep 17 00:00:00 2001 From: jandegr Date: Sat, 21 Apr 2018 10:48:10 +0200 Subject: Refactoring:Android:cleanup (#458) * Update Navit.java * Update Navit.java * Update CMakeLists.txt * Update CMakeLists.txt --- CMakeLists.txt | 2 + .../android/src/org/navitproject/navit/Navit.java | 65 +++++++++------------- 2 files changed, 28 insertions(+), 39 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 763f75bed..f4ce4cc97 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -698,6 +698,8 @@ if(ANDROID) set(XSLTS "android;${XSLTS}" CACHE STRING "define a semicolon seperated list of XSLTs to process") list(APPEND NAVIT_LIBS log) set(HAVE_API_ANDROID 1) + set_with_reason(speech/cmdline "Android detected" FALSE) + set_with_reason(graphics/null "Android detected" FALSE) set_with_reason(graphics/android "Android detected, NDK:${ANDROID_NDK_API_VERSION}, API:${ANDROID_API_VERSION}" TRUE) set_with_reason(speech/android "Android detected, NDK:${ANDROID_NDK_API_VERSION}, API:${ANDROID_API_VERSION}" TRUE) set_with_reason(vehicle/android "Android detected, NDK:${ANDROID_NDK_API_VERSION}, API:${ANDROID_API_VERSION}" TRUE) diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java index 7505e7ff7..6290d4ac5 100644 --- a/navit/android/src/org/navitproject/navit/Navit.java +++ b/navit/android/src/org/navitproject/navit/Navit.java @@ -104,19 +104,15 @@ public class Navit extends Activity private static long startup_intent_timestamp = 0L; public static String my_display_density = "mdpi"; public static final int NavitDownloaderSelectMap_id = 967; - public static final int MAP_NUM_PRIMARY = 11; public static final int NavitAddressSearch_id = 70; public static final int NavitSelectStorage_id = 43; public static String NavitLanguage; public static Resources NavitResources = null; - - public static final int MAP_NUM_SECONDARY = 12; static final String NAVIT_PACKAGE_NAME = "org.navitproject.navit"; static final String TAG = "Navit"; static String map_filename_path = null; static final String NAVIT_DATA_DIR = "/data/data/" + NAVIT_PACKAGE_NAME; static final String NAVIT_DATA_SHARE_DIR = NAVIT_DATA_DIR + "/share"; - static final String FIRST_STARTUP_FILE = NAVIT_DATA_SHARE_DIR + "/has_run_once.txt"; public static final String NAVIT_PREFS = "NavitPrefs"; Boolean isFullscreen = false; private static final int MY_PERMISSIONS_REQUEST_ALL = 101; @@ -246,14 +242,14 @@ public class Navit extends Activity // TRANS infobox.setPositiveButton(getString(R.string.initial_info_box_OK), new DialogInterface.OnClickListener() { public void onClick(DialogInterface arg0, int arg1) { - Log.e("Navit", "Ok, user saw the infobox"); + Log.d(TAG, "Ok, user saw the infobox"); } }); // TRANS infobox.setNeutralButton(getString(R.string.initial_info_box_more_info), new DialogInterface.OnClickListener() { public void onClick(DialogInterface arg0, int arg1) { - Log.e("Navit", "user wants more info, show the website"); + Log.d(TAG, "user wants more info, show the website"); String url = "http://wiki.navit-project.org/index.php/Navit_on_Android"; Intent i = new Intent(Intent.ACTION_VIEW); i.setData(Uri.parse(url)); @@ -285,8 +281,8 @@ public class Navit extends Activity Navit.startup_intent = this.getIntent(); // 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()); + Log.d(TAG, "**1**A " + startup_intent.getAction()); + Log.d(TAG, "**1**D " + startup_intent.getDataString()); // init translated text NavitTextTranslations.init(); @@ -333,13 +329,13 @@ public class Navit extends Activity String lang = locale.getLanguage(); String langu = lang; String langc = lang; - Log.e("Navit", "lang=" + lang); + Log.d(TAG, "lang=" + lang); int pos = langu.indexOf('_'); if (pos != -1) { langc = langu.substring(0, pos); NavitLanguage = langc + langu.substring(pos).toUpperCase(locale); - Log.e("Navit", "substring lang " + NavitLanguage.substring(pos).toUpperCase(locale)); + Log.d(TAG, "substring lang " + NavitLanguage.substring(pos).toUpperCase(locale)); // set lang. for translation NavitTextTranslations.main_language = langc; NavitTextTranslations.sub_language = NavitLanguage.substring(pos).toUpperCase(locale); @@ -347,14 +343,14 @@ public class Navit extends Activity else { String country = locale.getCountry(); - Log.e("Navit", "Country1 " + country); - Log.e("Navit", "Country2 " + country.toUpperCase(locale)); + Log.d(TAG, "Country1 " + country); + Log.d(TAG, "Country2 " + country.toUpperCase(locale)); NavitLanguage = langc + "_" + country.toUpperCase(locale); // set lang. for translation NavitTextTranslations.main_language = langc; NavitTextTranslations.sub_language = country.toUpperCase(locale); } - Log.e("Navit", "Language " + lang); + Log.d(TAG, "Language " + lang); SharedPreferences prefs = getSharedPreferences(NAVIT_PREFS,MODE_PRIVATE); map_filename_path = prefs.getString("filenamePath", Environment.getExternalStorageDirectory().getPath() + "/navit/"); @@ -373,10 +369,10 @@ public class Navit extends Activity metrics = new DisplayMetrics(); display_.getMetrics(Navit.metrics); int densityDpi = (int)(( Navit.metrics.density*160)-.5f); - Log.e("Navit", "Navit -> pixels x=" + width_ + " pixels y=" + height_); - Log.e("Navit", "Navit -> dpi=" + densityDpi); - Log.e("Navit", "Navit -> density=" + Navit.metrics.density); - Log.e("Navit", "Navit -> scaledDensity=" + Navit.metrics.scaledDensity); + Log.d(TAG, "Navit -> pixels x=" + width_ + " pixels y=" + height_); + Log.d(TAG, "Navit -> dpi=" + densityDpi); + Log.d(TAG, "Navit -> density=" + Navit.metrics.density); + Log.d(TAG, "Navit -> scaledDensity=" + Navit.metrics.scaledDensity); ActivityResults = new NavitActivityResult[16]; setVolumeControlStream(AudioManager.STREAM_MUSIC); @@ -385,7 +381,7 @@ public class Navit extends Activity if (!extractRes(langc, NAVIT_DATA_DIR + "/locale/" + langc + "/LC_MESSAGES/navit.mo")) { - Log.e("Navit", "Failed to extract language resource " + langc); + Log.e(TAG, "Failed to extract language resource " + langc); } if (densityDpi <= 120) @@ -414,18 +410,18 @@ public class Navit extends Activity } else { - Log.e("Navit", "found device of very high density ("+densityDpi+")"); - Log.e("Navit", "using xxxhdpi values"); + Log.e(TAG, "found device of very high density ("+densityDpi+")"); + Log.e(TAG, "using xxxhdpi values"); my_display_density = "xxxhdpi"; } if (!extractRes("navit" + my_display_density, NAVIT_DATA_DIR + "/share/navit.xml")) { - Log.e("Navit", "Failed to extract navit.xml for " + my_display_density); + Log.e(TAG, "Failed to extract navit.xml for " + my_display_density); } // --> 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)); + Log.d(TAG, "android.os.Build.VERSION.SDK_INT=" + Integer.valueOf(android.os.Build.VERSION.SDK)); NavitMain(this, NavitLanguage, Integer.valueOf(android.os.Build.VERSION.SDK), my_display_density, NAVIT_DATA_DIR+"/bin/navit",map_filename_path); showInfos(); @@ -437,7 +433,7 @@ public class Navit extends Activity public void onResume() { super.onResume(); - Log.d("Navit", "OnResume"); + Log.d(TAG, "OnResume"); if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) { /* Required to make system bars fully transparent */ getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE @@ -454,15 +450,15 @@ public class Navit extends Activity { if (System.currentTimeMillis() <= Navit.startup_intent_timestamp + 4000L) { - Log.e("Navit", "**2**A " + startup_intent.getAction()); - Log.e("Navit", "**2**D " + startup_intent.getDataString()); + Log.d(TAG, "**2**A " + startup_intent.getAction()); + Log.d(TAG, "**2**D " + startup_intent.getDataString()); String navi_scheme = startup_intent.getScheme(); if ( navi_scheme != null && navi_scheme.equals("google.navigation")) { parseNavigationURI(startup_intent.getData().getSchemeSpecificPart()); } } else { - Log.e("Navit", "timestamp for navigate_to expired! not using data"); + Log.e(TAG, "timestamp for navigate_to expired! not using data"); } } Log.d(TAG, "onResume"); @@ -563,7 +559,7 @@ public class Navit extends Activity msg.setData(b); msg.sendToTarget(); - Log.e("Navit", "target found (b): " + geoString); + Log.e(TAG, "target found (b): " + geoString); } catch (NumberFormatException e) { } // nothing to do here } } @@ -575,7 +571,6 @@ public class Navit extends Activity public void setActivityResult(int requestCode, NavitActivityResult ActivityResult) { - //Log.e("Navit", "setActivityResult " + requestCode); ActivityResults[requestCode] = ActivityResult; } @@ -617,17 +612,11 @@ public class Navit extends Activity // callback id gets set here when called from NavitGraphics public static void setKeypressCallback(int kp_cb_id, NavitGraphics ng) { - //Log.e("Navit", "setKeypressCallback -> id1=" + kp_cb_id); - //Log.e("Navit", "setKeypressCallback -> ng=" + String.valueOf(ng)); - //N_KeypressCallbackID = kp_cb_id; N_NavitGraphics = ng; } public static void setMotionCallback(int mo_cb_id, NavitGraphics ng) { - //Log.e("Navit", "setKeypressCallback -> id2=" + mo_cb_id); - //Log.e("Navit", "setKeypressCallback -> ng=" + String.valueOf(ng)); - //N_MotionCallbackID = mo_cb_id; N_NavitGraphics = ng; } @@ -655,20 +644,19 @@ public class Navit extends Activity public void runOptionsItem(int id) { - // Handle item selection switch (id) { case 1 : // zoom in Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_ZOOM_IN.ordinal()).sendToTarget(); // if we zoom, hide the bubble - Log.e("Navit", "onOptionsItemSelected -> zoom in"); + Log.d(TAG, "onOptionsItemSelected -> zoom in"); break; case 2 : // zoom out Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_ZOOM_OUT.ordinal()).sendToTarget(); // if we zoom, hide the bubble - Log.e("Navit", "onOptionsItemSelected -> zoom out"); + Log.d(TAG, "onOptionsItemSelected -> zoom out"); break; case 3 : // map download menu @@ -829,7 +817,6 @@ public class Navit extends Activity else Log.w(TAG, "select path failed"); break; default : - //Log.e("Navit", "onActivityResult " + requestCode + " " + resultCode); ActivityResults[requestCode].onActivityResult(requestCode, resultCode, data); break; } @@ -870,7 +857,7 @@ public class Navit extends Activity public void onDestroy() { super.onDestroy(); - Log.e("Navit", "OnDestroy"); + Log.d(TAG, "OnDestroy"); // TODO next call will kill our app the hard way. This should not be necessary, but ensures navit is // properly restarted and no resources are wasted with navit in background. Remove this call after // code review -- cgit v1.2.1