react-native-spike-sdk 2.3.1 → 2.3.3

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.11'
+  implementation 'com.spikeapi.sdk:spike-sdk:3.0.15'
   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

@@ -12,6 +12,7 @@ import com.spikeapi.SpikeConnection
 import com.spikeapi.SpikeExceptions
 import com.spikeapi.SpikeLogger
 import com.spikeapi.SpikePackageChecker
+import com.spikeapi.healthconnect.HealthConnectAvailability
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -365,11 +366,16 @@ class SpikeSdkModule(reactContext: ReactApplicationContext) :
                  reactApplicationContext, permissions
              )
 
-             reactApplicationContext.currentActivity?.startActivityForResult(
-                 intent,
-                 REQUEST_CODE
-             )
-            promise.resolve(true)
+            val availability = connection.getHealthConnectAvailability()
+            if (availability == HealthConnectAvailability.INSTALLED) {
+                reactApplicationContext.currentActivity?.startActivityForResult(
+                    intent,
+                    REQUEST_CODE
+                )
+                promise.resolve(true)
+            } else {
+                promise.reject(SpikeExceptions.SpikeException().mapException(), SpikeExceptions.SpikeException().message)
+            }
         } else {
             val activity = reactApplicationContext.currentActivity
             if (activity is ComponentActivity) {
@@ -381,7 +387,11 @@ class SpikeSdkModule(reactContext: ReactApplicationContext) :
 
                     }
 
-                launcher.launch(permissions)
+                if (permissions.isNotEmpty()) {
+                    launcher.launch(permissions)
+                } else {
+                    promise.resolve(false)
+                }
             } else {
                 promise.resolve(false)
             }
@@ -404,15 +414,20 @@ class SpikeSdkModule(reactContext: ReactApplicationContext) :
         }
 
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.TIRAMISU) {
-            val intent = SpikeConnection.requestReadAuthorization().createIntent(
-                reactApplicationContext, permissions
-            )
+            val availability = connection.getHealthConnectAvailability()
+            if (permissions.isNotEmpty() && availability == HealthConnectAvailability.INSTALLED) {
+                val intent = SpikeConnection.requestReadAuthorization().createIntent(
+                    reactApplicationContext, permissions
+                )
 
-            reactApplicationContext.currentActivity?.startActivityForResult(
-                intent,
-                REQUEST_CODE
-            )
-            promise.resolve(true)
+                reactApplicationContext.currentActivity?.startActivityForResult(
+                    intent,
+                    REQUEST_CODE
+                )
+                promise.resolve(true)
+            } else {
+                promise.reject(SpikeExceptions.SpikeException().mapException(), SpikeExceptions.SpikeException().message)
+            }
         } else {
             val activity = reactApplicationContext.currentActivity
             if (activity is ComponentActivity) {
@@ -423,8 +438,10 @@ class SpikeSdkModule(reactContext: ReactApplicationContext) :
                     ) {
 
                     }
-
-                launcher.launch(permissions)
+                if (permissions.isNotEmpty()) {
+                    launcher.launch(permissions)
+                } else {
+                    promise.reject(SpikeExceptions.SpikeException().mapException(), SpikeExceptions.SpikeException().message)            }
             } else {
                 promise.resolve(false)
             }

package/lib/typescript/DataModels/SpikeStepsIntradayDataEntry.d.ts

@@ -11,6 +11,7 @@ type IntradayData = {
     timeEnd: string;
     value: number;
     source?: string;
+    metadata?: Record<string, string>;
 };
 export {};
 //# sourceMappingURL=SpikeStepsIntradayDataEntry.d.ts.map

