Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

allow setting default editor

Browse source
This commit is contained in:
Thibault Deckers 2022-11-22 20:20:19 +01:00
parent 13d10f8b0d
commit ee6ee1b320
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -14,6 +14,7 @@ All notable changes to this project will be documented in this file.
### Changed ### Changed
- No default map style for `izzy` and `libre` flavors - No default map style for `izzy` and `libre` flavors
- allow setting default editor
### Fixed ### Fixed

14
android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/AppAdapterHandler.kt
View file

@ -213,7 +213,6 @@ class AppAdapterHandler(private val context: Context) : MethodCallHandler {
} }
private fun edit(call: MethodCall, result: MethodChannel.Result) { private fun edit(call: MethodCall, result: MethodChannel.Result) {
val title = call.argument<String>("title")
val uri = call.argument<String>("uri")?.let { Uri.parse(it) } val uri = call.argument<String>("uri")?.let { Uri.parse(it) }
val mimeType = call.argument<String>("mimeType") val mimeType = call.argument<String>("mimeType")
if (uri == null) { if (uri == null) {
@ -224,7 +223,7 @@ class AppAdapterHandler(private val context: Context) : MethodCallHandler {
val intent = Intent(Intent.ACTION_EDIT) val intent = Intent(Intent.ACTION_EDIT)
.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION) .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
.setDataAndType(getShareableUri(context, uri), mimeType) .setDataAndType(getShareableUri(context, uri), mimeType)
val started = safeStartActivityChooser(title, intent) val started = safeStartActivity(intent)
result.success(started) result.success(started)
} }
@ -327,7 +326,16 @@ class AppAdapterHandler(private val context: Context) : MethodCallHandler {
context.startActivity(intent) context.startActivity(intent)
return true return true
} catch (e: SecurityException) { } catch (e: SecurityException) {
Log.w(LOG_TAG, "failed to start activity for intent=$intent", e) if (intent.flags and Intent.FLAG_GRANT_WRITE_URI_PERMISSION != 0) {
// in some environments, providing the write flag yields a `SecurityException`:
// "UID XXXX does not have permission to content://XXXX"
// so we retry without it
Log.i(LOG_TAG, "retry intent=$intent without FLAG_GRANT_WRITE_URI_PERMISSION")
intent.flags = intent.flags and Intent.FLAG_GRANT_WRITE_URI_PERMISSION.inv()
return safeStartActivity(intent)
} else {
Log.w(LOG_TAG, "failed to start activity for intent=$intent", e)
}
} }
return false return false
} }