From a28ff0598167e958cb7e65134822c15104379a3a Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 5 Nov 2026 13:14:08 -0500 Subject: [PATCH] fix: handle enhanced log chooser launch failures --- .../main/java/com/droiddeck/launcher/FrontEndActivity.kt | 9 +++++++-- .../main/java/com/droiddeck/launcher/SessionActivity.kt | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 9e69cc974a..eee09c03bc 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -2723,8 +2723,13 @@ class FrontEndActivity : ComponentActivity() { .setTitle(R.string.diagnostics_share_title) .setItems(choices.map { it.first }.toTypedArray()) { _, which -> val selected = choices[which].second - startActivity(if (selected.size == 1) SessionLogShare.shareIntent(this, selected.single()) - else SessionLogShare.shareEnhancedIntent(this, selected)) + runCatching { + startActivity(if (selected.size == 1) SessionLogShare.shareIntent(this, selected.single()) + else SessionLogShare.shareEnhancedIntent(this, selected)) + }.onFailure { + android.util.Log.w("SessionLogShare", "could not share latest session logs", it) + android.widget.Toast.makeText(this, R.string.session_logs_share_failed, android.widget.Toast.LENGTH_LONG).show() + } } .setNegativeButton(android.R.string.cancel, null) .show() diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index d5c4fe3104..c5e36438e7 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -1920,8 +1920,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { .setTitle(R.string.diagnostics_share_title) .setItems(choices.map { it.first }.toTypedArray()) { _, which -> val selected = choices[which].second - startActivity(if (selected.size == 1) SessionLogShare.shareIntent(this, selected.single()) - else SessionLogShare.shareEnhancedIntent(this, selected)) + runCatching { + startActivity(if (selected.size == 1) SessionLogShare.shareIntent(this, selected.single()) + else SessionLogShare.shareEnhancedIntent(this, selected)) + }.onFailure { + Log.w(TAG, "could not share current session logs", it) + Toast.makeText(this, R.string.session_logs_share_failed, Toast.LENGTH_LONG).show() + } } .setNegativeButton(android.R.string.cancel, null) .show()