diff options
| -rw-r--r-- | navit/navit/android.c | 7 | ||||
| -rw-r--r-- | navit/navit/android/src/org/navitproject/navit/Navit.java | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/navit/navit/android.c b/navit/navit/android.c index 556b670a4..fb0a87af2 100644 --- a/navit/navit/android.c +++ b/navit/navit/android.c @@ -51,9 +51,9 @@ android_find_method(jclass class, char *name, char *args, jmethodID *ret) } JNIEXPORT void JNICALL -Java_org_navitproject_navit_Navit_NavitMain( JNIEnv* env, jobject thiz, jobject activity, jobject lang, int version, jobject display_density_string) +Java_org_navitproject_navit_Navit_NavitMain( JNIEnv* env, jobject thiz, jobject activity, jobject lang, int version, jobject display_density_string, jobject path) { - char *strings[]={"/data/data/org.navitproject.navit/bin/navit",NULL}; + char *strings[]={NULL,NULL}; const char *langstr; const char *displaydensitystr; android_version=version; @@ -71,7 +71,10 @@ Java_org_navitproject_navit_Navit_NavitMain( JNIEnv* env, jobject thiz, jobject dbg(0,"*****displaydensity=%s\n",displaydensitystr); setenv("ANDROID_DENSITY",displaydensitystr,1); (*env)->ReleaseStringUTFChars(env, display_density_string, displaydensitystr); + strings[0]=(*env)->GetStringUTFChars(env, path, NULL); main_real(1, strings); + (*env)->ReleaseStringUTFChars(env, path, strings[0]); + } JNIEXPORT void JNICALL diff --git a/navit/navit/android/src/org/navitproject/navit/Navit.java b/navit/navit/android/src/org/navitproject/navit/Navit.java index a6e2bb0e7..cd3694a15 100644 --- a/navit/navit/android/src/org/navitproject/navit/Navit.java +++ b/navit/navit/android/src/org/navitproject/navit/Navit.java @@ -438,7 +438,7 @@ public class Navit extends Activity implements Handler.Callback // --> dont use!! NavitMain(this, langu, android.os.Build.VERSION.SDK_INT);
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);
+ NavitMain(this, langu, Integer.valueOf(android.os.Build.VERSION.SDK), my_display_density, NAVIT_DATA_DIR+"/bin/navit");
// CAUTION: don't use android.os.Build.VERSION.SDK_INT if <uses-sdk android:minSdkVersion="3" />
// You will get exception on all devices with Android 1.5 and lower
// because Build.VERSION.SDK_INT is since SDK 4 (Donut 1.6)
|