Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Confirmation dialog when removing privately installed extensions #1320

Merged
merged 6 commits into from
Oct 13, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package eu.kanade.presentation.browse

import android.content.Context
import androidx.compose.animation.core.animateDpAsState
import androidx.compose.foundation.clickable
import androidx.compose.foundation.combinedClickable
Expand Down Expand Up @@ -55,6 +56,7 @@ import eu.kanade.tachiyomi.extension.model.InstallStep
import eu.kanade.tachiyomi.ui.browse.extension.ExtensionUiModel
import eu.kanade.tachiyomi.ui.browse.extension.ExtensionsScreenModel
import eu.kanade.tachiyomi.util.system.LocaleHelper
import eu.kanade.tachiyomi.util.system.isPackageInstalled
import eu.kanade.tachiyomi.util.system.launchRequestPackageInstallsPermission
import kotlinx.collections.immutable.persistentListOf
import tachiyomi.i18n.MR
Expand Down Expand Up @@ -248,6 +250,7 @@ private fun ExtensionContent(
}
}
},
context = context,
)
}
}
Expand Down Expand Up @@ -278,16 +281,47 @@ private fun ExtensionItem(
onClickItemAction: (Extension) -> Unit,
onClickItemSecondaryAction: (Extension) -> Unit,
modifier: Modifier = Modifier,
context: Context,
) {
val (extension, installStep) = item
var showUninstallConfirmation by remember { mutableStateOf(false) }

if (showUninstallConfirmation) {
ExtensionUninstallConfirmation(
extensionName = extension.name,
onClickConfirm = {
onLongClickItem(extension)
showUninstallConfirmation = false
},
onClickDismiss = {
showUninstallConfirmation = false
},
onDismissRequest = {
showUninstallConfirmation = false
},
)
}

BaseBrowseItem(
modifier = modifier
.combinedClickable(
onClick = { onClickItem(extension) },
onLongClick = { onLongClickItem(extension) },
onLongClick = {
if (context.isPackageInstalled(extension.pkgName)) {
onLongClickItem(extension)
} else {
showUninstallConfirmation = true
}
Animeboynz marked this conversation as resolved.
Show resolved Hide resolved
},
),
onClickItem = { onClickItem(extension) },
onLongClickItem = { onLongClickItem(extension) },
onLongClickItem = {
if (context.isPackageInstalled(extension.pkgName)) {
onLongClickItem(extension)
} else {
showUninstallConfirmation = true
}
Animeboynz marked this conversation as resolved.
Show resolved Hide resolved
},
icon = {
Box(
modifier = Modifier
Expand Down Expand Up @@ -540,3 +574,31 @@ private fun ExtensionTrustDialog(
onDismissRequest = onDismissRequest,
)
}

@Composable
private fun ExtensionUninstallConfirmation(
extensionName: String,
onClickConfirm: () -> Unit,
onClickDismiss: () -> Unit,
onDismissRequest: () -> Unit,
) {
AlertDialog(
title = {
Text(text = stringResource(MR.strings.ext_confirm_remove))
},
text = {
Text(text = stringResource(MR.strings.remove_private_extension_message, extensionName))
},
confirmButton = {
TextButton(onClick = onClickConfirm) {
Text(text = stringResource(MR.strings.ext_remove))
}
},
dismissButton = {
TextButton(onClick = onClickDismiss) {
Text(text = stringResource(MR.strings.action_cancel))
}
},
onDismissRequest = onDismissRequest,
)
}
3 changes: 3 additions & 0 deletions i18n/src/commonMain/moko-resources/base/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -325,10 +325,13 @@
<string name="ext_trust">Trust</string>
<string name="ext_untrusted">Untrusted</string>
<string name="ext_uninstall">Uninstall</string>
<string name="ext_remove">Remove</string>
<string name="ext_confirm_remove">Remove Extension?</string>
<string name="ext_app_info">App info</string>
<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>
Animeboynz marked this conversation as resolved.
Show resolved Hide resolved
<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>
Expand Down