From 834a59e46ee7e02376e97e2c7f28f8afe86ce832 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Tue, 8 Feb 2022 02:07:18 +0530 Subject: [PATCH] android: set web URI to null in saved posts screen --- .../kotlin/dev/msfjarvis/claw/android/MainActivity.kt | 8 +++++++- .../kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/MainActivity.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/MainActivity.kt index cea790dc..508f7278 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/MainActivity.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/MainActivity.kt @@ -32,6 +32,12 @@ class MainActivity : ComponentActivity() { override fun onProvideAssistContent(outContent: AssistContent?) { super.onProvideAssistContent(outContent) - webUri?.let { outContent?.webUri = Uri.parse(it) } + if (outContent != null) { + if (webUri != null) { + outContent.webUri = Uri.parse(webUri) + } else { + outContent.webUri = null + } + } } } diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt index 6ce39607..e4d4834a 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt @@ -51,7 +51,7 @@ fun LobstersApp( viewModel: ClawViewModel = viewModel(), urlLauncher: UrlLauncher, htmlConverter: HTMLConverter, - setWebUri: (String) -> Unit, + setWebUri: (String?) -> Unit, ) { var isFabVisible by remember { mutableStateOf(false) } @@ -140,6 +140,7 @@ fun LobstersApp( ) } composable(Destinations.Saved.getRoute()) { + setWebUri(null) DatabasePosts( items = savedPosts, listState = savedListState,