fix!: removed broken nfc code (#61)

evva-sfw · Oct 22, 2024 · 0e3ee40 · 0e3ee40
2 parents 27d4cc7 + 82e3d6d
commit 0e3ee40
Show file tree

Hide file tree

Showing 18 changed files with 322 additions and 688 deletions.
diff --git a/abrevva-react-native.podspec b/abrevva-react-native.podspec
@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
 
   s.dependency "CocoaMQTT"
   s.dependency "CryptoSwift"
-  s.dependency "AbrevvaSDK", '~> 1.0.23'
+  s.dependency "AbrevvaSDK", '1.0.31'
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.

diff --git a/android/build.gradle b/android/build.gradle
@@ -91,7 +91,7 @@ repositories {
 def kotlin_version = getExtOrDefault("kotlinVersion")
 
 dependencies {
-    implementation group: "com.evva.xesar", name: "abrevva-sdk-android", version: "1.0.19"
+    implementation group: "com.evva.xesar", name: "abrevva-sdk-android", version: "1.0.21"
 
     implementation "com.facebook.react:react-native:0.20.1"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.evva.xesar.abrevva.reactnative">
 
-    <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

diff --git a/android/src/main/java/com/evva/xesar/abrevva/reactnative/AbrevvaBleModule.kt b/android/src/main/java/com/evva/xesar/abrevva/reactnative/AbrevvaBleModule.kt
@@ -10,7 +10,6 @@ import androidx.annotation.RequiresPermission
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import com.evva.xesar.abrevva.ble.BleManager
-import com.evva.xesar.abrevva.nfc.toHexString
 import com.evva.xesar.abrevva.util.bytesToString
 import com.evva.xesar.abrevva.util.stringToBytes
 import com.facebook.react.bridge.Arguments
@@ -448,12 +447,10 @@ class AbrevvaBleModule(reactContext: ReactApplicationContext) :
         if (scanRecordBytes != null) {
             try {
                 // Extract EVVA manufacturer-id
-                val arr = byteArrayOf(0x01)
-                arr.toHexString()
-                val keyHex = byteArrayOf(scanRecordBytes.getByte(6)!!).toHexString() + byteArrayOf(
+                val keyHex = byteArrayOf(scanRecordBytes.getByte(6)!!) + byteArrayOf(
                     scanRecordBytes.getByte(5)!!
-                ).toHexString()
-                val keyDec = keyHex.toInt(16)
+                )
+                val keyDec = bytesToString(keyHex).replace(" ", "").toInt(16)
 
                 // Slice out manufacturer data
                 val bytes = scanRecordBytes.copyOfRange(7, scanRecordBytes.size)

diff --git a/android/src/main/java/com/evva/xesar/abrevva/reactnative/AbrevvaNfcModule.kt b/android/src/main/java/com/evva/xesar/abrevva/reactnative/AbrevvaNfcModule.kt
diff --git a/android/src/main/java/com/evva/xesar/abrevva/reactnative/ExampleAppPackage.kt b/android/src/main/java/com/evva/xesar/abrevva/reactnative/ExampleAppPackage.kt
@@ -7,7 +7,7 @@ import com.facebook.react.uimanager.ViewManager
 
 class ExampleAppPackage : ReactPackage {
     override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-        return listOf(AbrevvaCryptoModule(reactContext)) + listOf(AbrevvaNfcModule(reactContext)) + listOf(
+        return listOf(AbrevvaCryptoModule(reactContext)) + listOf(
             AbrevvaBleModule(reactContext)
         )
     }

diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-permission android:name="android.permission.NFC"/>
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application