chore: support android 16k page size (#9)

Author: ByteZhang1024

android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:7.2.1"
+    classpath "com.android.tools.build:gradle:8.0.2"
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }

android/gradle.properties

@@ -1,5 +1,5 @@
-LiteCard_kotlinVersion=1.7.0
+LiteCard_kotlinVersion=2.1.20
 LiteCard_minSdkVersion=21
-LiteCard_targetSdkVersion=31
-LiteCard_compileSdkVersion=31
-LiteCard_ndkversion=21.4.7075529
+LiteCard_targetSdkVersion=35
+LiteCard_compileSdkVersion=35
+LiteCard_ndkversion=26.1.10909125

android/src/main/cpp/CMakeLists.txt

@@ -5,6 +5,10 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Os -Oz")
 set(CMAKE_C_VISIBILITY_PRESET hidden)
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
+# Support for Android 15 16KB page size
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-z,max-page-size=16384")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-z,max-page-size=16384")
+
 add_library(keys SHARED
         ../../../../keys/keys.c
         validation.c)

android/src/main/java/so/onekey/app/wallet/lite/OKLiteManager.kt

@@ -323,18 +323,20 @@ class OKLiteManager(private val context: ReactApplicationContext) :
     }
 
     @ReactMethod
-    fun getLiteInfo(callback: Callback) = launch {
-        Log.d(TAG, "getLiteInfo")
-        handleOperation(callback) { isoDep ->
-            Log.e(TAG, "getLiteInfo Obtain the device")
-            val cardInfo = OneKeyLiteCard.getCardInfo(isoDep)
-            Log.e(TAG, "getLiteInfo result $cardInfo")
-            cardInfo.createArguments()
+    fun getLiteInfo(callback: Callback) {
+        launch {
+            Log.d(TAG, "getLiteInfo")
+            handleOperation(callback) { isoDep ->
+                Log.e(TAG, "getLiteInfo Obtain the device")
+                val cardInfo = OneKeyLiteCard.getCardInfo(isoDep)
+                Log.e(TAG, "getLiteInfo result $cardInfo")
+                cardInfo.createArguments()
+            }
         }
     }
 
     @ReactMethod
-    fun setMnemonic(mnemonic: String, pwd: String, overwrite: Boolean, callback: Callback) =
+    fun setMnemonic(mnemonic: String, pwd: String, overwrite: Boolean, callback: Callback) {
         launch {
             handleOperation(callback) { isoDep ->
                 Log.e(TAG, "setMnemonic Obtain the device")
@@ -345,22 +347,27 @@ class OKLiteManager(private val context: ReactApplicationContext) :
                 true
             }
         }
+    }
 
     @ReactMethod
-    fun getMnemonicWithPin(pwd: String, callback: Callback) = launch {
-        Log.d(TAG, "getMnemonicWithPin")
-        handleOperation(callback) { isoDep ->
-            Log.e(TAG, "getMnemonicWithPin Obtain the device")
-            OneKeyLiteCard.getMnemonicWithPin(mCurrentCardState, isoDep, pwd)
+    fun getMnemonicWithPin(pwd: String, callback: Callback) {
+        launch {
+            Log.d(TAG, "getMnemonicWithPin")
+            handleOperation(callback) { isoDep ->
+                Log.e(TAG, "getMnemonicWithPin Obtain the device")
+                OneKeyLiteCard.getMnemonicWithPin(mCurrentCardState, isoDep, pwd)
+            }
         }
     }
 
     @ReactMethod
-    fun changePin(oldPwd: String, newPwd: String, callback: Callback) = launch {
-        Log.d(TAG, "changePin")
-        handleOperation(callback) { isoDep ->
-            Log.e(TAG, "changePin Obtain the device")
-            OneKeyLiteCard.changPin(mCurrentCardState, isoDep, oldPwd, newPwd)
+    fun changePin(oldPwd: String, newPwd: String, callback: Callback) {
+        launch {
+            Log.d(TAG, "changePin")
+            handleOperation(callback) { isoDep ->
+                Log.e(TAG, "changePin Obtain the device")
+                OneKeyLiteCard.changPin(mCurrentCardState, isoDep, oldPwd, newPwd)
+            }
         }
     }
 
@@ -396,22 +403,26 @@ class OKLiteManager(private val context: ReactApplicationContext) :
     }
 
     @ReactMethod
-    fun reset(callback: Callback) = launch {
-        Log.d(TAG, "reset")
-        handleOperation(callback) { isoDep ->
-            Log.e(TAG, "reset Obtain the device")
-            val isSuccess = OneKeyLiteCard.reset(isoDep)
-            if (!isSuccess) throw NFCExceptions.ExecFailureException()
-            Log.e(TAG, "reset result success")
-            true
+    fun reset(callback: Callback) {
+        launch {
+            Log.d(TAG, "reset")
+            handleOperation(callback) { isoDep ->
+                Log.e(TAG, "reset Obtain the device")
+                val isSuccess = OneKeyLiteCard.reset(isoDep)
+                if (!isSuccess) throw NFCExceptions.ExecFailureException()
+                Log.e(TAG, "reset result success")
+                true
+            }
         }
     }
 
     @ReactMethod
-    fun intoSetting() = launch {
-        Log.d(TAG, "intoSetting")
-        Utils.getTopActivity()?.let {
-            NfcUtils.intentToNfcSetting(it)
+    fun intoSetting() {
+        launch {
+            Log.d(TAG, "intoSetting")
+            Utils.getTopActivity()?.let {
+                NfcUtils.intentToNfcSetting(it)
+            }
         }
     }
 }

android/src/main/java/so/onekey/app/wallet/lite/onekeyLite/OnekeyLiteCard.kt

@@ -39,7 +39,7 @@ object OneKeyLiteCard {
 
             NfcPermissionUtils.checkPermission(activity) {
                 printLog(TAG, "startNfc Have permission")
-                if (!activity.getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) {
+                if (!activity.lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)) {
                     return@checkPermission
                 }
 

android/src/main/jniLibs/arm64-v8a/libgpchannelNDK.so

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-lite-card",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "lite card",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",