Skip to content

Commit db3277b

Browse files
Merge pull request #235 from mavlink/remove-setTempDirectory
Remove setTempDirectory now that Android's TMPDIR is used by default
2 parents c03bb99 + 85ff886 commit db3277b

3 files changed

Lines changed: 1 addition & 27 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ ProGuard users may need to add the following rule:
7070
2. For Android, run the `mavsdk_server` as follows:
7171

7272
```java
73-
MavsdkServer server = new MavsdkServer(context);
73+
MavsdkServer server = new MavsdkServer();
7474
MavsdkEventQueue.executor().execute(() -> server.run(SYSTEM_ADDRESS, MAVSDK_SERVER_PORT));
7575
```
7676

‎mavsdk_server/src/main/cpp/native-lib.cpp‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,"MAVSDK-Server",__VA_ARGS__)
88

9-
extern "C" char* mavsdk_temp_path;
10-
119
extern "C"
1210
{
1311
JNIEXPORT jlong JNICALL
@@ -80,15 +78,4 @@ extern "C"
8078
mavsdk_server_destroy(mavsdk_server);
8179
}
8280

83-
JNIEXPORT void JNICALL
84-
Java_io_mavsdk_mavsdkserver_MavsdkServer_setTempDirectory(JNIEnv *env, jobject thiz, jstring temp_dir)
85-
{
86-
const char* temp_c_str = env->GetStringUTFChars(temp_dir, 0);
87-
88-
static char our_copy[256];
89-
strncpy(our_copy, temp_c_str, sizeof(our_copy));
90-
mavsdk_temp_path = our_copy;
91-
92-
env->ReleaseStringUTFChars(temp_dir, temp_c_str);
93-
}
9481
};

‎mavsdk_server/src/main/java/io/mavsdk/mavsdkserver/MavsdkServer.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,11 @@
11
package io.mavsdk.mavsdkserver;
22

3-
import android.content.Context;
4-
53
public class MavsdkServer {
64

75
static {
86
java.lang.System.loadLibrary("native_lib");
97
}
108

11-
public MavsdkServer(Context context) {
12-
String cacheDir = context.getCacheDir().getAbsolutePath();
13-
setTempDirectory(cacheDir);
14-
}
15-
16-
public MavsdkServer(String tempDirectory) {
17-
setTempDirectory(tempDirectory);
18-
}
19-
209
private long mavsdkServerHandle;
2110

2211
/**
@@ -136,6 +125,4 @@ public void destroy() {
136125
}
137126

138127
private native void destroy(long mavsdkServerHandle);
139-
140-
public native void setTempDirectory(String dir);
141128
}

0 commit comments

Comments
 (0)