From eeeec5613f54c29c2cb03da1a02a243c8c3c97d0 Mon Sep 17 00:00:00 2001
From: zaneschepke <dev@zaneschepke.com>
Date: Fri, 26 Dec 2025 00:31:13 -0500
Subject: [PATCH] fix: fdroid check update, in app messages bug

---
 .../wireguardautotunnel/MainActivity.kt            |  3 +--
 .../wireguardautotunnel/di/AppModule.kt            |  3 ++-
 .../ui/screens/support/SupportScreen.kt            |  3 ++-
 .../util/extensions/ContextExtensions.kt           | 14 --------------
 app/src/main/res/values/strings.xml                |  1 +
 5 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/MainActivity.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/MainActivity.kt
index 9959c3e4..3165f059 100644
--- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/MainActivity.kt
+++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/MainActivity.kt
@@ -135,6 +135,7 @@ class MainActivity : AppCompatActivity() {
     private val appDatabase: AppDatabase by inject()
     private val networkMonitor: NetworkMonitor by inject()
 
+    val viewModel by viewModel<SharedAppViewModel>()
     private lateinit var roomBackup: RoomBackup
 
     @OptIn(ExperimentalMaterial3Api::class)
@@ -150,8 +151,6 @@ class MainActivity : AppCompatActivity() {
 
         roomBackup = RoomBackup(this)
 
-        val viewModel by viewModel<SharedAppViewModel>()
-
         installSplashScreen().apply {
             setKeepOnScreenCondition { !viewModel.container.stateFlow.value.isAppLoaded }
         }
diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/di/AppModule.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/di/AppModule.kt
index 61320c75..3f4f9aa5 100644
--- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/di/AppModule.kt
+++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/di/AppModule.kt
@@ -64,12 +64,13 @@ val appModule = module {
         )
     }
 
+    singleOf(::GlobalEffectRepository)
+
     viewModelScope {
         scoped { FileUtils(androidContext(), get(named(Dispatcher.IO))) }
         scoped<ShortcutManager> {
             DynamicShortcutManager(androidContext(), get(named(Dispatcher.IO)))
         }
-        scopedOf(::GlobalEffectRepository)
         scopedOf(::SelectedTunnelsRepository)
     }
 
diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/support/SupportScreen.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/support/SupportScreen.kt
index 600912cf..0f585e2d 100644
--- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/support/SupportScreen.kt
+++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/support/SupportScreen.kt
@@ -191,7 +191,8 @@ fun SupportScreen(viewModel: SupportViewModel = koinViewModel()) {
                         return@SurfaceRow context.showToast(R.string.update_check_unsupported)
                     when (BuildConfig.FLAVOR) {
                         Constants.GOOGLE_PLAY_FLAVOR -> context.launchPlayStoreListing()
-                        Constants.FDROID_FLAVOR -> context.launchFDroidListing()
+                        Constants.FDROID_FLAVOR ->
+                            context.openWebUrl(context.getString(R.string.fdroid_url))
                         else -> viewModel.checkForStandaloneUpdate()
                     }
                 },
diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/util/extensions/ContextExtensions.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/util/extensions/ContextExtensions.kt
index 01f8376c..8c909abb 100644
--- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/util/extensions/ContextExtensions.kt
+++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/util/extensions/ContextExtensions.kt
@@ -280,20 +280,6 @@ fun Context.launchPlayStoreReview() {
     }
 }
 
-fun Context.launchFDroidListing() {
-    val intent =
-        Intent(Intent.ACTION_VIEW, Uri.parse("fdroid.app://details?id=$packageName")).apply {
-            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            setPackage("org.fdroid.fdroid")
-        }
-
-    if (intent.resolveActivity(packageManager) != null) {
-        startActivity(intent)
-    } else {
-        openWebUrl("https://f-droid.org/packages/$packageName/")
-    }
-}
-
 fun Activity.setScreenBrightness(brightness: Float) {
     window.attributes = window.attributes.apply { screenBrightness = brightness }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 33c40926..d806b111 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -460,6 +460,7 @@
     <string name="mode">Mode</string>
     <string name="app_selection">App selection</string>
     <string name="example_import_url" translatable="false">https://123.com/tun.conf</string>
+    <string name="fdroid_url" translatable="false">https://apt.izzysoft.de/fdroid/index/apk/com.zaneschepke.wireguardautotunnel</string>
     <string name="import_url_description">The URL must be secure and serve a .conf file.</string>
     <string name="only_template">%1$s only</string>
 </resources>