Merge branch 'keepalive' of https://github.com/etmatrix/cieid-android…

…-sdk into etmatrix-keepalive # Conflicts: # build.gradle # cieidsdk/build.gradle # gradle/wrapper/gradle-wrapper.properties
italia · Oct 9, 2021 · f765088 · f765088
2 parents 1ffa550 + 21698d5
commit f765088
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 5 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/cieidsdk/build.gradle b/cieidsdk/build.gradle
@@ -52,7 +52,7 @@ dependencies {
     implementation "com.squareup.retrofit2:converter-scalars:$retrofit_version"
     implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
     implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofit_version"
-    implementation 'com.squareup.okio:okio:2.9.0'
+    implementation 'com.squareup.okio:okio:2.10.0'
 
     //rxjava
     implementation 'io.reactivex.rxjava2:rxjava:2.2.21'

diff --git a/cieidsdk/src/main/java/it/ipzs/cieidsdk/common/CieIDSdk.kt b/cieidsdk/src/main/java/it/ipzs/cieidsdk/common/CieIDSdk.kt
@@ -170,6 +170,7 @@ object CieIDSdk : NfcAdapter.ReaderCallback {
             ias!!.getIdServizi()
             ias!!.startSecureChannel(ciePin)
             val certificate = ias!!.readCertCie()
+            ias!!.startKeepAlive()
             call(certificate)
 
         } catch (throwable: Throwable) {

diff --git a/cieidsdk/src/main/java/it/ipzs/cieidsdk/nfc/Ias.kt b/cieidsdk/src/main/java/it/ipzs/cieidsdk/nfc/Ias.kt
@@ -12,6 +12,7 @@ import it.ipzs.cieidsdk.nfc.extensions.hexStringToByteArray
 import it.ipzs.cieidsdk.util.CieIDSdkLogger
 import it.ipzs.cieidsdk.nfc.ApduResponse.SwError.*
 import java.util.*
+import java.util.concurrent.locks.ReentrantLock
 import kotlin.experimental.or
 
 
@@ -26,6 +27,7 @@ internal class Ias constructor(val isoDep: IsoDep) {
     internal class SendApduException(message : String) : IllegalArgumentException(message)
 
 
+    private var rlSign: ReentrantLock = ReentrantLock()
     private var index = 0
     private val CIE_AID = byteArrayOf(0xA0.toByte(), 0x00, 0x00, 0x00, 0x00, 0x39)
     private var dh_g: ByteArray = byteArrayOf()
@@ -631,6 +633,7 @@ internal class Ias constructor(val isoDep: IsoDep) {
 
     @Throws(Exception::class)
     fun sign(dataToSign: ByteArray): ByteArray? {
+        rlSign.lock()
         CieIDSdkLogger.log("sign()")
         val setKey = byteArrayOf(0x00, 0x22, 0x41, 0xA4.toByte())
         val val02 = byteArrayOf(0x02)
@@ -1681,7 +1684,17 @@ internal class Ias constructor(val isoDep: IsoDep) {
         return resp
     }
 
-
-
-
+    fun startKeepAlive() {
+        val id = 0x1003
+        Thread(Runnable {
+            while(rlSign.tryLock()) {
+                try {
+                    sendApduSM(byteArrayOf(0x00, 0xa4.toByte(), 0x02, 0x04), byteArrayOf(HIBYTE(id), LOBYTE(id)), null)
+                } finally {
+                    rlSign.unlock()
+                }
+                Thread.sleep(10)
+            }
+        }).start()
+    }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Fri Jun 19 10:20:59 CEST 2020
+#Wed Mar 31 09:08:05 CEST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME