Merge pull request #34 from BIDMCDigitalPsychiatry/google_health_conn…

…ect_changes Android- Updating Google Fit API to HealthConnect API #790
BIDMCDigitalPsychiatry · Jan 12, 2024 · 6c0d969 · 6c0d969
2 parents 8b0c548 + 5d8464d
commit 6c0d969
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -24,11 +24,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
 }
 

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.3"
+        classpath "com.android.tools.build:gradle:7.4.2"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Fri Jan 12 18:46:41 IST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/lamp_kotlin/build.gradle b/lamp_kotlin/build.gradle
@@ -27,11 +27,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
 }
 

diff --git a/lamp_kotlin/src/main/java/digital/lamp/lamp_kotlin/lamp_core/models/DimensionData.kt b/lamp_kotlin/src/main/java/digital/lamp/lamp_kotlin/lamp_core/models/DimensionData.kt
@@ -125,7 +125,7 @@ data class NutritionData(
         @field:[SerializeNulls] var source: Any?,
 )
 @JsonClass(generateAdapter = true)
-data class GoogleFitData(
+data class GoogleHealthConnectData(
         val unit: String?,
         val value: Any?,
         @field:[SerializeNulls] var source: Any?,

diff --git a/lamp_kotlin/src/main/java/digital/lamp/lamp_kotlin/sensor_core/ActivityTransitions.kt b/lamp_kotlin/src/main/java/digital/lamp/lamp_kotlin/sensor_core/ActivityTransitions.kt
@@ -105,7 +105,7 @@ class ActivityTransitions : Service(), SensorEventListener {
         Log.e(Companion.TAG, "Started Activity Transitions")
 
         //Register the BroadcastReceiver to listen for activity transitions.
-        registerReceiver(mTransitionsReceiver, IntentFilter(actions))
+        registerReceiver(mTransitionsReceiver, IntentFilter(actions), RECEIVER_EXPORTED)
         enableActivityTransitions()
         return START_REDELIVER_INTENT
     }