@onekeyfe/react-native-lite-card 1.0.11 → 1.0.13

package/LICENSE.md

@@ -0,0 +1,51 @@
+# ONEKEY STANDARD SOURCE LICENSE (O-SSL)
+
+This license governs use of the accompanying software. If you use the software,
+you accept this license. If you do not accept the license, do not use the
+software.
+
+## 1. Definitions
+
+The terms "reproduce," "reproduction" and "distribution" have the same meaning
+here as under Hong Kong copyright law.
+
+"You" means the licensee of the software.
+
+"Your company" means the company you worked for when you downloaded the
+software.
+
+"Reference use" means use of the software within your company as a reference,
+in read only form, for the sole purposes of debugging your products,
+maintaining your products, or enhancing the interoperability of your products
+with the software, and specifically excludes the right to distribute the
+software outside of your company.
+
+"Licensed patents" means any Licensor patent claims which read directly on the
+software as distributed by the Licensor under this license.
+
+## 2. Grant of Rights
+
+(A) Copyright Grant - Subject to the terms of this license, the Licensor grants
+you a non-transferable, non-exclusive, worldwide, royalty-free copyright
+license to reproduce the software for reference use.
+
+(B) Patent Grant - Subject to the terms of this license, the Licensor grants
+you a non-transferable, non-exclusive, worldwide, royalty-free patent license
+under licensed patents for reference use.
+
+## 3. Limitations
+
+(A) No Trademark License - This license does not grant you any rights to use
+the Licensor's name, logo, or trademarks.
+
+(B) If you begin patent litigation against the Licensor over patents that you
+think may apply to the software (including a cross-claim or counterclaim in
+a lawsuit), your license to the software ends automatically.
+
+(C) The software is licensed "as-is." You bear the risk of using it. The
+Licensor gives no express warranties, guarantees or conditions. You may have
+additional consumer rights under your local laws which this license cannot
+change. To the extent permitted under your local laws, the Licensor excludes
+the implied warranties of merchantability, fitness for a particular purpose and
+non-infringement.This license agreement is governed by the laws of Hong Kong, 
+and any disputes related to this license agreement shall be resolved in accordance with Hong Kong law.

package/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"
   }

package/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

package/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)

package/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)
+            }
         }
     }
 }

package/android/src/main/java/so/onekey/app/wallet/lite/nfc/NfcUtils.kt

@@ -101,15 +101,6 @@ object NfcUtils {
      * @return `true` 跳转成功 <br></br> `false` 跳转失败
      */
     fun intentToNfcSetting(context: Context): Boolean {
-        if ("Smartisan".equals(Build.MANUFACTURER, true)) {
-            if (intentToNfcShare(context)) {
-                return true
-            }
-        }
-        if ("xiaomi".equals(Build.MANUFACTURER, true)) {
-            MiUtil.intentToAppSetting(context)
-            return true
-        }
         if (isNfcExits(context)) {
             return toIntent(context, Settings.ACTION_NFC_SETTINGS)
         }

package/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
                 }
 

package/package.json

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

package/LICENSE

@@ -1,20 +0,0 @@
-MIT License
-
-Copyright (c) 2023 OneKeyHQ
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.