Skip to content

Commit 2fb1e06

Browse files
committed
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.
1 parent b022541 commit 2fb1e06

2 files changed

Lines changed: 3 additions & 21 deletions

File tree

app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,12 @@ import com.github.gotify.Utils
4141
import com.github.gotify.Utils.launchCoroutine
4242
import com.github.gotify.api.Api
4343
import com.github.gotify.api.ApiException
44-
import com.github.gotify.api.Callback
4544
import com.github.gotify.api.ClientFactory
4645
import com.github.gotify.client.ApiClient
47-
import com.github.gotify.client.api.ApplicationApi
4846
import com.github.gotify.client.api.AuthApi
4947
import com.github.gotify.client.api.ClientApi
5048
import com.github.gotify.client.api.MessageApi
5149
import com.github.gotify.client.model.Application
52-
import com.github.gotify.client.model.Client
5350
import com.github.gotify.client.model.Message
5451
import com.github.gotify.databinding.ActivityMessagesBinding
5552
import com.github.gotify.init.InitializationActivity
@@ -540,28 +537,13 @@ internal class MessagesActivity :
540537
if (item.itemId == R.id.action_delete_app) {
541538
MaterialAlertDialogBuilder(this)
542539
.setTitle(R.string.delete_app)
543-
.setMessage(R.string.ack)
544-
.setPositiveButton(R.string.yes) { _, _ -> deleteApp(viewModel.appId) }
545-
.setNegativeButton(R.string.no, null)
540+
.setMessage(R.string.delete_app_not_supported)
541+
.setPositiveButton(android.R.string.ok, null)
546542
.show()
547543
}
548544
return super.onContextItemSelected(item)
549545
}
550546

551-
private fun deleteApp(appId: Long) {
552-
val settings = viewModel.settings
553-
val client = ClientFactory.clientToken(settings)
554-
client.createService(ApplicationApi::class.java)
555-
.deleteApp(appId)
556-
.enqueue(
557-
Callback.callInUI(
558-
this,
559-
onSuccess = { refreshAll() },
560-
onError = { Utils.showSnackBar(this, getString(R.string.error_delete_app)) }
561-
)
562-
)
563-
}
564-
565547
private suspend fun loadMore(appId: Long): List<MessageWithImage> {
566548
val messagesWithImages = viewModel.messages.loadMore(appId)
567549
withContext(Dispatchers.Main) {

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<string name="grouped_message">Received %d messages while being disconnected</string>
2626
<string name="delete_all">Delete all messages</string>
2727
<string name="delete_app">Delete application</string>
28-
<string name="error_delete_app">Could not delete this app</string>
28+
<string name="delete_app_not_supported">Deleting applications is not currently supported. Use the WebUI.</string>
2929
<string name="delete_logs">Delete logs</string>
3030
<string name="copy_logs">Copy logs</string>
3131
<string name="logs_copied">Logs copied</string>

0 commit comments

Comments
 (0)