Merge pull request 'Fixed lock warning on NONE and RANDOM popup effects' (#2) from work into main

Reviewed-on: #2

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId = "partisan.weforge.xyz.pulse"
         minSdk = 29
         targetSdk = 34
-        versionCode = 14
+        versionCode = 15
-        versionName = "2.0.0"
+        versionName = "2.0.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

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 {

fastlane/metadata/android/en-US/changelogs/15.txt

@@ -17,6 +17,6 @@ Fixes:
 
 Misc:
 - Updated Gradle to v8.14.1
-- Updated screenshots to include new looks of the app.
+- Updated screenshots to reflect the new look of the app
-- Updated description.
+- Updated description
-- Added temporary "v2.0" to store icon to indicate new version.
+- Temporarily added "v2.0" to the store icon to indicate the new version

fastlane/metadata/android/en-US/changelogs/16.txt

@@ -0,0 +1,2 @@
+v2.0.1
+- Fixed lock warning on NONE and RANDOM popup effects

fastlane/metadata/android/en-US/short_description.txt

@@ -1 +1 @@
-Redirecting outgoing calls to E2EE apps.
+Redirecting outgoing calls to E2EE apps