package/lib/typescript/DataModels/SpikeStepsIntradayDataEntry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SpikeStepsIntradayDataEntry.d.ts","sourceRoot":"","sources":["../../../src/DataModels/SpikeStepsIntradayDataEntry.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,YAAY,EAAE,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,KAAK,YAAY,GAAG;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC"}
+{"version":3,"file":"SpikeStepsIntradayDataEntry.d.ts","sourceRoot":"","sources":["../../../src/DataModels/SpikeStepsIntradayDataEntry.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,YAAY,EAAE,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,KAAK,YAAY,GAAG;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnC,CAAC"}

package/lib/typescript/DataTypes/SpikeDataType.d.ts

@@ -9,7 +9,7 @@ import type { SpikeOxygenSaturationDataEntry } from '../DataModels/SpikeOxygenSa
 import type { SpikeSleepDataEntry } from '../DataModels/SpikeSleepDataEntry';
 import type { SpikeStepsDataEntry } from '../DataModels/SpikeStepsDataEntry';
 import type { SpikeBodyDataEntry } from '../DataModels/SpikeBodyDataEntry';
-import type { SpikeStepsIntradayDataEntry } from 'src/DataModels/SpikeStepsIntradayDataEntry';
+import type { SpikeStepsIntradayDataEntry } from '../DataModels/SpikeStepsIntradayDataEntry';
 type SpikeDataTypeValues = 'activities_summary' | 'activities_stream' | 'breathing' | 'calories' | 'distance' | 'glucose' | 'heart' | 'oxygen_saturation' | 'sleep' | 'steps' | 'steps_intraday' | 'body';
 export declare class SpikeActivitiesStreamDataType {
     rawValue: SpikeDataTypeValues;

package/lib/typescript/DataTypes/SpikeDataType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SpikeDataType.d.ts","sourceRoot":"","sources":["../../../src/DataTypes/SpikeDataType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,8CAA8C,CAAC;AACnG,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,+CAA+C,CAAC;AACrG,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AACrF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AACnF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AACnF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AACjF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,8CAA8C,CAAC;AACnG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,4CAA4C,CAAC;AAE9F,KAAK,mBAAmB,GACpB,oBAAoB,GACpB,mBAAmB,GACnB,WAAW,GACX,UAAU,GACV,UAAU,GACV,SAAS,GACT,OAAO,GACP,mBAAmB,GACnB,OAAO,GACP,OAAO,GACP,gBAAgB,GAChB,MAAM,CAAC;AACX,qBAAa,6BAA6B;IACxC,QAAQ,EAAE,mBAAmB,CAAuB;IACpD,SAAS,CAAC,EAAE,8BAA8B,CAAC;CAC5C;AAED,qBAAa,8BAA8B;IACzC,QAAQ,EAAE,mBAAmB,CAAwB;IACrD,SAAS,CAAC,EAAE,+BAA+B,CAAC;CAC7C;AAED,qBAAa,sBAAsB;IACjC,QAAQ,EAAE,mBAAmB,CAAe;IAC5C,SAAS,CAAC,EAAE,uBAAuB,CAAC;CACrC;AAED,qBAAa,qBAAqB;IAChC,QAAQ,EAAE,mBAAmB,CAAc;IAC3C,SAAS,CAAC,EAAE,sBAAsB,CAAC;CACpC;AAED,qBAAa,qBAAqB;IAChC,QAAQ,EAAE,mBAAmB,CAAc;IAC3C,SAAS,CAAC,EAAE,sBAAsB,CAAC;CACpC;AAED,qBAAa,oBAAoB;IAC/B,QAAQ,EAAE,mBAAmB,CAAa;IAC1C,SAAS,CAAC,EAAE,qBAAqB,CAAC;CACnC;AAED,qBAAa,kBAAkB;IAC7B,QAAQ,EAAE,mBAAmB,CAAW;IACxC,SAAS,CAAC,EAAE,mBAAmB,CAAC;CACjC;AAED,qBAAa,6BAA6B;IACxC,QAAQ,EAAE,mBAAmB,CAAuB;IACpD,SAAS,CAAC,EAAE,8BAA8B,CAAC;CAC5C;AAED,qBAAa,kBAAkB;IAC7B,QAAQ,EAAE,mBAAmB,CAAW;IACxC,SAAS,CAAC,EAAE,mBAAmB,CAAC;CACjC;AAED,qBAAa,kBAAkB;IAC7B,QAAQ,EAAE,mBAAmB,CAAW;IACxC,SAAS,CAAC,EAAE,mBAAmB,CAAC;CACjC;AAED,qBAAa,0BAA0B;IACrC,QAAQ,EAAE,mBAAmB,CAAoB;IACjD,SAAS,CAAC,EAAE,2BAA2B,CAAC;CACzC;AAED,qBAAa,iBAAiB;IAC5B,QAAQ,EAAE,mBAAmB,CAAU;IACvC,SAAS,CAAC,EAAE,kBAAkB,CAAC;CAChC"}
+{"version":3,"file":"SpikeDataType.d.ts","sourceRoot":"","sources":["../../../src/DataTypes/SpikeDataType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,8CAA8C,CAAC;AACnG,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,+CAA+C,CAAC;AACrG,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AACrF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AACnF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AACnF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AACjF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,8CAA8C,CAAC;AACnG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,2CAA2C,CAAC;AAE7F,KAAK,mBAAmB,GACpB,oBAAoB,GACpB,mBAAmB,GACnB,WAAW,GACX,UAAU,GACV,UAAU,GACV,SAAS,GACT,OAAO,GACP,mBAAmB,GACnB,OAAO,GACP,OAAO,GACP,gBAAgB,GAChB,MAAM,CAAC;AACX,qBAAa,6BAA6B;IACxC,QAAQ,EAAE,mBAAmB,CAAuB;IACpD,SAAS,CAAC,EAAE,8BAA8B,CAAC;CAC5C;AAED,qBAAa,8BAA8B;IACzC,QAAQ,EAAE,mBAAmB,CAAwB;IACrD,SAAS,CAAC,EAAE,+BAA+B,CAAC;CAC7C;AAED,qBAAa,sBAAsB;IACjC,QAAQ,EAAE,mBAAmB,CAAe;IAC5C,SAAS,CAAC,EAAE,uBAAuB,CAAC;CACrC;AAED,qBAAa,qBAAqB;IAChC,QAAQ,EAAE,mBAAmB,CAAc;IAC3C,SAAS,CAAC,EAAE,sBAAsB,CAAC;CACpC;AAED,qBAAa,qBAAqB;IAChC,QAAQ,EAAE,mBAAmB,CAAc;IAC3C,SAAS,CAAC,EAAE,sBAAsB,CAAC;CACpC;AAED,qBAAa,oBAAoB;IAC/B,QAAQ,EAAE,mBAAmB,CAAa;IAC1C,SAAS,CAAC,EAAE,qBAAqB,CAAC;CACnC;AAED,qBAAa,kBAAkB;IAC7B,QAAQ,EAAE,mBAAmB,CAAW;IACxC,SAAS,CAAC,EAAE,mBAAmB,CAAC;CACjC;AAED,qBAAa,6BAA6B;IACxC,QAAQ,EAAE,mBAAmB,CAAuB;IACpD,SAAS,CAAC,EAAE,8BAA8B,CAAC;CAC5C;AAED,qBAAa,kBAAkB;IAC7B,QAAQ,EAAE,mBAAmB,CAAW;IACxC,SAAS,CAAC,EAAE,mBAAmB,CAAC;CACjC;AAED,qBAAa,kBAAkB;IAC7B,QAAQ,EAAE,mBAAmB,CAAW;IACxC,SAAS,CAAC,EAAE,mBAAmB,CAAC;CACjC;AAED,qBAAa,0BAA0B;IACrC,QAAQ,EAAE,mBAAmB,CAAoB;IACjD,SAAS,CAAC,EAAE,2BAA2B,CAAC;CACzC;AAED,qBAAa,iBAAiB;IAC5B,QAAQ,EAAE,mBAAmB,CAAU;IACvC,SAAS,CAAC,EAAE,kBAAkB,CAAC;CAChC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-spike-sdk",
-  "version": "2.3.1",
+  "version": "2.3.3",
   "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.3.1"
+  s.version      = "2.3.3"
   s.summary      = "Spike API for health and productivity data from wearables and IoT devices"
 
   s.description  = <<-DESC
@@ -25,7 +25,7 @@ Pod::Spec.new do |s|
   s.swift_version = "5"
 
   s.dependency "React-Core"
-  s.dependency "SpikeSDK", "~> 2.2.0"
+  s.dependency "SpikeSDK", "~> 2.2.1"
 
   # Don't install the dependencies when we run `pod install` in the old architecture.
   if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then

package/src/DataModels/SpikeStepsIntradayDataEntry.ts

@@ -12,4 +12,5 @@ type IntradayData = {
   timeEnd: string;
   value: number;
   source?: string;
+  metadata?: Record<string, string>;
 };

package/src/DataTypes/SpikeDataType.ts

@@ -9,7 +9,7 @@ import type { SpikeOxygenSaturationDataEntry } from '../DataModels/SpikeOxygenSa
 import type { SpikeSleepDataEntry } from '../DataModels/SpikeSleepDataEntry';
 import type { SpikeStepsDataEntry } from '../DataModels/SpikeStepsDataEntry';
 import type { SpikeBodyDataEntry } from '../DataModels/SpikeBodyDataEntry';
-import type { SpikeStepsIntradayDataEntry } from 'src/DataModels/SpikeStepsIntradayDataEntry';
+import type { SpikeStepsIntradayDataEntry } from '../DataModels/SpikeStepsIntradayDataEntry';
 
 type SpikeDataTypeValues =
   | 'activities_summary'