Browse Source

return to strdup() when filling argv[] for i2p::android::start(argc,argv).c_str()

pull/1064/head^2
unlnown542a 7 years ago
parent
commit
8864cbf80a
  1. 2
      android/build.gradle
  2. 15
      android/jni/i2pd_android.cpp

2
android/build.gradle

@ -23,7 +23,7 @@ android {
targetSdkVersion 25 targetSdkVersion 25
minSdkVersion 14 minSdkVersion 14
versionCode 1 versionCode 1
versionName "2.17.2b" versionName "2.17.2c"
} }
sourceSets { sourceSets {
main { main {

15
android/jni/i2pd_android.cpp

@ -46,13 +46,14 @@ JNIEXPORT jstring JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_getABICompiledWith
JNIEXPORT jstring JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_startDaemon JNIEXPORT jstring JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_startDaemon
(JNIEnv * env, jclass clazz) { (JNIEnv * env, jclass clazz) {
int argc=5; int argc=5;
static char* argv[]={ static char* argv[]={
"i2pd", "--service", "--daemon", strdup("i2pd"),
"--conf=/sdcard/i2pd/i2pd.conf", strdup("--conf=/sdcard/i2pd/i2pd.conf"),
"--tunconf=/sdcard/i2pd/tunnels.conf", strdup("--tunconf=/sdcard/i2pd/tunnels.conf"),
"--datadir=/data/data/org.purplei2p.i2pd/app_data/" strdup("--datadir=/data/data/org.purplei2p.i2pd/app_data/"),
}; strdup("--service"), strdup("--daemon")
};
return env->NewStringUTF(i2p::android::start(argc,argv).c_str()); return env->NewStringUTF(i2p::android::start(argc,argv).c_str());
} }

Loading…
Cancel
Save