Alpha6 updates and Mapping Fixes

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [2.2.0]
+* Upgrade Health Connect API to `1.1.0-alpha6`
+* Add type filtering for getRecords
+* Modify requestPermissions and hasPermissions to allow for read and write only permissions
+* Fixed various mapping issues
+* Add revokeAllPermissions method
+* Updated README.md
 ## [2.0.0]
 * Added missing data types
 * Added Models for each data type

README.md

@@ -98,18 +98,79 @@ To create the declaration, add to regular permissions any of.
 <uses-permission android:name="android.permission.health.READ_WHEELCHAIR_PUSHES"/>
 <uses-permission android:name="android.permission.health.WRITE_WHEELCHAIR_PUSHES"/>
 ```
-Inside your MainActivity declaration add a reference to `health_permissions` and an intent filter for the Health Connect permissions action
+Below your MainActivity declaration, add the following intent filters for when the user clicks the privacy policy link:
 ```
-<activity android:name=".MainActivity">
-    <meta-data android:name="health_permissions" android:resource="@array/health_permissions" />
+        <!-- For supported versions through Android 13, create an activity to show the rationale
+     of Health Connect permissions once users click the privacy policy link. -->
+        <activity
+            android:name=".PermissionsRationaleActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="androidx.health.ACTION_SHOW_PERMISSIONS_RATIONALE"/>
+            </intent-filter>
+        </activity>
 
-    <intent-filter>
-        <action android:name="androidx.health.ACTION_SHOW_PERMISSIONS_RATIONALE" />
-    </intent-filter>
-</activity>
+        <!-- For versions starting Android 14, create an activity alias to show the rationale
+             of Health Connect permissions once users click the privacy policy link. -->
+        <activity-alias
+            android:name="AndroidURationaleActivity"
+            android:exported="true"
+            android:targetActivity=".PermissionsRationaleActivity"
+            android:permission="android.permission.START_VIEW_PERMISSION_USAGE">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW_PERMISSION_USAGE" />
+                <category android:name="android.intent.category.HEALTH_PERMISSIONS" />
+            </intent-filter>
+        </activity-alias>
 ```
 
-Health connect developer toolbox: http://goo.gle/health-connect-toolbox
+You will then need to create the PermissionsRationaleActivity class to open privacy policy link.
+
+Kotlin:
+```
+package [your_package_name]
+
+import android.app.Activity
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+
+class PermissionsRationaleActivity : Activity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("[your_privacy_policy_url]")))
+    }
+}
+```
+
+Java:
+```
+package [your_package_name];
+
+import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+
+public class PermissionsRationaleActivity extends Activity {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("[your_privacy_policy_url]")));
+    }
+}
+```
+
+Note: For your app to work on Android 14 you will need to ensure your MainActivity class extends `FlutterFragmentActivity` instead of `FlutterActivity`
+
+If you are using ProGuard, you will need to add the following to your proguard-rules file:
+```
+-keep public class androidx.health.** { *; }
+-dontwarn androidx.health.**
+```
+
+Health Connect developer toolbox: http://goo.gle/health-connect-toolbox
+
 
 ## Usage
 ```dart
