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 #1159 from ca1e/master

Browse source 
android target client compability
This commit is contained in:
Philippe Teuwen 2021-01-04 19:27:23 +01:00 • committed by GitHub
commit 6eca721c4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/android/CMakeLists.txt
View file

@ -126,9 +126,11 @@ add_library(pm3rrg_rdv4 SHARED
${PM3_ROOT}/client/src/cmdlfawid.c ${PM3_ROOT}/client/src/cmdlfawid.c
${PM3_ROOT}/client/src/cmdlfcotag.c ${PM3_ROOT}/client/src/cmdlfcotag.c
${PM3_ROOT}/client/src/cmdlfdestron.c ${PM3_ROOT}/client/src/cmdlfdestron.c
${PM3_ROOT}/client/src/cmdlfem4x.c ${PM3_ROOT}/client/src/cmdlfem.c
${PM3_ROOT}/client/src/cmdlfem410x.c
${PM3_ROOT}/client/src/cmdlfem4x05.c ${PM3_ROOT}/client/src/cmdlfem4x05.c
${PM3_ROOT}/client/src/cmdlfem4x50.c ${PM3_ROOT}/client/src/cmdlfem4x50.c
${PM3_ROOT}/client/src/cmdlfem4x70.c
${PM3_ROOT}/client/src/cmdlffdxb.c ${PM3_ROOT}/client/src/cmdlffdxb.c
${PM3_ROOT}/client/src/cmdlfgallagher.c ${PM3_ROOT}/client/src/cmdlfgallagher.c
${PM3_ROOT}/client/src/cmdlfguard.c ${PM3_ROOT}/client/src/cmdlfguard.c

10
client/android/pm3_main.c
View file

@ -74,13 +74,13 @@ static bool OpenPm3(void) {
jint Console(JNIEnv *env, jobject instance, jstring cmd_) { jint Console(JNIEnv *env, jobject instance, jstring cmd_) {
if (!conn.run) { if (!conn.run) {
if (OpenPm3() && TestProxmark() == PM3_SUCCESS) { if (OpenPm3() && TestProxmark(session.current_device) == PM3_SUCCESS) {
LOGD("Connected to device"); LOGD("Connected to device");
PrintAndLogEx(SUCCESS, "Connected to device"); PrintAndLogEx(SUCCESS, "Connected to device");
} else { } else {
LOGD("Failed to connect to device"); LOGD("Failed to connect to device");
PrintAndLogEx(ERR, "Failed to connect to device"); PrintAndLogEx(ERR, "Failed to connect to device");
CloseProxmark(); CloseProxmark(session.current_device);
} }
} }
@ -110,10 +110,10 @@ jboolean IsClientRunning(JNIEnv *env, jobject instance) {
* */ * */
jboolean TestPm3(JNIEnv *env, jobject instance) { jboolean TestPm3(JNIEnv *env, jobject instance) {
if (open() == false) { if (open() == false) {
CloseProxmark(); CloseProxmark(session.current_device);
return false; return false;
} }
bool ret = (TestProxmark() == PM3_SUCCESS); bool ret = (TestProxmark(session.current_device) == PM3_SUCCESS);
return (jboolean)(ret); return (jboolean)(ret);
} }
@ -121,7 +121,7 @@ jboolean TestPm3(JNIEnv *env, jobject instance) {
* stop pm3 client * stop pm3 client
* */ * */
void ClosePm3(JNIEnv *env, jobject instance) { void ClosePm3(JNIEnv *env, jobject instance) {
CloseProxmark(); CloseProxmark(session.current_device);
} }
/* /*