From cd567fef9bfbceb422e48b860f2ff21a75cc94e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolf-Martell=20Montw=C3=A9?= Date: Mon, 4 Dec 2023 17:37:31 +0100 Subject: [PATCH] Remove `ActivityExtensions` as it's specific to `AutocryptKeyTransferActivity` only --- .../src/main/java/com/fsck/k9/ActivityExtensions.kt | 11 ----------- .../k9/ui/endtoend/AutocryptKeyTransferActivity.kt | 9 ++++++++- 2 files changed, 8 insertions(+), 12 deletions(-) delete mode 100644 app/core/src/main/java/com/fsck/k9/ActivityExtensions.kt diff --git a/app/core/src/main/java/com/fsck/k9/ActivityExtensions.kt b/app/core/src/main/java/com/fsck/k9/ActivityExtensions.kt deleted file mode 100644 index 70ba09febc..0000000000 --- a/app/core/src/main/java/com/fsck/k9/ActivityExtensions.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.fsck.k9 - -import android.app.Activity -import android.widget.Toast -import androidx.annotation.StringRes - -fun Activity.finishWithErrorToast(@StringRes errorRes: Int, vararg formatArgs: String) { - val text = getString(errorRes, *formatArgs) - Toast.makeText(this, text, Toast.LENGTH_LONG).show() - finish() -} diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferActivity.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferActivity.kt index 7d6c92b6ba..0da4afc954 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferActivity.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferActivity.kt @@ -10,8 +10,9 @@ import android.transition.TransitionManager import android.view.MenuItem import android.view.View import android.widget.TextView +import android.widget.Toast +import androidx.annotation.StringRes import androidx.core.view.isVisible -import com.fsck.k9.finishWithErrorToast import com.fsck.k9.ui.R import com.fsck.k9.ui.base.K9Activity import com.fsck.k9.view.StatusIndicator @@ -152,6 +153,12 @@ class AutocryptKeyTransferActivity : K9Activity() { finishWithErrorToast(R.string.toast_openpgp_provider_error, providerName) } + private fun finishWithErrorToast(@StringRes errorRes: Int, vararg formatArgs: String) { + val text = getString(errorRes, *formatArgs) + Toast.makeText(this, text, Toast.LENGTH_LONG).show() + finish() + } + fun launchUserInteractionPendingIntent(pendingIntent: PendingIntent) { try { startIntentSender(pendingIntent.intentSender, null, 0, 0, 0)