@@ -167,7 +228,6 @@ class _MyAppState extends State<MyApp> {
   //   HealthConnectDataType.RestingHeartRate,
   //   HealthConnectDataType.SexualActivity,
   //   HealthConnectDataType.SleepSession,
-  //   HealthConnectDataType.SleepStage,
   //   HealthConnectDataType.Speed,
   //   HealthConnectDataType.StepsCadence,
   //   HealthConnectDataType.Steps,
@@ -180,12 +240,21 @@ class _MyAppState extends State<MyApp> {
   List<HealthConnectDataType> types = [
     HealthConnectDataType.Steps,
     HealthConnectDataType.ExerciseSession,
+    HealthConnectDataType.TotalCaloriesBurned,
     // HealthConnectDataType.HeartRate,
     // HealthConnectDataType.SleepSession,
     // HealthConnectDataType.OxygenSaturation,
     // HealthConnectDataType.RespiratoryRate,
   ];
 
+  List<HealthConnectDataType> readOnlyTypes = [
+    HealthConnectDataType.Height,
+  ];
+
+  List<HealthConnectDataType> writeOnlyTypes = [
+    HealthConnectDataType.Weight,
+  ];
+
   bool readOnly = true;
   String resultText = '';
 
@@ -245,7 +314,8 @@ class _MyAppState extends State<MyApp> {
               onPressed: () async {
                 var result = await HealthConnectFactory.hasPermissions(
                   types,
-                  readOnly: readOnly,
+                  readOnlyTypes: readOnlyTypes,
+                  writeOnlyTypes: writeOnlyTypes,
                 );
                 resultText = 'hasPermissions: $result';
                 _updateResultText();
@@ -281,7 +351,8 @@ class _MyAppState extends State<MyApp> {
                 try {
                   var result = await HealthConnectFactory.requestPermissions(
                     types,
-                    //readOnly: readOnly,
+                    readOnlyTypes: readOnlyTypes,
+                    writeOnlyTypes: writeOnlyTypes,
                   );
                   resultText = 'requestPermissions: $result';
                 } catch (e) {
@@ -291,6 +362,20 @@ class _MyAppState extends State<MyApp> {
               },
               child: const Text('Request Permissions'),
             ),
+            ElevatedButton(
+              onPressed: () async {
+                try {
+                  // This will only apply after the app has been fully closed.
+                  var result =
+                  await HealthConnectFactory.revokeAllPermissions();
+                  resultText = 'revokeAllPermissions: $result';
+                } catch (e) {
+                  resultText = e.toString();
+                }
+                _updateResultText();
+              },
+              child: const Text('Revoke All Permissions'),
+            ),
             ElevatedButton(
               onPressed: () async {
                 var startTime =
@@ -299,7 +384,11 @@ class _MyAppState extends State<MyApp> {
                 try {
                   final requests = <Future>[];
                   Map<String, dynamic> typePoints = {};
-                  for (var type in types) {
+                  List<HealthConnectDataType> readTypes = [
+                    ...types,
+                    ...readOnlyTypes
+                  ];
+                  for (var type in readTypes) {
                     requests.add(HealthConnectFactory.getRecords(
                       type: type,
                       startTime: startTime,
@@ -331,6 +420,16 @@ class _MyAppState extends State<MyApp> {
                   endTime: endTime,
                   exerciseType: ExerciseType.walking,
                 );
+                TotalCaloriesBurnedRecord totalCaloriesBurned =
+                TotalCaloriesBurnedRecord(
+                  startTime: startTime,
+                  endTime: endTime,
+                  energy: const Energy.kilocalories(5),
+                );
+                WeightRecord weightRecord = WeightRecord(
+                  time: startTime,
+                  weight: const Mass.kilograms(60),
+                );
                 try {
                   final requests = <Future>[];
                   Map<String, dynamic> typePoints = {};
@@ -339,14 +438,25 @@ class _MyAppState extends State<MyApp> {
                     data: [stepsRecord],
                   ).then((value) => typePoints.addAll(
                       {HealthConnectDataType.Steps.name: stepsRecord})));
-
                   requests.add(HealthConnectFactory.writeData(
                     type: HealthConnectDataType.ExerciseSession,
                     data: [exerciseSessionRecord],
                   ).then((value) => typePoints.addAll({
                     HealthConnectDataType.ExerciseSession.name:
                     exerciseSessionRecord
                   })));
+                  requests.add(HealthConnectFactory.writeData(
+                    type: HealthConnectDataType.TotalCaloriesBurned,
+                    data: [totalCaloriesBurned],
+                  ).then((value) => typePoints.addAll({
+                    HealthConnectDataType.TotalCaloriesBurned.name:
+                    totalCaloriesBurned
+                  })));
+                  requests.add(HealthConnectFactory.writeData(
+                    type: HealthConnectDataType.Weight,
+                    data: [weightRecord],
+                  ).then((value) => typePoints.addAll(
+                      {HealthConnectDataType.Weight.name: weightRecord})));
                   await Future.wait(requests);
                   resultText = '$typePoints';
                 } catch (e, s) {

android/build.gradle

@@ -2,7 +2,7 @@ group 'dev.duynp.flutter_health_connect'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.8.22'
+    ext.kotlin_version = '1.9.10'
     repositories {
         google()
         mavenCentral()
@@ -25,7 +25,9 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 34
+    compileSdk 34
+
+    namespace = "dev.duynp.flutter_health_connect"
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -47,7 +49,8 @@ android {
 
 dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1'
-    implementation "androidx.health.connect:connect-client:1.1.0-alpha02"
+    implementation "androidx.health.connect:connect-client:1.1.0-alpha06"
+    implementation "androidx.fragment:fragment-ktx:1.6.2"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.0'
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.0'

android/src/main/kotlin/dev/duynp/flutter_health_connect/Consts.kt

@@ -34,7 +34,6 @@ const val RESPIRATORY_RATE = "RespiratoryRate"
 const val RESTING_HEART_RATE = "RestingHeartRate"
 const val SEXUAL_ACTIVITY = "SexualActivity"
 const val SLEEP_SESSION = "SleepSession"
-const val SLEEP_STAGE = "SleepStage"
 const val SPEED = "Speed"
 const val STEPS_CADENCE = "StepsCadence"
 const val STEPS = "Steps"
@@ -75,7 +74,6 @@ val HealthConnectRecordTypeMap = hashMapOf(
     RESTING_HEART_RATE to RestingHeartRateRecord::class,
     SEXUAL_ACTIVITY to SexualActivityRecord::class,
     SLEEP_SESSION to SleepSessionRecord::class,
-    SLEEP_STAGE to SleepStageRecord::class,
     SPEED to SpeedRecord::class,
     STEPS_CADENCE to StepsCadenceRecord::class,
     STEPS to StepsRecord::class,
@@ -85,24 +83,37 @@ val HealthConnectRecordTypeMap = hashMapOf(
     WHEELCHAIR_PUSHES to WheelchairPushesRecord::class,
 )
 const val HEALTH_CONNECT_RESULT_CODE = 16969
-const val MAX_LENGTH = 9999999
+const val MAX_LENGTH = 5000
 
 fun mapTypesToPermissions(
-    types: List<String>?,
-    readOnly: Boolean
+    bothTypes: List<String>?,
+    readTypes: List<String>?,
+    writeTypes: List<String>?
 ): MutableSet<String
         > {
     val permissions = mutableSetOf<String>()
-    if (types != null) {
-        for (item: String in types) {
+    if (bothTypes != null) {
+        for (item: String in bothTypes) {
             HealthConnectRecordTypeMap[item]?.let { classType ->
-                if (!readOnly) {
-                    permissions.add(HealthPermission.getWritePermission(classType))
-                }
+                permissions.add(HealthPermission.getWritePermission(classType))
                 permissions.add(HealthPermission.getReadPermission(classType))
             }
         }
     }
+    if (readTypes != null) {
+        for (item: String in readTypes) {
+            HealthConnectRecordTypeMap[item]?.let { classType ->
+                permissions.add(HealthPermission.getReadPermission(classType))
+            }
+        }
+    }
+    if (writeTypes != null) {
+        for (item: String in writeTypes) {
+            HealthConnectRecordTypeMap[item]?.let { classType ->
+                permissions.add(HealthPermission.getWritePermission(classType))
+            }
+        }
+    }
     return permissions
 }