Skip to content

Commit 3784963

Browse files
authored
Merge pull request carp-dk#1069 from iarata/health-crash-fix
[health] Fix #1059: Add check flags for permissions
2 parents 0ea4e7b + 09a55e4 commit 3784963

File tree

8 files changed

+26
-17
lines changed

8 files changed

+26
-17
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[],"android":[{"name":"app_usage","path":"/Users/hoffmatteo/Desktop/CACHET/flutter-plugins/packages/app_usage/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"app_usage","dependencies":[]}],"date_created":"2023-07-20 21:35:52.362642","version":"3.10.5"}
1+
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[],"android":[{"name":"app_usage","path":"/Users/arata/Developer/carp/flutter-plugins/packages/app_usage/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"app_usage","dependencies":[]}],"date_created":"2024-10-30 13:38:21.146381","version":"3.24.3","swift_package_manager_enabled":false}

packages/health/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 11.1.1
2+
3+
* Fix of [#1059](https://github.com/cph-cachet/flutter-plugins/issues/1059)
4+
15
## 11.1.0
26

37
* Fix of [#1043](https://github.com/cph-cachet/flutter-plugins/issues/1043)

packages/health/android/src/main/kotlin/cachet/plugins/health/HealthPlugin.kt

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
9494
null
9595
private lateinit var healthConnectClient: HealthConnectClient
9696
private lateinit var scope: CoroutineScope
97+
private var isReplySubmitted = false
9798

9899

99100
override fun onAttachedToEngine(
@@ -219,15 +220,18 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
219220
}
220221

221222
private fun onHealthConnectPermissionCallback(permissionGranted: Set<String>) {
222-
if (permissionGranted.isEmpty()) {
223-
mResult?.success(false)
224-
Log.i("FLUTTER_HEALTH", "Health Connect permissions were not granted! Make sure to declare the required permissions in the AndroidManifest.xml file.")
225-
} else {
226-
mResult?.success(true)
227-
Log.i("FLUTTER_HEALTH", "${permissionGranted.size} Health Connect permissions were granted!")
228-
229-
// log the permissions granted for debugging
230-
Log.i("FLUTTER_HEALTH", "Permissions granted: $permissionGranted")
223+
if (!isReplySubmitted) {
224+
if (permissionGranted.isEmpty()) {
225+
mResult?.success(false)
226+
Log.i("FLUTTER_HEALTH", "Health Connect permissions were not granted! Make sure to declare the required permissions in the AndroidManifest.xml file.")
227+
} else {
228+
mResult?.success(true)
229+
Log.i("FLUTTER_HEALTH", "${permissionGranted.size} Health Connect permissions were granted!")
230+
231+
// log the permissions granted for debugging
232+
Log.i("FLUTTER_HEALTH", "Permissions granted: $permissionGranted")
233+
}
234+
isReplySubmitted = true
231235
}
232236
}
233237

@@ -666,6 +670,7 @@ class HealthPlugin(private var channel: MethodChannel? = null) :
666670

667671
// Store the result to be called in [onHealthConnectPermissionCallback]
668672
mResult = result
673+
isReplySubmitted = false
669674
healthConnectRequestPermissionsLauncher!!.launch(permList.toSet())
670675
}
671676

packages/health/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: health
22
description: Wrapper for Apple's HealthKit on iOS and Google's Health Connect on Android.
3-
version: 11.1.0
3+
version: 11.1.1
44
homepage: https://github.com/cph-cachet/flutter-plugins/tree/master/packages/health
55

66
environment:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"notifications","path":"/Users/bardram/dev/flutter-plugins/packages/notifications/","dependencies":[]}],"android":[{"name":"notifications","path":"/Users/bardram/dev/flutter-plugins/packages/notifications/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"notifications","dependencies":[]}],"date_created":"2021-07-22 09:08:42.769208","version":"2.2.3"}
1+
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"notifications","path":"/Users/arata/Developer/carp/flutter-plugins/packages/notifications/","native_build":true,"dependencies":[]}],"android":[{"name":"notifications","path":"/Users/arata/Developer/carp/flutter-plugins/packages/notifications/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"notifications","dependencies":[]}],"date_created":"2024-10-30 13:38:55.333244","version":"3.24.3","swift_package_manager_enabled":false}

packages/notifications/example/ios/Flutter/flutter_export_environment.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
# This is a generated file; do not edit or check into version control.
3-
export "FLUTTER_ROOT=/Users/hoffmatteo/dev/flutter"
4-
export "FLUTTER_APPLICATION_PATH=/Users/hoffmatteo/Desktop/CACHET/flutter-plugins/packages/notifications/example"
3+
export "FLUTTER_ROOT=/opt/homebrew/Caskroom/flutter/3.24.3/flutter"
4+
export "FLUTTER_APPLICATION_PATH=/Users/arata/Developer/carp/flutter-plugins/packages/notifications/example"
55
export "COCOAPODS_PARALLEL_CODE_SIGN=true"
66
export "FLUTTER_TARGET=lib/main.dart"
77
export "FLUTTER_BUILD_DIR=build"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"pedometer","path":"/Users/bardram/dev/flutter-plugins/packages/pedometer/","native_build":true,"dependencies":[]},{"name":"permission_handler_apple","path":"/Users/bardram/.pub-cache/hosted/pub.dev/permission_handler_apple-9.4.5/","native_build":true,"dependencies":[]}],"android":[{"name":"pedometer","path":"/Users/bardram/dev/flutter-plugins/packages/pedometer/","native_build":true,"dependencies":[]},{"name":"permission_handler_android","path":"/Users/bardram/.pub-cache/hosted/pub.dev/permission_handler_android-12.0.7/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[{"name":"permission_handler_windows","path":"/Users/bardram/.pub-cache/hosted/pub.dev/permission_handler_windows-0.2.1/","native_build":true,"dependencies":[]}],"web":[{"name":"permission_handler_html","path":"/Users/bardram/.pub-cache/hosted/pub.dev/permission_handler_html-0.1.2/","dependencies":[]}]},"dependencyGraph":[{"name":"pedometer","dependencies":[]},{"name":"permission_handler","dependencies":["permission_handler_android","permission_handler_apple","permission_handler_html","permission_handler_windows"]},{"name":"permission_handler_android","dependencies":[]},{"name":"permission_handler_apple","dependencies":[]},{"name":"permission_handler_html","dependencies":[]},{"name":"permission_handler_windows","dependencies":[]}],"date_created":"2024-07-31 13:12:00.381228","version":"3.22.2"}
1+
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"pedometer","path":"/Users/arata/Developer/carp/flutter-plugins/packages/pedometer/","native_build":true,"dependencies":[]},{"name":"permission_handler_apple","path":"/Users/arata/.pub-cache/hosted/pub.dev/permission_handler_apple-9.4.5/","native_build":true,"dependencies":[]}],"android":[{"name":"pedometer","path":"/Users/arata/Developer/carp/flutter-plugins/packages/pedometer/","native_build":true,"dependencies":[]},{"name":"permission_handler_android","path":"/Users/arata/.pub-cache/hosted/pub.dev/permission_handler_android-12.0.13/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[{"name":"permission_handler_windows","path":"/Users/arata/.pub-cache/hosted/pub.dev/permission_handler_windows-0.2.1/","native_build":true,"dependencies":[]}],"web":[{"name":"permission_handler_html","path":"/Users/arata/.pub-cache/hosted/pub.dev/permission_handler_html-0.1.3+2/","dependencies":[]}]},"dependencyGraph":[{"name":"pedometer","dependencies":[]},{"name":"permission_handler","dependencies":["permission_handler_android","permission_handler_apple","permission_handler_html","permission_handler_windows"]},{"name":"permission_handler_android","dependencies":[]},{"name":"permission_handler_apple","dependencies":[]},{"name":"permission_handler_html","dependencies":[]},{"name":"permission_handler_windows","dependencies":[]}],"date_created":"2024-10-30 13:38:57.617363","version":"3.24.3","swift_package_manager_enabled":false}

packages/pedometer/example/ios/Flutter/flutter_export_environment.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
# This is a generated file; do not edit or check into version control.
3-
export "FLUTTER_ROOT=/Users/bardram/dev/flutter"
4-
export "FLUTTER_APPLICATION_PATH=/Users/bardram/dev/flutter-plugins/packages/pedometer/example"
3+
export "FLUTTER_ROOT=/opt/homebrew/Caskroom/flutter/3.24.3/flutter"
4+
export "FLUTTER_APPLICATION_PATH=/Users/arata/Developer/carp/flutter-plugins/packages/pedometer/example"
55
export "COCOAPODS_PARALLEL_CODE_SIGN=true"
66
export "FLUTTER_TARGET=lib/main.dart"
77
export "FLUTTER_BUILD_DIR=build"

0 commit comments

Comments
 (0)