Co-Authored-By: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
This commit is contained in:
Roshan Varughese 2024-10-14 00:57:31 +13:00
parent 269645d12b
commit 8824ad92b8
2 changed files with 9 additions and 8 deletions

View File

@ -8,6 +8,7 @@ import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.platform.LocalContext
import cafe.adriel.voyager.navigator.LocalNavigator
import cafe.adriel.voyager.navigator.currentOrThrow
@ -31,7 +32,7 @@ fun extensionsTab(
val context = LocalContext.current
val state by extensionsScreenModel.state.collectAsState()
val privateExtensionToUninstall = remember { mutableStateOf<Extension?>(null) }
var privateExtensionToUninstall by remember { mutableStateOf<Extension?>(null) }
return TabContent(
titleRes = MR.strings.label_extensions,
@ -59,7 +60,7 @@ fun extensionsTab(
if (context.isPackageInstalled(extension.pkgName)) {
extensionsScreenModel.uninstallExtension(extension)
} else {
privateExtensionToUninstall.value = extension
privateExtensionToUninstall = extension
}
}
}
@ -85,14 +86,14 @@ fun extensionsTab(
onRefresh = extensionsScreenModel::findAvailableExtensions,
)
privateExtensionToUninstall.value?.let { extension ->
privateExtensionToUninstall?.let { extension ->
ExtensionUninstallConfirmation(
extensionName = privateExtensionToUninstall.value!!.name,
extensionName = privateExtensionToUninstall!!.name,
onClickConfirm = {
extensionsScreenModel.uninstallExtension(privateExtensionToUninstall.value!!)
extensionsScreenModel.uninstallExtension(privateExtensionToUninstall!!)
},
onDismissRequest = {
privateExtensionToUninstall.value = null
privateExtensionToUninstall = null
},
)
}
@ -118,7 +119,7 @@ private fun ExtensionUninstallConfirmation(
onClick = {
onClickConfirm()
onDismissRequest()
}
},
) {
Text(text = stringResource(MR.strings.ext_remove))
}

View File

@ -331,7 +331,7 @@
<string name="untrusted_extension">Untrusted extension</string>
<string name="untrusted_extension_message">Malicious extensions can read any stored login credentials or execute arbitrary code.\n\nBy trusting this extension, you accept these risks.</string>
<string name="obsolete_extension_message">This extension is no longer available. It may not function properly and can cause issues with the app. Uninstalling it is recommended.</string>
<string name="remove_private_extension_message">Do you really want to remove the \"%s\" extension?</string>
<string name="remove_private_extension_message">Do you really want to remove \"%s\" extension?</string>
<string name="extension_api_error">Failed to fetch available extensions</string>
<string name="ext_info_version">Version</string>
<string name="ext_info_language">Language</string>