vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-07-04 11:53:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: require Android contact and calendar write permissions (#99204)

Browse Source 
* fix: require Android contact and calendar write permissions

* test(android): cover partial permission grants

---------

Co-authored-by: NianJiuZst <180004567+users.noreply.github.com>
Co-authored-by: Peter Steinberger <steipete@gmail.com>
This commit is contained in:
NianJiu
2026-07-03 04:20:07 +08:00
committed by GitHub
parent 4df175baaf
commit c20171ddfc
2 changed files with 48 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/android/app/src/main/java/ai/openclaw/app/node/DeviceHandler.kt
View File

@@ -426,14 +426,18 @@ class DeviceHandler private constructor(
put(
"contacts",
permissionStateJson(
granted = hasPermission(Manifest.permission.READ_CONTACTS),
granted =
hasPermission(Manifest.permission.READ_CONTACTS) &&
hasPermission(Manifest.permission.WRITE_CONTACTS),
promptableWhenDenied = true,
),
)
put(
"calendar",
permissionStateJson(
granted = hasPermission(Manifest.permission.READ_CALENDAR),
granted =
hasPermission(Manifest.permission.READ_CALENDAR) &&
hasPermission(Manifest.permission.WRITE_CALENDAR),
promptableWhenDenied = true,
),
)

44
apps/android/app/src/test/java/ai/openclaw/app/node/DeviceHandlerTest.kt
View File

@@ -1,6 +1,7 @@
package ai.openclaw.app.node
import android.content.Context
import android.Manifest
import android.app.Application
import android.content.pm.ApplicationInfo
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonObject
@@ -15,6 +16,7 @@ import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.RuntimeEnvironment
import org.robolectric.Shadows.shadowOf
@RunWith(RobolectricTestRunner::class)
class DeviceHandlerTest {
@@ -274,6 +276,31 @@ class DeviceHandlerTest {
assertTrue(!callLog.getValue("promptable").jsonPrimitive.boolean)
}
@Test
fun handleDevicePermissions_requiresReadAndWritePermissionPairs() {
val app = appContext()
val handler = DeviceHandler(app)
val permissionPairs =
listOf(
Triple("contacts", Manifest.permission.READ_CONTACTS, Manifest.permission.WRITE_CONTACTS),
Triple("calendar", Manifest.permission.READ_CALENDAR, Manifest.permission.WRITE_CALENDAR),
)
for ((key, readPermission, writePermission) in permissionPairs) {
shadowOf(app).denyPermissions(readPermission, writePermission)
shadowOf(app).grantPermissions(readPermission)
assertEquals("$key read-only", "denied", permissionStatus(handler.handleDevicePermissions(null).payloadJson, key))
shadowOf(app).denyPermissions(readPermission)
shadowOf(app).grantPermissions(writePermission)
assertEquals("$key write-only", "denied", permissionStatus(handler.handleDevicePermissions(null).payloadJson, key))
shadowOf(app).grantPermissions(readPermission)
assertEquals("$key read-write", "granted", permissionStatus(handler.handleDevicePermissions(null).payloadJson, key))
}
}
@Test
fun handleDeviceHealth_returnsExpectedShape() {
val handler = DeviceHandler(appContext())
@@ -423,12 +450,25 @@ class DeviceHandlerTest {
assertTrue(isSystemDeviceApp(appInfo))
}
private fun appContext(): Context = RuntimeEnvironment.getApplication()
private fun appContext(): Application = RuntimeEnvironment.getApplication()
private fun parsePayload(payloadJson: String?): JsonObject {
val jsonString = payloadJson ?: error("expected payload")
return Json.parseToJsonElement(jsonString).jsonObject
}
private fun permissionStatus(
payloadJson: String?,
key: String,
): String =
parsePayload(payloadJson)
.getValue("permissions")
.jsonObject
.getValue(key)
.jsonObject
.getValue("status")
.jsonPrimitive
.content
}
private class FakeDeviceAppSource(