From 1c5a206f7906454972b5e9fbe134f4e679316d6f Mon Sep 17 00:00:00 2001
From: NPC-C83H <i@scp500.com>
Date: Tue, 5 Jan 2021 01:27:21 +0800
Subject: [PATCH 1/2] Update CMakeLists.txt

android client compability
---
 client/android/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/android/CMakeLists.txt b/client/android/CMakeLists.txt
index f459748b2..69a383bb9 100644
--- a/client/android/CMakeLists.txt
+++ b/client/android/CMakeLists.txt
@@ -126,9 +126,11 @@ add_library(pm3rrg_rdv4 SHARED
         ${PM3_ROOT}/client/src/cmdlfawid.c
         ${PM3_ROOT}/client/src/cmdlfcotag.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/cmdlfem4x50.c
+        ${PM3_ROOT}/client/src/cmdlfem4x70.c
         ${PM3_ROOT}/client/src/cmdlffdxb.c
         ${PM3_ROOT}/client/src/cmdlfgallagher.c
         ${PM3_ROOT}/client/src/cmdlfguard.c

From 86821a253466930de568bf8ebb661b19590ffb46 Mon Sep 17 00:00:00 2001
From: NPC-C83H <i@scp500.com>
Date: Tue, 5 Jan 2021 01:32:05 +0800
Subject: [PATCH 2/2] Update pm3_main.c

---
 client/android/pm3_main.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/android/pm3_main.c b/client/android/pm3_main.c
index 3d2ef917d..1fb1cc95f 100644
--- a/client/android/pm3_main.c
+++ b/client/android/pm3_main.c
@@ -74,13 +74,13 @@ static bool OpenPm3(void) {
 jint Console(JNIEnv *env, jobject instance, jstring cmd_) {
 
     if (!conn.run) {
-        if (OpenPm3() && TestProxmark() == PM3_SUCCESS) {
+        if (OpenPm3() && TestProxmark(session.current_device) == PM3_SUCCESS) {
             LOGD("Connected to device");
             PrintAndLogEx(SUCCESS, "Connected to device");
         } else {
             LOGD("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) {
     if (open() == false) {
-        CloseProxmark();
+        CloseProxmark(session.current_device);
         return false;
     }
-    bool ret = (TestProxmark() == PM3_SUCCESS);
+    bool ret = (TestProxmark(session.current_device) == PM3_SUCCESS);
     return (jboolean)(ret);
 }
 
@@ -121,7 +121,7 @@ jboolean TestPm3(JNIEnv *env, jobject instance) {
  * stop pm3 client
  * */
 void ClosePm3(JNIEnv *env, jobject instance) {
-    CloseProxmark();
+    CloseProxmark(session.current_device);
 }
 
 /*