nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Trying to save from crashes on the signer

Browse Source
This commit is contained in:
Vitor Pamplona
2023-11-22 17:04:57 -05:00
parent 3666a0b980
commit 954330064d
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quartz/src/main/java/com/vitorpamplona/quartz/signers/ExternalSignerLauncher.kt
+23 -19
View File
@@ -166,37 +166,41 @@ class ExternalSignerLauncher(
}
fun getDataFromResolver(signerType: SignerType, data: Array<out String>, columnName: String = "signature"): String? {
return contentResolver?.let { it() }?.let {
getDataFromResolver(signerType, data, columnName, it)
}
return getDataFromResolver(signerType, data, columnName, contentResolver)
}
fun getDataFromResolver(signerType: SignerType, data: Array<out String>, columnName: String = "signature", contentResolver: ContentResolver): String? {
fun getDataFromResolver(signerType: SignerType, data: Array<out String>, columnName: String = "signature", contentResolver: (() -> ContentResolver)? = null): String? {
val localData = if (signerType !== SignerType.GET_PUBLIC_KEY) {
data.toList().plus(npub).toTypedArray()
} else {
data
}
contentResolver.query(
Uri.parse("content://${signerPackageName}.$signerType"),
localData,
null,
null,
null
).use {
if (it == null) {
return null
}
if (it.moveToFirst()) {
val index = it.getColumnIndex(columnName)
if (index < 0) {
Log.d("getDataFromResolver", "column '$columnName' not found")
try {
contentResolver?.let { it() }?.query(
Uri.parse("content://${signerPackageName}.$signerType"),
localData,
null,
null,
null
).use {
if (it == null) {
return null
}
return it.getString(index)
if (it.moveToFirst()) {
val index = it.getColumnIndex(columnName)
if (index < 0) {
Log.d("getDataFromResolver", "column '$columnName' not found")
return null
}
return it.getString(index)
}
}
} catch (e: Exception) {
Log.e("ExternalSignerLauncher", "Failed to query the Signer app in the background")
return null
}
return null
}