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

pushes exception upward if triggered

Browse Source
This commit is contained in:
Vitor Pamplona
2025-11-07 17:33:09 -05:00
parent a996065c05
commit 948180157f
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/play/java/com/vitorpamplona/amethyst/service/notifications/PushNotificationUtils.kt
+2
View File
@@ -27,6 +27,7 @@ import com.vitorpamplona.quartz.utils.Log
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.tasks.await import kotlinx.coroutines.tasks.await
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import kotlin.coroutines.cancellation.CancellationException
object PushNotificationUtils { object PushNotificationUtils {
var lastToken: String? = null var lastToken: String? = null
@@ -44,6 +45,7 @@ object PushNotificationUtils {
registerToken(token, accounts, okHttpClient) registerToken(token, accounts, okHttpClient)
} catch (e: Exception) { } catch (e: Exception) {
if (e is CancellationException) throw e
Log.e("PushNotificationUtils", "Failed to get Firebase token", e) Log.e("PushNotificationUtils", "Failed to get Firebase token", e)
} }
} }
quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/api/background/utils/ContentResolverExt.kt
+2
View File
@@ -26,6 +26,7 @@ import android.net.Uri
import com.vitorpamplona.quartz.nip55AndroidSigner.api.IResult import com.vitorpamplona.quartz.nip55AndroidSigner.api.IResult
import com.vitorpamplona.quartz.nip55AndroidSigner.api.SignerResult import com.vitorpamplona.quartz.nip55AndroidSigner.api.SignerResult
import com.vitorpamplona.quartz.utils.Log import com.vitorpamplona.quartz.utils.Log
import kotlinx.coroutines.CancellationException
fun <T : IResult> ContentResolver.query( fun <T : IResult> ContentResolver.query(
uri: Uri, uri: Uri,
@@ -51,6 +52,7 @@ fun <T : IResult> ContentResolver.query(
} }
} }
} catch (e: Exception) { } catch (e: Exception) {
if (e is CancellationException) throw e
Log.e("ExternalSignerLauncher", "Failed to query the Signer app in the background", e) Log.e("ExternalSignerLauncher", "Failed to query the Signer app in the background", e)
SignerResult.RequestIncomplete.ErrorExceptionCallingContentResolver(e) SignerResult.RequestIncomplete.ErrorExceptionCallingContentResolver(e)
} }