From 2fb1e06eefe1a1fb9bebf6e8a38512bdcc1acffd Mon Sep 17 00:00:00 2001 From: Jannis Mattheis Date: Sun, 19 Apr 2026 20:20:44 +0200 Subject: [PATCH] fix: remove support for deleteApp With session elevation this would require re-authentication, and this is to much effort to implement for just one function that's probably only rarely used. --- .../gotify/messages/MessagesActivity.kt | 22 ++----------------- app/src/main/res/values/strings.xml | 2 +- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt b/app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt index a2c65f5..0ca908b 100644 --- a/app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt +++ b/app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt @@ -41,15 +41,12 @@ import com.github.gotify.Utils import com.github.gotify.Utils.launchCoroutine import com.github.gotify.api.Api import com.github.gotify.api.ApiException -import com.github.gotify.api.Callback import com.github.gotify.api.ClientFactory import com.github.gotify.client.ApiClient -import com.github.gotify.client.api.ApplicationApi import com.github.gotify.client.api.AuthApi import com.github.gotify.client.api.ClientApi import com.github.gotify.client.api.MessageApi import com.github.gotify.client.model.Application -import com.github.gotify.client.model.Client import com.github.gotify.client.model.Message import com.github.gotify.databinding.ActivityMessagesBinding import com.github.gotify.init.InitializationActivity @@ -540,28 +537,13 @@ internal class MessagesActivity : if (item.itemId == R.id.action_delete_app) { MaterialAlertDialogBuilder(this) .setTitle(R.string.delete_app) - .setMessage(R.string.ack) - .setPositiveButton(R.string.yes) { _, _ -> deleteApp(viewModel.appId) } - .setNegativeButton(R.string.no, null) + .setMessage(R.string.delete_app_not_supported) + .setPositiveButton(android.R.string.ok, null) .show() } return super.onContextItemSelected(item) } - private fun deleteApp(appId: Long) { - val settings = viewModel.settings - val client = ClientFactory.clientToken(settings) - client.createService(ApplicationApi::class.java) - .deleteApp(appId) - .enqueue( - Callback.callInUI( - this, - onSuccess = { refreshAll() }, - onError = { Utils.showSnackBar(this, getString(R.string.error_delete_app)) } - ) - ) - } - private suspend fun loadMore(appId: Long): List { val messagesWithImages = viewModel.messages.loadMore(appId) withContext(Dispatchers.Main) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5fdb6eb..fb1249e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -25,7 +25,7 @@ Received %d messages while being disconnected Delete all messages Delete application - Could not delete this app + Deleting applications is not currently supported. Use the WebUI. Delete logs Copy logs Logs copied