From 4c9b0a1b229b5e8879fda812ad1cc1ba19e1762b Mon Sep 17 00:00:00 2001
From: partisan <none@noone.no>
Date: Wed, 28 May 2025 16:14:42 +0200
Subject: [PATCH] Fixed lock warning on NONE and RANDOM popup effects

---
 app/build.gradle                                            | 4 ++--
 .../partisan/weforge/xyz/pulse/PopupSettingsFragment.kt     | 6 +++++-
 fastlane/metadata/android/en-US/changelogs/16.txt           | 2 ++
 fastlane/metadata/android/en-US/short_description.txt       | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/16.txt

diff --git a/app/build.gradle b/app/build.gradle
index 6de77a6..f9bf50f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId = "partisan.weforge.xyz.pulse"
         minSdk = 29
         targetSdk = 34
-        versionCode = 14
-        versionName = "2.0.0"
+        versionCode = 15
+        versionName = "2.0.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/partisan/weforge/xyz/pulse/PopupSettingsFragment.kt b/app/src/main/java/partisan/weforge/xyz/pulse/PopupSettingsFragment.kt
index 5a504d3..1150450 100644
--- a/app/src/main/java/partisan/weforge/xyz/pulse/PopupSettingsFragment.kt
+++ b/app/src/main/java/partisan/weforge/xyz/pulse/PopupSettingsFragment.kt
@@ -133,7 +133,11 @@ class PopupSettingsFragment : Fragment() {
         binding.popupEffectSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) {
                 val selectedEffect = allEffects[position]
-                if (!prefs.isDonationActivated && selectedEffect !in prefs.getAvailablePopupEffects()) {
+                if (!prefs.isDonationActivated &&
+                    selectedEffect !in prefs.getAvailablePopupEffects() &&
+                    selectedEffect != Preferences.PopupEffect.NONE &&
+                    selectedEffect != Preferences.PopupEffect.RANDOM
+                ) {
                     Toast.makeText(requireContext(), getString(R.string.donate_lock), Toast.LENGTH_SHORT).show()
                     binding.popupEffectSpinner.setSelection(prefs.popupEffect.ordinal)
                 } else {
diff --git a/fastlane/metadata/android/en-US/changelogs/16.txt b/fastlane/metadata/android/en-US/changelogs/16.txt
new file mode 100644
index 0000000..19c988b
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/16.txt
@@ -0,0 +1,2 @@
+v2.0.1
+- Fixed lock warning on NONE and RANDOM popup effects
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
index aa3476a..3ffffd0 100644
--- a/fastlane/metadata/android/en-US/short_description.txt
+++ b/fastlane/metadata/android/en-US/short_description.txt
@@ -1 +1 @@
-Redirecting outgoing calls to E2EE apps.
\ No newline at end of file
+Redirecting outgoing calls to E2EE apps
\ No newline at end of file