Moved Java to C string conversion function to android_jni header file

diff --git a/src/frontends/android/jni/libandroidbridge/android_jni.h b/src/frontends/android/jni/libandroidbridge/android_jni.h
index 39ba56fc1bcdabe362c117c3edb3f8594a4a2d84..774d37d7ee9707b8acc98af340639b98b056b4b2 100644 (file)
--- a/src/frontends/android/jni/libandroidbridge/android_jni.h
+++ b/src/frontends/android/jni/libandroidbridge/android_jni.h
@@ -81,4 +81,23 @@ static inline bool androidjni_exception_occurred(JNIEnv *env)
        return FALSE;
 }
 
+/**
+ * Convert a Java string to a C string.  Memory is allocated.
+ *
+ * @param env          JNIEnv
+ * @param jstr         Java string
+ * @return                     native C string (allocated)
+ */
+static inline char *androidjni_convert_jstring(JNIEnv *env, jstring jstr)
+{
+       char *str;
+       jsize len;
+
+       len = (*env)->GetStringUTFLength(env, jstr);
+       str = malloc(len + 1);
+       (*env)->GetStringUTFRegion(env, jstr, 0, len, str);
+       str[len] = '\0';
+       return str;
+}
+
 #endif /** ANDROID_JNI_H_ @}*/

diff --git a/src/frontends/android/jni/libandroidbridge/charonservice.c b/src/frontends/android/jni/libandroidbridge/charonservice.c
index 2320338994be07488d5330fd7061fc5698b80a6c..802e087ec624ba27d5c2a853d1b942106ba63fbe 100644 (file)
--- a/src/frontends/android/jni/libandroidbridge/charonservice.c
+++ b/src/frontends/android/jni/libandroidbridge/charonservice.c
@@ -438,21 +438,6 @@ JNI_METHOD(CharonVpnService, deinitializeCharon, void)
        library_deinit();
 }
 
-/**
- * Convert a Java string to a C string.  Memory is allocated.
- */
-static inline char *convert_jstring(JNIEnv *env, jstring jstr)
-{
-       char *str;
-       jsize len;
-
-       len = (*env)->GetStringUTFLength(env, jstr);
-       str = malloc(len + 1);
-       (*env)->GetStringUTFRegion(env, jstr, 0, len, str);
-       str[len] = '\0';
-       return str;
-}
-
 /**
  * Initiate SA
  */
@@ -462,10 +447,10 @@ JNI_METHOD(CharonVpnService, initiate, void,
 {
        char *local_address, *gateway, *username, *password;
 
-       local_address = convert_jstring(env, jlocal_address);
-       gateway = convert_jstring(env, jgateway);
-       username = convert_jstring(env, jusername);
-       password = convert_jstring(env, jpassword);
+       local_address = androidjni_convert_jstring(env, jlocal_address);
+       gateway = androidjni_convert_jstring(env, jgateway);
+       username = androidjni_convert_jstring(env, jusername);
+       password = androidjni_convert_jstring(env, jpassword);
 
        initiate(local_address, gateway, username, password);
 }