react-native-spike-sdk 2.2.4 → 2.2.5

package/android/build.gradle

@@ -76,7 +76,7 @@ dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-android:0.71.3"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation 'com.spikeapi.sdk:spike-sdk:3.0.6'
+  implementation 'com.spikeapi.sdk:spike-sdk:3.0.8'
   implementation 'androidx.core:core-ktx:1.9.0'
   implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
   implementation 'com.google.code.gson:gson:2.10.1'

package/android/src/main/java/com/spikesdk/SpikeSdkModule.kt

@@ -1,19 +1,11 @@
 package com.spikesdk
 
 import android.os.Build
-import android.os.Environment
-import android.os.Environment.DIRECTORY_DOWNLOADS
 import androidx.activity.ComponentActivity
 import androidx.activity.result.ActivityResultCallback
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContract
-import com.facebook.react.bridge.Promise
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReactContext
-import com.facebook.react.bridge.ReactContextBaseJavaModule
-import com.facebook.react.bridge.ReactMethod
-import com.facebook.react.bridge.WritableMap
-import com.facebook.react.bridge.WritableNativeMap
+import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.google.gson.GsonBuilder
 import com.spikeapi.SpikeConnection
@@ -24,8 +16,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
-import java.io.File
-import java.io.IOException
 import java.time.OffsetDateTime
 import java.util.UUID
 
@@ -38,7 +28,7 @@ fun <I, O> ComponentActivity.registerActivityResultLauncher(
 }
 
 class SpikeSdkModule(reactContext: ReactApplicationContext) :
-    ReactContextBaseJavaModule(reactContext) {
+    ReactContextBaseJavaModule(reactContext), LifecycleEventListener {
 
     private val connections = mutableMapOf<String, SpikeConnection>()
 
@@ -50,11 +40,16 @@ class SpikeSdkModule(reactContext: ReactApplicationContext) :
             OffsetDateTime::class.java,
             OffsetDateTimeSerializer()
         ).create()
+    private var checkPermissionsFor: Triple<String, String, Promise>? = null
 
     override fun getName(): String {
         return NAME
     }
 
+    init {
+        reactContext.addLifecycleEventListener(this)
+    }
+
     @ReactMethod
     fun isPackageInstalled(
         promise: Promise
@@ -199,7 +194,6 @@ class SpikeSdkModule(reactContext: ReactApplicationContext) :
                         "Connection not found"
                     ).mapException(), "Connection not found"
                 )
-                connection.readGrantedPermissions()
                 val result = connection.extractData(
                     dataType = dataType.toSpikeDataType(),
                     from = fromDateMillis.toLong().millisToOffsetDataTime(),
@@ -227,7 +221,6 @@ class SpikeSdkModule(reactContext: ReactApplicationContext) :
                         "Connection not found"
                     ).mapException(), "Connection not found"
                 )
-                connection.readGrantedPermissions()
                 val result = connection.extractAndPostData(
                     dataType = dataType.toSpikeDataType(),
                     from = fromDateMillis.toLong().millisToOffsetDataTime(),
@@ -253,7 +246,6 @@ class SpikeSdkModule(reactContext: ReactApplicationContext) :
                         "Connection not found"
                     ).mapException(), "Connection not found"
                 )
-                connection.readGrantedPermissions()
                 val result = connection.extractData(
                     dataType = dataType.toSpikeDataType()
                 )
@@ -277,7 +269,6 @@ class SpikeSdkModule(reactContext: ReactApplicationContext) :
                         "Connection not found"
                     ).mapException(), "Connection not found"
                 )
-                connection.readGrantedPermissions()
                 val result = connection.extractAndPostData(
                     dataType = dataType.toSpikeDataType()
                 )
@@ -317,7 +308,6 @@ class SpikeSdkModule(reactContext: ReactApplicationContext) :
                 )
                 val permissionsGranted: Boolean =
                     connection.hasHealthPermissionsGranted(requiredPermissions)
-                connection.readGrantedPermissions()
                 promise.resolve(permissionsGranted)
             } catch (e: SpikeExceptions) {
                 promise.reject(e.mapException(), e.message)
@@ -358,7 +348,6 @@ class SpikeSdkModule(reactContext: ReactApplicationContext) :
             }
         }
     }
-
     @ReactMethod
     fun requestHealthPermissions(connectionUUID: String, dataType: String, promise: Promise) {
         val connection = connections[connectionUUID] ?: return promise.reject(
@@ -371,7 +360,7 @@ class SpikeSdkModule(reactContext: ReactApplicationContext) :
             connection.getRequiredHealthPermissionsMetadata(dataType.toSpikeDataType())
 
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.TIRAMISU) {
-             val intent = connection.requestReadAuthorization().createIntent(
+             val intent = SpikeConnection.requestReadAuthorization().createIntent(
                  reactApplicationContext, permissions
              )
 
@@ -383,15 +372,15 @@ class SpikeSdkModule(reactContext: ReactApplicationContext) :
         } else {
             val activity = reactApplicationContext.currentActivity
             if (activity is ComponentActivity) {
+                checkPermissionsFor = Triple(connectionUUID, dataType, promise)
                 val launcher =
                     activity.registerActivityResultLauncher(
-                        connection.requestReadAuthorization()
+                        SpikeConnection.requestReadAuthorization()
                     ) {
-                        checkPermissionsGranted(connectionUUID, dataType, promise)
+
                     }
 
                 launcher.launch(permissions)
-                promise.resolve(true)
             } else {
                 promise.resolve(false)
             }
@@ -432,10 +421,24 @@ class SpikeSdkModule(reactContext: ReactApplicationContext) :
             .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
             .emit(eventName, params)
     }
+    override fun onHostResume() {
+        checkPermissionsFor?.let {
+            checkPermissionsGranted(
+                it.first,
+                it.second,
+                it.third
+            )
+        }
+        checkPermissionsFor = null
+    }
+
+    override fun onHostPause() {
+    }
 
+    override fun onHostDestroy() {
+    }
     companion object {
         const val NAME = "SpikeSdk"
         const val REQUEST_CODE = 4200
     }
-
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-spike-sdk",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "description": "Spike API for health and productivity data from wearables and IoT devices",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/react-native-spike-sdk.podspec

@@ -5,7 +5,7 @@ folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1
 
 Pod::Spec.new do |s|
   s.name         = "react-native-spike-sdk"
-  s.version      = "2.2.4"
+  s.version      = "2.2.5"
   s.summary      = "Spike API for health and productivity data from wearables and IoT devices"
 
   s.description  = <<-DESC