From 85ff88631bc5a36429213aaade07bae0d22514b9 Mon Sep 17 00:00:00 2001 From: Jonas Vautherin Date: Wed, 26 Aug 2026 01:01:08 +0200 Subject: [PATCH] Remove setTempDirectory now that Android's TMPDIR is used by default --- README.md | 2 +- mavsdk_server/src/main/cpp/native-lib.cpp | 13 ------------- .../java/io/mavsdk/mavsdkserver/MavsdkServer.java | 13 ------------- 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/README.md b/README.md index 2c5fe00..3aafa3a 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ ProGuard users may need to add the following rule: 2. For Android, run the `mavsdk_server` as follows: ```java -MavsdkServer server = new MavsdkServer(context); +MavsdkServer server = new MavsdkServer(); MavsdkEventQueue.executor().execute(() -> server.run(SYSTEM_ADDRESS, MAVSDK_SERVER_PORT)); ``` diff --git a/mavsdk_server/src/main/cpp/native-lib.cpp b/mavsdk_server/src/main/cpp/native-lib.cpp index de81273..bcf6cf4 100644 --- a/mavsdk_server/src/main/cpp/native-lib.cpp +++ b/mavsdk_server/src/main/cpp/native-lib.cpp @@ -6,8 +6,6 @@ #define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,"MAVSDK-Server",__VA_ARGS__) -extern "C" char* mavsdk_temp_path; - extern "C" { JNIEXPORT jlong JNICALL @@ -80,15 +78,4 @@ extern "C" mavsdk_server_destroy(mavsdk_server); } - JNIEXPORT void JNICALL - Java_io_mavsdk_mavsdkserver_MavsdkServer_setTempDirectory(JNIEnv *env, jobject thiz, jstring temp_dir) - { - const char* temp_c_str = env->GetStringUTFChars(temp_dir, 0); - - static char our_copy[256]; - strncpy(our_copy, temp_c_str, sizeof(our_copy)); - mavsdk_temp_path = our_copy; - - env->ReleaseStringUTFChars(temp_dir, temp_c_str); - } }; diff --git a/mavsdk_server/src/main/java/io/mavsdk/mavsdkserver/MavsdkServer.java b/mavsdk_server/src/main/java/io/mavsdk/mavsdkserver/MavsdkServer.java index 9a391f0..5ab6004 100644 --- a/mavsdk_server/src/main/java/io/mavsdk/mavsdkserver/MavsdkServer.java +++ b/mavsdk_server/src/main/java/io/mavsdk/mavsdkserver/MavsdkServer.java @@ -1,22 +1,11 @@ package io.mavsdk.mavsdkserver; -import android.content.Context; - public class MavsdkServer { static { java.lang.System.loadLibrary("native_lib"); } - public MavsdkServer(Context context) { - String cacheDir = context.getCacheDir().getAbsolutePath(); - setTempDirectory(cacheDir); - } - - public MavsdkServer(String tempDirectory) { - setTempDirectory(tempDirectory); - } - private long mavsdkServerHandle; /** @@ -136,6 +125,4 @@ public void destroy() { } private native void destroy(long mavsdkServerHandle); - - public native void setTempDirectory(String dir); }