github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #741 from xianglin1998/android_lib

Browse source 
Work directory supported.
This commit is contained in:
Iceman 2020-05-20 11:17:54 +02:00 • committed by GitHub
commit a064bf15a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

36
client/android/pm3_main.c
View file

@ -45,15 +45,23 @@ int push_cmdscriptfile(char *path, bool stayafter) {
return PM3_SUCCESS; return PM3_SUCCESS;
} }
static char *my_executable_path = NULL; static char *g_android_my_executable_path = NULL;
static char *my_executable_directory = NULL; static char *g_android_my_executable_directory = NULL;
const char *get_my_executable_path(void) { const char *get_my_executable_path(void) {
return my_executable_path; return g_android_my_executable_path;
} }
const char *get_my_executable_directory(void) { const char *get_my_executable_directory(void) {
return my_executable_directory; if (g_android_my_executable_directory != NULL) free(g_android_my_executable_directory);
char buf[1024];
// get current work directory
getcwd(buf, sizeof(buf));
// add / to end.
sprintf(buf, "%s%s", buf, PATHSEP);
// create on global
g_android_my_executable_directory = strdup(buf);
return g_android_my_executable_directory;
} }
static void set_my_executable_path(void) { static void set_my_executable_path(void) {
@ -95,7 +103,7 @@ jint sendCMD(JNIEnv *env, jobject instance, jstring cmd_) {
} }
// display on new line // display on new line
PrintAndLogEx(NORMAL, "\n"); PrintAndLogEx(NORMAL, "\n");
char *cmd = (char *)((*env)->GetStringUTFChars(env, cmd_, 0)); char *cmd = (char *) ((*env)->GetStringUTFChars(env, cmd_, 0));
int ret = CommandReceived(cmd); int ret = CommandReceived(cmd);
if (ret == 99) { if (ret == 99) {
// exit / quit // exit / quit
@ -110,7 +118,7 @@ jint sendCMD(JNIEnv *env, jobject instance, jstring cmd_) {
* Is client running! * Is client running!
* */ * */
jboolean isExecuting(JNIEnv *env, jobject instance) { jboolean isExecuting(JNIEnv *env, jobject instance) {
return (jboolean)((jboolean) conn.run); return (jboolean) ((jboolean) conn.run);
} }
/* /*
@ -123,7 +131,7 @@ jboolean testPm3(JNIEnv *env, jobject instance) {
return false; return false;
} }
bool ret2 = TestProxmark() == PM3_SUCCESS; bool ret2 = TestProxmark() == PM3_SUCCESS;
return (jboolean)(ret1 && ret2); return (jboolean) (ret1 && ret2);
} }
/* /*
@ -148,21 +156,21 @@ JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved) {
} }
jclass clz_test = (*jniEnv)->FindClass(jniEnv, "cn/rrg/devices/Proxmark3RRGRdv4"); jclass clz_test = (*jniEnv)->FindClass(jniEnv, "cn/rrg/devices/Proxmark3RRGRdv4");
JNINativeMethod methods[] = { JNINativeMethod methods[] = {
{"startExecute", "(Ljava/lang/String;)I", (void *) sendCMD}, {"startExecute", "(Ljava/lang/String;)I", (void *) sendCMD},
{"stopExecute", "()V", (void *) stopPm3}, {"stopExecute", "()V", (void *) stopPm3},
{"isExecuting", "()Z", (void *) isExecuting} {"isExecuting", "()Z", (void *) isExecuting}
}; };
JNINativeMethod methods1[] = { JNINativeMethod methods1[] = {
{"testPm3", "()Z", (void *) testPm3}, {"testPm3", "()Z", (void *) testPm3},
{"closePm3", "()V", stopPm3} {"closePm3", "()V", stopPm3}
}; };
if ((*jniEnv)->RegisterNatives(jniEnv, clazz, methods, sizeof(methods) / sizeof(methods[0])) != if ((*jniEnv)->RegisterNatives(jniEnv, clazz, methods, sizeof(methods) / sizeof(methods[0])) !=
JNI_OK) { JNI_OK) {
return -1; return -1;
} }
if ((*jniEnv)->RegisterNatives(jniEnv, clz_test, methods1, if ((*jniEnv)->RegisterNatives(jniEnv, clz_test, methods1,
sizeof(methods1) / sizeof(methods1[0])) != sizeof(methods1) / sizeof(methods1[0])) !=
JNI_OK) { JNI_OK) {
return -1; return -1;
} }
(*jniEnv)->DeleteLocalRef(jniEnv, clazz); (*jniEnv)->DeleteLocalRef(jniEnv, clazz);