feat: mobile data only auto-tunneling

Added support for configuring auto-tunneling to only tunnel on mobile data with no location permissions necessary. Improved UI on support screen and updated support resource links. Fixed UI bug where analytics expansion could show on deactivated tunnels.
2026-07-03 14:07:49 +02:00 · 2023-12-05 01:14:19 -05:00
86 changed files with 1698 additions and 2950 deletions
@@ -70,7 +70,7 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          # fix hardcode changelog file name
-          body_path: ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/32400.txt
+          body_path: ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/32300.txt
          tag_name: ${{ github.ref_name }}
          name: Release ${{ github.ref_name }}
          draft: false
@@ -23,10 +23,6 @@ android {
            arg("room.schemaLocation", "$projectDir/schemas")
        }
        sourceSets {
            getByName("debug").assets.srcDirs(files("$projectDir/schemas")) // Room
        }
        resourceConfigurations.addAll(listOf("en"))
        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -37,8 +33,7 @@ android {
    signingConfigs {
        create(Constants.RELEASE) {
-            val properties =
+            val properties = Properties().apply {
                Properties().apply {
                //created local file for signing details
                try {
                    load(file("signing.properties").reader())
@@ -48,40 +43,23 @@ android {
            }
            //try to get secrets from env first for pipeline build, then properties file for local build
-            storeFile = file(
+            storeFile = file(System.getenv().getOrDefault(Constants.KEY_STORE_PATH_VAR, properties.getProperty(Constants.KEY_STORE_PATH_VAR)))
-                System.getenv().getOrDefault(
+            storePassword = System.getenv().getOrDefault(Constants.STORE_PASS_VAR, properties.getProperty(Constants.STORE_PASS_VAR))
-                    Constants.KEY_STORE_PATH_VAR,
+            keyAlias = System.getenv().getOrDefault(Constants.KEY_ALIAS_VAR, properties.getProperty(Constants.KEY_ALIAS_VAR))
-                    properties.getProperty(Constants.KEY_STORE_PATH_VAR)
+            keyPassword = System.getenv().getOrDefault(Constants.KEY_PASS_VAR, properties.getProperty(Constants.KEY_PASS_VAR))
                )
            )
            storePassword = System.getenv().getOrDefault(
                Constants.STORE_PASS_VAR,
                properties.getProperty(Constants.STORE_PASS_VAR)
            )
            keyAlias = System.getenv().getOrDefault(
                Constants.KEY_ALIAS_VAR,
                properties.getProperty(Constants.KEY_ALIAS_VAR)
            )
            keyPassword = System.getenv().getOrDefault(
                Constants.KEY_PASS_VAR,
                properties.getProperty(Constants.KEY_PASS_VAR)
            )
        }
    }
    buildTypes {
        //don't strip
-        packaging.jniLibs.keepDebugSymbols.addAll(
+        packaging.jniLibs.keepDebugSymbols.addAll(listOf("libwg-go.so", "libwg-quick.so", "libwg.so"))
            listOf("libwg-go.so", "libwg-quick.so", "libwg.so")
        )
        applicationVariants.all {
            val variant = this
            variant.outputs
                .map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl }
                .forEach { output ->
-                    val outputFileName =
+                    val outputFileName = "${Constants.APP_NAME}-${variant.flavorName}-${variant.buildType.name}-${variant.versionName}.apk"
                        "${Constants.APP_NAME}-${variant.flavorName}-${variant.buildType.name}-${variant.versionName}.apk"
                    output.outputFileName = outputFileName
                }
        }
@@ -107,7 +85,8 @@ android {
        }
        create("general") {
            dimension = Constants.TYPE
-            if (BuildHelper.isReleaseBuild(gradle) && BuildHelper.isGeneralFlavor(gradle)) {
+            if (BuildHelper.isReleaseBuild(gradle) && BuildHelper.isGeneralFlavor(gradle))
            {
                apply(plugin = "com.google.gms.google-services")
                apply(plugin = "com.google.firebase.crashlytics")
            }
@@ -124,6 +103,7 @@ android {
    buildFeatures {
        compose = true
        buildConfig = true
    }
    composeOptions {
        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
@@ -151,12 +131,10 @@ dependencies {
    //test
    testImplementation(libs.junit)
    testImplementation(libs.androidx.junit)
    androidTestImplementation(libs.androidx.junit)
    androidTestImplementation(libs.androidx.espresso.core)
    androidTestImplementation(platform(libs.androidx.compose.bom))
    androidTestImplementation(libs.androidx.compose.ui.test)
    androidTestImplementation(libs.androidx.room.testing)
    debugImplementation(libs.androidx.compose.ui.tooling)
    debugImplementation(libs.androidx.compose.manifest)
@@ -181,17 +159,17 @@ dependencies {
    implementation(libs.accompanist.flowlayout)
    implementation(libs.accompanist.drawablepainter)
-    // storage
+    //room
    implementation(libs.androidx.room.runtime)
    ksp(libs.androidx.room.compiler)
    implementation(libs.androidx.room.ktx)
    implementation(libs.androidx.datastore.preferences)
    //lifecycle
    implementation(libs.lifecycle.runtime.compose)
    implementation(libs.androidx.lifecycle.runtime.ktx)
    implementation(libs.androidx.lifecycle.process)
    //icons
    implementation(libs.material.icons.extended)
    //serialization
@@ -1,5 +1 @@
 -dontwarn com.google.errorprone.annotations.**
 -keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite {
    <fields>;
 }
@@ -19,6 +19,3 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 -keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite {
    <fields>;
 }
@@ -1,154 +0,0 @@
 {
  "formatVersion": 1,
  "database": {
    "version": 4,
    "identityHash": "aee55639422df8dadfe74c3bad204477",
    "entities": [
      {
        "tableName": "Settings",
        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_tunnel_enabled` INTEGER NOT NULL, `is_tunnel_on_mobile_data_enabled` INTEGER NOT NULL, `trusted_network_ssids` TEXT NOT NULL, `default_tunnel` TEXT, `is_always_on_vpn_enabled` INTEGER NOT NULL, `is_tunnel_on_ethernet_enabled` INTEGER NOT NULL, `is_shortcuts_enabled` INTEGER NOT NULL DEFAULT false, `is_battery_saver_enabled` INTEGER NOT NULL DEFAULT false, `is_tunnel_on_wifi_enabled` INTEGER NOT NULL DEFAULT false, `is_kernel_enabled` INTEGER NOT NULL DEFAULT false, `is_restore_on_boot_enabled` INTEGER NOT NULL DEFAULT false, `is_multi_tunnel_enabled` INTEGER NOT NULL DEFAULT false)",
        "fields": [
          {
            "fieldPath": "id",
            "columnName": "id",
            "affinity": "INTEGER",
            "notNull": true
          },
          {
            "fieldPath": "isAutoTunnelEnabled",
            "columnName": "is_tunnel_enabled",
            "affinity": "INTEGER",
            "notNull": true
          },
          {
            "fieldPath": "isTunnelOnMobileDataEnabled",
            "columnName": "is_tunnel_on_mobile_data_enabled",
            "affinity": "INTEGER",
            "notNull": true
          },
          {
            "fieldPath": "trustedNetworkSSIDs",
            "columnName": "trusted_network_ssids",
            "affinity": "TEXT",
            "notNull": true
          },
          {
            "fieldPath": "defaultTunnel",
            "columnName": "default_tunnel",
            "affinity": "TEXT",
            "notNull": false
          },
          {
            "fieldPath": "isAlwaysOnVpnEnabled",
            "columnName": "is_always_on_vpn_enabled",
            "affinity": "INTEGER",
            "notNull": true
          },
          {
            "fieldPath": "isTunnelOnEthernetEnabled",
            "columnName": "is_tunnel_on_ethernet_enabled",
            "affinity": "INTEGER",
            "notNull": true
          },
          {
            "fieldPath": "isShortcutsEnabled",
            "columnName": "is_shortcuts_enabled",
            "affinity": "INTEGER",
            "notNull": true,
            "defaultValue": "false"
          },
          {
            "fieldPath": "isBatterySaverEnabled",
            "columnName": "is_battery_saver_enabled",
            "affinity": "INTEGER",
            "notNull": true,
            "defaultValue": "false"
          },
          {
            "fieldPath": "isTunnelOnWifiEnabled",
            "columnName": "is_tunnel_on_wifi_enabled",
            "affinity": "INTEGER",
            "notNull": true,
            "defaultValue": "false"
          },
          {
            "fieldPath": "isKernelEnabled",
            "columnName": "is_kernel_enabled",
            "affinity": "INTEGER",
            "notNull": true,
            "defaultValue": "false"
          },
          {
            "fieldPath": "isRestoreOnBootEnabled",
            "columnName": "is_restore_on_boot_enabled",
            "affinity": "INTEGER",
            "notNull": true,
            "defaultValue": "false"
          },
          {
            "fieldPath": "isMultiTunnelEnabled",
            "columnName": "is_multi_tunnel_enabled",
            "affinity": "INTEGER",
            "notNull": true,
            "defaultValue": "false"
          }
        ],
        "primaryKey": {
          "autoGenerate": true,
          "columnNames": [
            "id"
          ]
        },
        "indices": [],
        "foreignKeys": []
      },
      {
        "tableName": "TunnelConfig",
        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `wg_quick` TEXT NOT NULL)",
        "fields": [
          {
            "fieldPath": "id",
            "columnName": "id",
            "affinity": "INTEGER",
            "notNull": true
          },
          {
            "fieldPath": "name",
            "columnName": "name",
            "affinity": "TEXT",
            "notNull": true
          },
          {
            "fieldPath": "wgQuick",
            "columnName": "wg_quick",
            "affinity": "TEXT",
            "notNull": true
          }
        ],
        "primaryKey": {
          "autoGenerate": true,
          "columnNames": [
            "id"
          ]
        },
        "indices": [
          {
            "name": "index_TunnelConfig_name",
            "unique": true,
            "columnNames": [
              "name"
            ],
            "orders": [],
            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_TunnelConfig_name` ON `${TABLE_NAME}` (`name`)"
          }
        ],
        "foreignKeys": []
      }
    ],
    "views": [],
    "setupQueries": [
      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'aee55639422df8dadfe74c3bad204477')"
    ]
  }
 }
@@ -1,63 +0,0 @@
 package com.zaneschepke.wireguardautotunnel
 import androidx.room.testing.MigrationTestHelper
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.zaneschepke.wireguardautotunnel.repository.AppDatabase
 import java.io.IOException
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@RunWith(AndroidJUnit4::class)
 class MigrationTest {
    private val dbName = "migration-test"
    @get:Rule
    val helper: MigrationTestHelper = MigrationTestHelper(
        InstrumentationRegistry.getInstrumentation(),
        AppDatabase::class.java
    )
    @Test
    @Throws(IOException::class)
    fun migrate2To3() {
        helper.createDatabase(dbName, 3).apply {
            // Database has schema version 1. Insert some data using SQL queries.
            // You can't use DAO classes because they expect the latest schema.
            execSQL(
                "INSERT INTO Settings (is_tunnel_enabled, " +
                        "is_tunnel_on_mobile_data_enabled," +
                        "trusted_network_ssids," +
                        "default_tunnel, " +
                        "is_always_on_vpn_enabled," +
                        "is_tunnel_on_ethernet_enabled," +
                        "is_shortcuts_enabled," +
                        "is_battery_saver_enabled," +
                        "is_tunnel_on_wifi_enabled)" +
                        " VALUES (" +
                        "false," +
                        "false," +
                        "'[trustedSSID1,trustedSSID2]'," +
                        "'defaultTunnel'," +
                        "false," +
                        "false," +
                        "false," +
                        "false," +
                        "false)"
            )
            execSQL(
                "INSERT INTO TunnelConfig (name, wg_quick)" +
                        " VALUES ('hello', 'hello')"
            )
            // Prepare for the next version.
            close()
        }
        // Re-open the database with version 2 and provide
        // MIGRATION_1_2 as the migration process.
        helper.runMigrationsAndValidate(dbName, 4, true)
        // MigrationTestHelper automatically verifies the schema changes,
        // but you need to validate that the data was migrated properly.
    }
 }
@@ -17,10 +17,6 @@
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
    <!--foreground service exempt android 14-->
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED"/>
    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION"/>
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_REMOTE_MESSAGING"/>
    <!--foreground service permissions-->
@@ -106,7 +102,7 @@
            android:permission="android.permission.BIND_VPN_SERVICE"
            android:enabled="true"
            android:persistent="true"
-            android:foregroundServiceType="systemExempted"
+            android:foregroundServiceType="remoteMessaging"
            android:exported="false">
            <intent-filter>
                <action android:name="android.net.VpnService"/>
@@ -119,7 +115,8 @@
            android:enabled="true"
            android:stopWithTask="false"
            android:persistent="true"
-            android:foregroundServiceType="systemExempted"
+            android:foregroundServiceType="location"
            android:permission=""
            android:exported="false">
        </service>
        <receiver android:enabled="true" android:name=".receiver.BootReceiver"
@@ -2,7 +2,7 @@ package com.zaneschepke.wireguardautotunnel
 object Constants {
    const val MANUAL_TUNNEL_CONFIG_ID = "0"
-    const val WATCHER_SERVICE_WAKE_LOCK_TIMEOUT = 10 * 60 * 1000L // 10 minutes
+    const val WATCHER_SERVICE_WAKE_LOCK_TIMEOUT = 10*60*1000L /*10 minute*/
    const val VPN_CONNECTIVITY_CHECK_INTERVAL = 3000L
    const val VPN_STATISTIC_CHECK_INTERVAL = 1000L
    const val TOGGLE_TUNNEL_DELAY = 500L
@@ -17,5 +17,4 @@ object Constants {
    const val GOOGLE_TV_EXPLORER_STUB = "com.google.android.tv.frameworkpackagestubs"
    const val ANDROID_TV_EXPLORER_STUB = "com.android.tv.frameworkpackagestubs"
    const val EMAIL_MIME_TYPE = "message/rfc822"
    const val SYSTEM_EXEMPT_SERVICE_TYPE_ID = 1024
 }
@@ -1,14 +1,14 @@
 package com.zaneschepke.wireguardautotunnel
 import android.content.BroadcastReceiver
 import java.math.BigDecimal
 import java.text.DecimalFormat
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import java.math.BigDecimal
 import java.text.DecimalFormat
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
 fun BroadcastReceiver.goAsync(
    context: CoroutineContext = EmptyCoroutineContext,
@@ -6,36 +6,24 @@ import android.content.pm.PackageManager
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.repository.SettingsDoa
 import com.zaneschepke.wireguardautotunnel.repository.datastore.DataStoreManager
 import com.zaneschepke.wireguardautotunnel.repository.model.Settings
 import dagger.hilt.android.HiltAndroidApp
 import java.io.IOException
 import javax.inject.Inject
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
@HiltAndroidApp
 class WireGuardAutoTunnel : Application() {
    @Inject
    lateinit var settingsRepo : SettingsDoa
    @Inject
    lateinit var dataStoreManager: DataStoreManager
    override fun onCreate() {
        super.onCreate()
-        if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree())
+        if(BuildConfig.DEBUG) {
            Timber.plant(Timber.DebugTree())
        }
        initSettings()
        with(ProcessLifecycleOwner.get()) {
            lifecycleScope.launch {
                try {
                    // load preferences into memory
                    dataStoreManager.init()
                } catch (e: IOException) {
                    Timber.e("Failed to load preferences")
                }
            }
        }
    }
    private fun initSettings() {
@@ -48,6 +36,8 @@ class WireGuardAutoTunnel : Application() {
        }
    }
    companion object {
        fun isRunningOnAndroidTv(context : Context) : Boolean {
            return context.packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
@@ -16,14 +16,10 @@ import javax.inject.Singleton
 class DatabaseModule {
    @Provides
    @Singleton
-    fun provideDatabase(
+    fun provideDatabase(@ApplicationContext context : Context) : AppDatabase {
        @ApplicationContext context: Context
    ): AppDatabase {
        return Room.databaseBuilder(
            context,
-            AppDatabase::class.java,
+            AppDatabase::class.java, context.getString(R.string.db_name))
            context.getString(R.string.db_name)
        )
            .fallbackToDestructiveMigration()
            .build()
    }
@@ -1,7 +0,0 @@
 package com.zaneschepke.wireguardautotunnel.module
 import javax.inject.Qualifier
@Qualifier
@Retention(AnnotationRetention.BINARY)
 annotation class Kernel
@@ -1,20 +1,18 @@
 package com.zaneschepke.wireguardautotunnel.module
 import android.content.Context
 import com.zaneschepke.wireguardautotunnel.repository.AppDatabase
 import com.zaneschepke.wireguardautotunnel.repository.SettingsDoa
 import com.zaneschepke.wireguardautotunnel.repository.TunnelConfigDao
 import com.zaneschepke.wireguardautotunnel.repository.datastore.DataStoreManager
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
@Module
@InstallIn(SingletonComponent::class)
 class RepositoryModule {
    @Singleton
    @Provides
    fun provideSettingsRepository(appDatabase: AppDatabase) : SettingsDoa {
@@ -26,10 +24,4 @@ class RepositoryModule {
    fun provideTunnelConfigRepository(appDatabase: AppDatabase) : TunnelConfigDao {
        return appDatabase.tunnelConfigDoa()
    }
    @Singleton
    @Provides
    fun providePreferencesDataStore(@ApplicationContext context: Context): DataStoreManager {
        return DataStoreManager(context)
    }
 }
@@ -15,6 +15,7 @@ import dagger.hilt.android.scopes.ServiceScoped
@Module
@InstallIn(ServiceComponent::class)
 abstract class ServiceModule {
    @Binds
    @ServiceScoped
    abstract fun provideNotificationService(wireGuardNotification: WireGuardNotification) : NotificationService
@@ -3,10 +3,6 @@ package com.zaneschepke.wireguardautotunnel.module
 import android.content.Context
 import com.wireguard.android.backend.Backend
 import com.wireguard.android.backend.GoBackend
 import com.wireguard.android.backend.WgQuickBackend
 import com.wireguard.android.util.RootShell
 import com.wireguard.android.util.ToolsInstaller
 import com.zaneschepke.wireguardautotunnel.repository.SettingsDoa
 import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.WireGuardTunnel
 import dagger.Module
@@ -19,40 +15,16 @@ import javax.inject.Singleton
@Module
@InstallIn(SingletonComponent::class)
 class TunnelModule {
    @Provides
    @Singleton
    fun provideRootShell(
        @ApplicationContext context: Context
    ): RootShell {
        return RootShell(context)
    }
    @Provides
    @Singleton
-    @Userspace
+    fun provideBackend(@ApplicationContext context : Context) : Backend {
    fun provideUserspaceBackend(
        @ApplicationContext context: Context
    ): Backend {
        return GoBackend(context)
    }
    @Provides
    @Singleton
-    @Kernel
+    fun provideVpnService(backend: Backend) : VpnService {
-    fun provideKernelBackend(
+        return WireGuardTunnel(backend)
        @ApplicationContext context: Context,
        rootShell: RootShell
    ): Backend {
        return WgQuickBackend(context, rootShell, ToolsInstaller(context, rootShell))
    }
    @Provides
    @Singleton
    fun provideVpnService(
        @Userspace userspaceBackend: Backend,
        @Kernel kernelBackend: Backend,
        settingsDoa: SettingsDoa
    ): VpnService {
        return WireGuardTunnel(userspaceBackend, kernelBackend, settingsDoa)
    }
 }
@@ -1,7 +0,0 @@
 package com.zaneschepke.wireguardautotunnel.module
 import javax.inject.Qualifier
@Qualifier
@Retention(AnnotationRetention.BINARY)
 annotation class Userspace
@@ -7,18 +7,16 @@ import com.zaneschepke.wireguardautotunnel.goAsync
 import com.zaneschepke.wireguardautotunnel.repository.SettingsDoa
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import kotlinx.coroutines.cancel
 import javax.inject.Inject
@AndroidEntryPoint
 class BootReceiver : BroadcastReceiver() {
    @Inject
    lateinit var settingsRepo : SettingsDoa
-    override fun onReceive(
+    override fun onReceive(context: Context, intent: Intent) = goAsync {
        context: Context,
        intent: Intent
    ) = goAsync {
        if (intent.action == Intent.ACTION_BOOT_COMPLETED) {
            try {
                val settings = settingsRepo.getAll()
@@ -8,19 +8,16 @@ import com.zaneschepke.wireguardautotunnel.goAsync
 import com.zaneschepke.wireguardautotunnel.repository.SettingsDoa
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import javax.inject.Inject
@AndroidEntryPoint
 class NotificationActionReceiver : BroadcastReceiver() {
    @Inject
    lateinit var settingsRepo : SettingsDoa
-
+    override fun onReceive(context: Context, intent: Intent?) = goAsync {
    override fun onReceive(
        context: Context,
        intent: Intent?
    ) = goAsync {
        try {
            val settings = settingsRepo.getAll()
            if (settings.isNotEmpty()) {
@@ -7,20 +7,11 @@ import androidx.room.TypeConverters
 import com.zaneschepke.wireguardautotunnel.repository.model.Settings
 import com.zaneschepke.wireguardautotunnel.repository.model.TunnelConfig
-@Database(
+@Database(entities = [Settings::class, TunnelConfig::class], version = 3, autoMigrations = [
-    entities = [Settings::class, TunnelConfig::class],
+    AutoMigration(from = 1, to = 2), AutoMigration(from = 2, to = 3)
-    version = 4,
+], exportSchema = true)
    autoMigrations = [
        AutoMigration(from = 1, to = 2), AutoMigration(from = 2, to = 3), AutoMigration(
            from = 3,
            to = 4
        )
    ],
    exportSchema = true
 )
@TypeConverters(DatabaseListConverters::class)
 abstract class AppDatabase : RoomDatabase() {
    abstract fun settingDao(): SettingsDoa
    abstract fun tunnelConfigDoa() : TunnelConfigDao
 }
@@ -9,7 +9,6 @@ class DatabaseListConverters {
    fun listToString(value: MutableList<String>): String {
        return Json.encodeToString(value)
    }
    @TypeConverter
    fun stringToList(value: String): MutableList<String> {
        if(value.isEmpty()) return mutableListOf()
@@ -10,6 +10,7 @@ import kotlinx.coroutines.flow.Flow
@Dao
 interface SettingsDoa {
    @Insert(onConflict = OnConflictStrategy.REPLACE)
    suspend fun save(t: Settings)
@@ -10,6 +10,7 @@ import kotlinx.coroutines.flow.Flow
@Dao
 interface TunnelConfigDao{
    @Insert(onConflict = OnConflictStrategy.REPLACE)
    suspend fun save(t: TunnelConfig)
@@ -1,39 +0,0 @@
 package com.zaneschepke.wireguardautotunnel.repository.datastore
 import android.content.Context
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.preferencesDataStore
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 class DataStoreManager(private val context: Context) {
    companion object {
        val LOCATION_DISCLOSURE_SHOWN = booleanPreferencesKey("LOCATION_DISCLOSURE_SHOWN")
    }
    // preferences
    private val preferencesKey = "preferences"
    private val Context.dataStore by preferencesDataStore(
        name = preferencesKey
    )
    suspend fun init() {
        context.dataStore.data.first()
    }
    suspend fun <T> saveToDataStore(key: Preferences.Key<T>, value: T) =
        context.dataStore.edit {
        it[key] = value
    }
    fun <T> getFromStore(key: Preferences.Key<T>) =
        context.dataStore.data.map {
        it[key]
    }
    val locationDisclosureFlow: Flow<Boolean?> = context.dataStore.data.map {
        it[LOCATION_DISCLOSURE_SHOWN]
    }
 }
@@ -13,30 +13,9 @@ data class Settings(
    @ColumnInfo(name = "default_tunnel") var defaultTunnel : String? = null,
    @ColumnInfo(name = "is_always_on_vpn_enabled") var isAlwaysOnVpnEnabled : Boolean = false,
    @ColumnInfo(name = "is_tunnel_on_ethernet_enabled") var isTunnelOnEthernetEnabled : Boolean = false,
-    @ColumnInfo(
+    @ColumnInfo(name = "is_shortcuts_enabled", defaultValue = "false") var isShortcutsEnabled : Boolean = false,
-        name = "is_shortcuts_enabled",
+    @ColumnInfo(name = "is_battery_saver_enabled", defaultValue = "false") var isBatterySaverEnabled : Boolean = false,
-        defaultValue = "false"
+    @ColumnInfo(name = "is_tunnel_on_wifi_enabled", defaultValue = "false") var isTunnelOnWifiEnabled : Boolean = false,
    ) var isShortcutsEnabled: Boolean = false,
    @ColumnInfo(
        name = "is_battery_saver_enabled",
        defaultValue = "false"
    ) var isBatterySaverEnabled: Boolean = false,
    @ColumnInfo(
        name = "is_tunnel_on_wifi_enabled",
        defaultValue = "false"
    ) var isTunnelOnWifiEnabled: Boolean = false,
    @ColumnInfo(
        name = "is_kernel_enabled",
        defaultValue = "false"
    ) var isKernelEnabled: Boolean = false,
    @ColumnInfo(
    name = "is_restore_on_boot_enabled",
    defaultValue = "false"
    ) var isRestoreOnBootEnabled: Boolean = false,
    @ColumnInfo(
    name = "is_multi_tunnel_enabled",
    defaultValue = "false"
    ) var isMultiTunnelEnabled: Boolean = false
 ) {
    fun isTunnelConfigDefault(tunnelConfig: TunnelConfig) : Boolean {
        return if (defaultTunnel != null) {
@@ -5,26 +5,27 @@ import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
 import com.wireguard.config.Config
 import java.io.InputStream
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import java.io.InputStream
@Entity(indices = [Index(value = ["name"], unique = true)])
@Serializable
 data class TunnelConfig(
    @PrimaryKey(autoGenerate = true) val id : Int = 0,
    @ColumnInfo(name = "name") var name : String,
-    @ColumnInfo(name = "wg_quick") var wgQuick: String
+    @ColumnInfo(name = "wg_quick") var wgQuick : String,
 ){
    override fun toString(): String {
        return Json.encodeToString(serializer(), this)
    }
    companion object {
        fun from(string : String) : TunnelConfig {
            return Json.decodeFromString<TunnelConfig>(string)
        }
        fun configFromQuick(wgQuick: String): Config {
            val inputStream: InputStream = wgQuick.byteInputStream()
            val reader = inputStream.bufferedReader(Charsets.UTF_8)
@@ -6,7 +6,9 @@ import android.os.IBinder
 import androidx.lifecycle.LifecycleService
 import timber.log.Timber
 open class ForegroundService : LifecycleService() {
    private var isServiceStarted = false
    override fun onBind(intent: Intent): IBinder? {
@@ -15,11 +17,7 @@ open class ForegroundService : LifecycleService() {
        return null
    }
-    override fun onStartCommand(
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
        intent: Intent?,
        flags: Int,
        startId: Int
    ): Int {
        super.onStartCommand(intent, flags, startId)
        Timber.d("onStartCommand executed with startId: $startId")
        if (intent != null) {
@@ -43,6 +41,7 @@ open class ForegroundService : LifecycleService() {
        return START_STICKY
    }
    override fun onDestroy() {
        super.onDestroy()
        Timber.d("The service has been destroyed")
@@ -16,24 +16,15 @@ object ServiceManager {
            .getRunningServices(Integer.MAX_VALUE)
            .any { it.service.className == service.name }
-    fun <T : Service> getServiceState(
+    fun <T : Service> getServiceState(context: Context, cls : Class<T>): ServiceState {
        context: Context,
        cls: Class<T>
    ): ServiceState {
        val isServiceRunning = context.isServiceRunning(cls)
        return if(isServiceRunning) ServiceState.STARTED else ServiceState.STOPPED
    }
-    private fun <T : Service> actionOnService(
+    private fun <T : Service> actionOnService(action: Action, context: Context, cls : Class<T>, extras : Map<String,String>? = null) {
        action: Action,
        context: Context,
        cls: Class<T>,
        extras: Map<String, String>? = null
    ) {
        if (getServiceState(context, cls) == ServiceState.STOPPED && action == Action.STOP) return
        if (getServiceState(context, cls) == ServiceState.STARTED && action == Action.START) return
-        val intent =
+        val intent = Intent(context, cls).also {
            Intent(context, cls).also {
            it.action = action.name
            extras?.forEach {(k, v) ->
                it.putExtra(k, v)
@@ -45,11 +36,9 @@ object ServiceManager {
                Action.START_FOREGROUND -> {
                    context.startForegroundService(intent)
                }
                Action.START -> {
                    context.startService(intent)
                }
                Action.STOP -> context.startService(intent)
            }
        } catch (e : Exception) {
@@ -57,18 +46,13 @@ object ServiceManager {
        }
    }
-    fun startVpnService(
+    fun startVpnService(context : Context, tunnelConfig : String) {
        context: Context,
        tunnelConfig: String
    ) {
        actionOnService(
            Action.START,
            context,
            WireGuardTunnelService::class.java,
-            mapOf(context.getString(R.string.tunnel_extras_key) to tunnelConfig)
+            mapOf(context.getString(R.string.tunnel_extras_key) to tunnelConfig))
        )
    }
    fun stopVpnService(context : Context) {
        actionOnService(
            Action.STOP,
@@ -77,68 +61,39 @@ object ServiceManager {
        )
    }
-    fun startVpnServiceForeground(
+    fun startVpnServiceForeground(context : Context, tunnelConfig : String) {
        context: Context,
        tunnelConfig: String
    ) {
        actionOnService(
            Action.START_FOREGROUND,
            context,
            WireGuardTunnelService::class.java,
-            mapOf(context.getString(R.string.tunnel_extras_key) to tunnelConfig)
+            mapOf(context.getString(R.string.tunnel_extras_key) to tunnelConfig))
        )
    }
-    private fun startWatcherServiceForeground(
+    private fun startWatcherServiceForeground(context : Context, tunnelConfig : String) {
        context: Context,
        tunnelConfig: String
    ) {
        actionOnService(
-            Action.START,
+            Action.START, context,
-            context,
+            WireGuardConnectivityWatcherService::class.java, mapOf(context.
-            WireGuardConnectivityWatcherService::class.java,
+            getString(R.string.tunnel_extras_key) to
-            mapOf(
+                    tunnelConfig))
                context
                    .getString(R.string.tunnel_extras_key) to
                        tunnelConfig
            )
        )
    }
-    fun startWatcherService(
+    fun startWatcherService(context : Context, tunnelConfig : String) {
        context: Context,
        tunnelConfig: String
    ) {
        actionOnService(
-            Action.START,
+            Action.START, context,
-            context,
+            WireGuardConnectivityWatcherService::class.java, mapOf(context.
-            WireGuardConnectivityWatcherService::class.java,
+            getString(R.string.tunnel_extras_key) to
-            mapOf(
+                    tunnelConfig))
                context
                    .getString(R.string.tunnel_extras_key) to
                        tunnelConfig
            )
        )
    }
    fun stopWatcherService(context : Context) {
        actionOnService(
-            Action.STOP,
+            Action.STOP, context,
-            context,
+            WireGuardConnectivityWatcherService::class.java)
            WireGuardConnectivityWatcherService::class.java
        )
    }
-    fun toggleWatcherServiceForeground(
+    fun toggleWatcherServiceForeground(context: Context, tunnelConfig : String) {
-        context: Context,
+        when(getServiceState( context,
-        tunnelConfig: String
+            WireGuardConnectivityWatcherService::class.java,)) {
    ) {
        when (
            getServiceState(
                context,
                WireGuardConnectivityWatcherService::class.java
            )
        ) {
            ServiceState.STARTED -> stopWatcherService(context)
            ServiceState.STOPPED -> startWatcherServiceForeground(context, tunnelConfig)
        }
@@ -7,7 +7,6 @@ import android.content.Intent
 import android.os.Bundle
 import android.os.PowerManager
 import android.os.SystemClock
 import androidx.core.app.ServiceCompat
 import androidx.lifecycle.lifecycleScope
 import com.wireguard.android.backend.Tunnel
 import com.zaneschepke.wireguardautotunnel.Constants
@@ -22,16 +21,17 @@ import com.zaneschepke.wireguardautotunnel.service.network.WifiService
 import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import timber.log.Timber
 import javax.inject.Inject
@AndroidEntryPoint
 class WireGuardConnectivityWatcherService : ForegroundService() {
    private val foregroundId = 122
    @Inject
@@ -64,20 +64,16 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
    private var wakeLock: PowerManager.WakeLock? = null
    private val tag = this.javaClass.name
    override fun onCreate() {
        super.onCreate()
        lifecycleScope.launch(Dispatchers.Main) {
            try {
            launchWatcherNotification()
            } catch (e: Exception) {
                Timber.e("Failed to start watcher service, not enough permissions")
            }
        }
    }
    override fun startService(extras: Bundle?) {
        super.startService(extras)
        try {
        launchWatcherNotification()
        val tunnelId = extras?.getString(getString(R.string.tunnel_extras_key))
        if (tunnelId != null) {
@@ -93,9 +89,6 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
        } else {
            stopService(extras)
        }
        } catch (e: Exception) {
            Timber.e("Failed to launch watcher service, no permissions")
        }
    }
    override fun stopService(extras: Bundle?) {
@@ -110,30 +103,21 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
    }
    private fun launchWatcherNotification() {
-        val notification =
+        val notification = notificationService.createNotification(
            notificationService.createNotification(
            channelId = getString(R.string.watcher_channel_id),
            channelName = getString(R.string.watcher_channel_name),
            description = getString(R.string.watcher_notification_text),
            vibration = false
        )
-        ServiceCompat.startForeground(
+        super.startForeground(foregroundId, notification)
            this,
            foregroundId,
            notification,
            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID
        )
    }
    //try to start task again if killed
    override fun onTaskRemoved(rootIntent: Intent) {
        Timber.d("Task Removed called")
        val restartServiceIntent = Intent(rootIntent)
-        val restartServicePendingIntent: PendingIntent =
+        val restartServicePendingIntent: PendingIntent = PendingIntent.getService(
-            PendingIntent.getService(
+            this, 1, restartServiceIntent,
                this,
                1,
                restartServiceIntent,
            PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
        )
        applicationContext.getSystemService(Context.ALARM_SERVICE)
@@ -147,8 +131,7 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
    }
    private suspend fun initWakeLock() {
-        val isBatterySaverOn =
+        val isBatterySaverOn = withContext(lifecycleScope.coroutineContext) {
            withContext(lifecycleScope.coroutineContext) {
            settingsRepo.getAll().firstOrNull()?.isBatterySaverEnabled ?: false
        }
        wakeLock =
@@ -172,8 +155,7 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
    }
    private fun startWatcherJob() {
-        watcherJob =
+        watcherJob = lifecycleScope.launch(Dispatchers.IO) {
            lifecycleScope.launch(Dispatchers.IO) {
            val settings = settingsRepo.getAll()
            if (settings.isNotEmpty()) {
                setting = settings[0]
@@ -250,9 +232,7 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
                is NetworkStatus.CapabilitiesChanged -> {
                    Timber.d("Wifi capabilities changed")
                    isWifiConnected = true
-                    val ssid = wifiService.getNetworkName(it.networkCapabilities) ?: ""
+                    currentNetworkSSID = wifiService.getNetworkName(it.networkCapabilities) ?: ""
                    Timber.d("Detected SSID: $ssid")
                    currentNetworkSSID = ssid
                }
                is NetworkStatus.Unavailable -> {
@@ -265,69 +245,36 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
    private suspend fun manageVpn() {
        while (true) {
-            when {
+            if (isEthernetConnected && setting.isTunnelOnEthernetEnabled && vpnService.getState() == Tunnel.State.DOWN) {
                (
                        (
                                isEthernetConnected &&
                                        setting.isTunnelOnEthernetEnabled &&
                                        vpnService.getState() == Tunnel.State.DOWN
                                )
                        ) ->
                ServiceManager.startVpnService(this, tunnelConfig)
-
+            }
-                (
+            if (!isEthernetConnected && setting.isTunnelOnMobileDataEnabled &&
                        !isEthernetConnected &&
                                setting.isTunnelOnMobileDataEnabled &&
                !isWifiConnected &&
-                                isMobileDataConnected &&
+                isMobileDataConnected
-                                vpnService.getState() == Tunnel.State.DOWN
+                && vpnService.getState() == Tunnel.State.DOWN
-                        ) ->
+            ) {
                ServiceManager.startVpnService(this, tunnelConfig)
-
+            } else if (!isEthernetConnected && !setting.isTunnelOnMobileDataEnabled &&
                (
                        !isEthernetConnected &&
                                !setting.isTunnelOnMobileDataEnabled &&
                !isWifiConnected &&
                vpnService.getState() == Tunnel.State.UP
-                        ) ->
+            ) {
                ServiceManager.stopVpnService(this)
-
+            } else if (!isEthernetConnected && isWifiConnected &&
                (
                        !isEthernetConnected && isWifiConnected &&
                !setting.trustedNetworkSSIDs.contains(currentNetworkSSID) &&
                setting.isTunnelOnWifiEnabled &&
                (vpnService.getState() != Tunnel.State.UP)
-                        ) ->
+            ) {
                ServiceManager.startVpnService(this, tunnelConfig)
-
+            } else if (!isEthernetConnected && (isWifiConnected &&
-                (
+                        setting.trustedNetworkSSIDs.contains(currentNetworkSSID)) &&
                        !isEthernetConnected && (
                                isWifiConnected &&
                                        setting.trustedNetworkSSIDs.contains(currentNetworkSSID)
                                ) &&
                (vpnService.getState() == Tunnel.State.UP)
-                        ) ->
+            ) {
                ServiceManager.stopVpnService(this)
-
+            } else if (!isEthernetConnected && (isWifiConnected &&
                (
                        !isEthernetConnected && (
                                isWifiConnected &&
                        !setting.isTunnelOnWifiEnabled &&
                (vpnService.getState() == Tunnel.State.UP)
-                                )
+            )) {
                        ) ->
                ServiceManager.stopVpnService(this)
                (
                        !isEthernetConnected && !isWifiConnected &&
                                !isMobileDataConnected &&
                                (vpnService.getState() == Tunnel.State.UP)
                        ) ->
                    ServiceManager.stopVpnService(this)
                else -> {
                    // Do nothing
                }
            }
            delay(Constants.VPN_CONNECTIVITY_CHECK_INTERVAL)
        }
@@ -3,9 +3,7 @@ package com.zaneschepke.wireguardautotunnel.service.foreground
 import android.app.PendingIntent
 import android.content.Intent
 import android.os.Bundle
 import androidx.core.app.ServiceCompat
 import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.Constants
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.receiver.NotificationActionReceiver
 import com.zaneschepke.wireguardautotunnel.repository.SettingsDoa
@@ -14,14 +12,15 @@ import com.zaneschepke.wireguardautotunnel.service.notification.NotificationServ
 import com.zaneschepke.wireguardautotunnel.service.tunnel.HandshakeStatus
 import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
@AndroidEntryPoint
 class WireGuardTunnelService : ForegroundService() {
    private val foregroundId = 123
    @Inject
@@ -49,8 +48,7 @@ class WireGuardTunnelService : ForegroundService() {
        launchVpnStartingNotification()
        val tunnelConfigString = extras?.getString(getString(R.string.tunnel_extras_key))
        cancelJob()
-        job =
+        job = lifecycleScope.launch(Dispatchers.IO) {
            lifecycleScope.launch(Dispatchers.IO) {
            launch {
                if(tunnelConfigString != null) {
                    try {
@@ -83,26 +81,20 @@ class WireGuardTunnelService : ForegroundService() {
                        }
                        HandshakeStatus.NEVER_CONNECTED -> {
                            if(!didShowFailedHandshakeNotification) {
-                                    launchVpnConnectionFailedNotification(
+                                launchVpnConnectionFailedNotification(getString(R.string.initial_connection_failure_message))
                                        getString(R.string.initial_connection_failure_message)
                                    )
                                didShowFailedHandshakeNotification = true
                                didShowConnected = false
                            }
                        }
                        HandshakeStatus.HEALTHY -> {
                            if(!didShowConnected) {
                                launchVpnConnectedNotification()
                                didShowConnected = true
                            }
                        }
                            HandshakeStatus.STALE -> {}
                        HandshakeStatus.UNHEALTHY -> {
                            if(!didShowFailedHandshakeNotification) {
-                                    launchVpnConnectionFailedNotification(
+                                launchVpnConnectionFailedNotification(getString(R.string.lost_connection_failure_message))
                                        getString(R.string.lost_connection_failure_message)
                                    )
                                didShowFailedHandshakeNotification = true
                                didShowConnected = false
                            }
@@ -123,8 +115,7 @@ class WireGuardTunnelService : ForegroundService() {
    }
    private fun launchVpnConnectedNotification() {
-        val notification =
+        val notification = notificationService.createNotification(
            notificationService.createNotification(
            channelId = getString(R.string.vpn_channel_id),
            channelName = getString(R.string.vpn_channel_name),
            title = getString(R.string.tunnel_start_title),
@@ -133,17 +124,11 @@ class WireGuardTunnelService : ForegroundService() {
            showTimestamp = true,
            description = "${getString(R.string.tunnel_start_text)} $tunnelName"
        )
-        ServiceCompat.startForeground(
+        super.startForeground(foregroundId, notification)
            this,
            foregroundId,
            notification,
            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID
        )
    }
    private fun launchVpnStartingNotification() {
-        val notification =
+        val notification = notificationService.createNotification(
            notificationService.createNotification(
            channelId = getString(R.string.vpn_channel_id),
            channelName = getString(R.string.vpn_channel_name),
            title = getString(R.string.vpn_starting),
@@ -152,26 +137,15 @@ class WireGuardTunnelService : ForegroundService() {
            showTimestamp = true,
            description = getString(R.string.attempt_connection)
        )
-        ServiceCompat.startForeground(
+        super.startForeground(foregroundId, notification)
            this,
            foregroundId,
            notification,
            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID
        )
    }
    private fun launchVpnConnectionFailedNotification(message : String) {
-        val notification =
+        val notification = notificationService.createNotification(
            notificationService.createNotification(
            channelId = getString(R.string.vpn_channel_id),
            channelName = getString(R.string.vpn_channel_name),
-                action =
+            action = PendingIntent.getBroadcast(this,0,
-                PendingIntent.getBroadcast(
+                Intent(this, NotificationActionReceiver::class.java),PendingIntent.FLAG_IMMUTABLE),
                    this,
                    0,
                    Intent(this, NotificationActionReceiver::class.java),
                    PendingIntent.FLAG_IMMUTABLE
                ),
            actionText = getString(R.string.restart),
            title = getString(R.string.vpn_connection_failed),
            onGoing = false,
@@ -182,6 +156,7 @@ class WireGuardTunnelService : ForegroundService() {
        super.startForeground(foregroundId, notification)
    }
    private fun cancelJob() {
        if(this::job.isInitialized) {
            job.cancel()
@@ -14,20 +14,16 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.map
-abstract class BaseNetworkService<T : BaseNetworkService<T>>(
+
-    val context: Context,
+abstract class BaseNetworkService<T : BaseNetworkService<T>>(val context: Context, networkCapability : Int) : NetworkService<T> {
    networkCapability: Int
 ) : NetworkService<T> {
    private val connectivityManager =
        context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
    private val wifiManager =
        context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
-    override val networkStatus =
+    override val networkStatus = callbackFlow {
-        callbackFlow {
+        val networkStatusCallback = when (Build.VERSION.SDK_INT) {
            val networkStatusCallback =
                when (Build.VERSION.SDK_INT) {
            in Build.VERSION_CODES.S..Int.MAX_VALUE -> {
                object : ConnectivityManager.NetworkCallback(
                    FLAG_INCLUDE_LOCATION_INFO
@@ -44,18 +40,14 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
                        network: Network,
                        networkCapabilities: NetworkCapabilities
                    ) {
-                                trySend(
+                        trySend(NetworkStatus.CapabilitiesChanged(network, networkCapabilities))
                                    NetworkStatus.CapabilitiesChanged(
                                        network,
                                        networkCapabilities
                                    )
                                )
                    }
                }
            }
            else -> {
                object : ConnectivityManager.NetworkCallback() {
                    override fun onAvailable(network: Network) {
                        trySend(NetworkStatus.Available(network))
                    }
@@ -68,18 +60,12 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
                        network: Network,
                        networkCapabilities: NetworkCapabilities
                    ) {
-                                trySend(
+                        trySend(NetworkStatus.CapabilitiesChanged(network, networkCapabilities))
                                    NetworkStatus.CapabilitiesChanged(
                                        network,
                                        networkCapabilities
                                    )
                                )
                    }
                }
            }
        }
-            val request =
+        val request = NetworkRequest.Builder()
                NetworkRequest.Builder()
            .addTransportType(networkCapability)
            .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
            .addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
@@ -91,6 +77,7 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
        }
    }
    override fun getNetworkName(networkCapabilities: NetworkCapabilities): String? {
        var ssid: String? = getWifiNameFromCapabilities(networkCapabilities)
        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
@@ -102,6 +89,7 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
        return ssid?.trim('"')
    }
    companion object {
        private fun getWifiNameFromCapabilities(networkCapabilities: NetworkCapabilities): String? {
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
@@ -119,18 +107,11 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
 inline fun <Result> Flow<NetworkStatus>.map(
    crossinline onUnavailable: suspend (network : Network) -> Result,
    crossinline onAvailable: suspend (network : Network) -> Result,
-    crossinline onCapabilitiesChanged: suspend (
+    crossinline onCapabilitiesChanged: suspend (network : Network, networkCapabilities : NetworkCapabilities) -> Result,
-        network: Network,
+): Flow<Result> = map { status ->
        networkCapabilities: NetworkCapabilities
    ) -> Result
 ): Flow<Result> =
    map { status ->
    when (status) {
        is NetworkStatus.Unavailable -> onUnavailable(status.network)
        is NetworkStatus.Available -> onAvailable(status.network)
-            is NetworkStatus.CapabilitiesChanged -> onCapabilitiesChanged(
+        is NetworkStatus.CapabilitiesChanged -> onCapabilitiesChanged(status.network, status.networkCapabilities)
                status.network,
                status.networkCapabilities
            )
    }
 }
@@ -5,9 +5,6 @@ import android.net.NetworkCapabilities
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
-class EthernetService
+class EthernetService @Inject constructor(@ApplicationContext context: Context) :
-@Inject
+    BaseNetworkService<EthernetService>(context, NetworkCapabilities.TRANSPORT_ETHERNET) {
-constructor(
+}
    @ApplicationContext context: Context
 ) :
    BaseNetworkService<EthernetService>(context, NetworkCapabilities.TRANSPORT_ETHERNET)
@@ -5,9 +5,6 @@ import android.net.NetworkCapabilities
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
-class MobileDataService
+class MobileDataService @Inject constructor(@ApplicationContext context: Context) :
-@Inject
+    BaseNetworkService<MobileDataService>(context, NetworkCapabilities.TRANSPORT_CELLULAR) {
-constructor(
+}
    @ApplicationContext context: Context
 ) :
    BaseNetworkService<MobileDataService>(context, NetworkCapabilities.TRANSPORT_CELLULAR)
@@ -5,6 +5,5 @@ import kotlinx.coroutines.flow.Flow
 interface NetworkService<T> {
    fun getNetworkName(networkCapabilities: NetworkCapabilities): String?
    val networkStatus: Flow<NetworkStatus>
 }
@@ -5,9 +5,6 @@ import android.net.NetworkCapabilities
 sealed class NetworkStatus {
    class Available(val network : Network) : NetworkStatus()
    class Unavailable(val network : Network) : NetworkStatus()
-
+    class CapabilitiesChanged(val network : Network, val networkCapabilities : NetworkCapabilities) : NetworkStatus()
    class CapabilitiesChanged(val network: Network, val networkCapabilities: NetworkCapabilities) :
        NetworkStatus()
 }
@@ -5,9 +5,6 @@ import android.net.NetworkCapabilities
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
-class WifiService
+class WifiService @Inject constructor(@ApplicationContext context: Context) :
-@Inject
+    BaseNetworkService<WifiService>(context, NetworkCapabilities.TRANSPORT_WIFI) {
-constructor(
+}
    @ApplicationContext context: Context
 ) :
    BaseNetworkService<WifiService>(context, NetworkCapabilities.TRANSPORT_WIFI)
@@ -12,13 +12,9 @@ import com.zaneschepke.wireguardautotunnel.ui.MainActivity
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
-class WireGuardNotification
+class WireGuardNotification @Inject constructor(@ApplicationContext private val context: Context) : NotificationService {
-@Inject
+
-constructor(
+    private val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
    @ApplicationContext private val context: Context
 ) : NotificationService {
    private val notificationManager =
        context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
    override fun createNotification(
        channelId: String,
@@ -33,8 +29,7 @@ constructor(
        onGoing: Boolean,
        lights: Boolean
    ): Notification {
-        val channel =
+        val channel = NotificationChannel(
            NotificationChannel(
            channelId,
            channelName,
            importance
@@ -67,8 +62,7 @@ constructor(
                //TODO find a not deprecated way to do this
                it.addAction(
                    Notification.Action.Builder(0, actionText, action)
-                        .build()
+                        .build())
                )
                    it.setAutoCancel(true)
            }
                it.setContentTitle(title)
@@ -12,13 +12,14 @@ import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.foreground.WireGuardTunnelService
 import com.zaneschepke.wireguardautotunnel.util.WgTunnelException
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
@AndroidEntryPoint
 class ShortcutsActivity : ComponentActivity() {
    @Inject
    lateinit var settingsRepo : SettingsDoa
@@ -37,15 +38,13 @@ class ShortcutsActivity : ComponentActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        if(intent.getStringExtra(CLASS_NAME_EXTRA_KEY)
-                .equals(WireGuardTunnelService::class.java.simpleName)
+            .equals(WireGuardTunnelService::class.java.simpleName)) {
        ) {
            lifecycleScope.launch(Dispatchers.Main) {
                val settings = getSettings()
                if(settings.isShortcutsEnabled) {
                    try {
                        val tunnelName = intent.getStringExtra(TUNNEL_NAME_EXTRA_KEY)
-                        val tunnelConfig =
+                        val tunnelConfig = if(tunnelName != null) {
                            if (tunnelName != null) {
                            tunnelConfigRepo.getAll().firstOrNull { it.name == tunnelName }
                        } else {
                            if(settings.defaultTunnel == null) {
@@ -57,13 +56,8 @@ class ShortcutsActivity : ComponentActivity() {
                        tunnelConfig ?: return@launch
                        attemptWatcherServiceToggle(tunnelConfig.toString())
                        when(intent.action){
-                            Action.STOP.name -> ServiceManager.stopVpnService(
+                            Action.STOP.name -> ServiceManager.stopVpnService(this@ShortcutsActivity)
-                                this@ShortcutsActivity
+                            Action.START.name -> ServiceManager.startVpnService(this@ShortcutsActivity, tunnelConfig.toString())
                            )
                            Action.START.name -> ServiceManager.startVpnService(
                                this@ShortcutsActivity,
                                tunnelConfig.toString()
                            )
                        }
                    } catch (e : Exception) {
                        Timber.e(e.message)
@@ -82,7 +76,6 @@ class ShortcutsActivity : ComponentActivity() {
            throw WgTunnelException("Settings empty")
        }
    }
    companion object {
        const val TUNNEL_NAME_EXTRA_KEY = "tunnelName"
        const val CLASS_NAME_EXTRA_KEY = "className"
@@ -11,16 +11,17 @@ import com.zaneschepke.wireguardautotunnel.repository.model.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
@AndroidEntryPoint
 class TunnelControlTile : TileService() {
    @Inject
    lateinit var settingsRepo : SettingsDoa
@@ -35,8 +36,7 @@ class TunnelControlTile : TileService() {
    private lateinit var job : Job
    override fun onStartListening() {
-        job =
+        job = scope.launch {
            scope.launch {
            updateTileState()
        }
        super.onStartListening()
@@ -63,10 +63,7 @@ class TunnelControlTile : TileService() {
                        if(vpnService.getState() == Tunnel.State.UP) {
                            ServiceManager.stopVpnService(this@TunnelControlTile)
                        } else {
-                            ServiceManager.startVpnServiceForeground(
+                            ServiceManager.startVpnServiceForeground(this@TunnelControlTile, tunnel.toString())
                                this@TunnelControlTile,
                                tunnel.toString()
                            )
                        }
                    }
                } catch (e : Exception) {
@@ -83,13 +80,11 @@ class TunnelControlTile : TileService() {
        val settings = settingsRepo.getAll()
        if (settings.isNotEmpty()) {
            val setting = settings.first()
-            tunnelConfig =
+            tunnelConfig = if (setting.defaultTunnel != null) {
                if (setting.defaultTunnel != null) {
                TunnelConfig.from(setting.defaultTunnel!!)
            } else {
                val configs = configRepo.getAll()
-                    val config =
+                val config  = if(configs.isNotEmpty()) {
                        if (configs.isNotEmpty()) {
                    configs.first()
                } else {
                    null
@@ -100,16 +95,14 @@ class TunnelControlTile : TileService() {
        return tunnelConfig
    }
    private fun attemptWatcherServiceToggle(tunnelConfig : String) {
        scope.launch {
            val settings = settingsRepo.getAll()
            if (settings.isNotEmpty()) {
                val setting = settings.first()
                if(setting.isAutoTunnelEnabled) {
-                    ServiceManager.toggleWatcherServiceForeground(
+                    ServiceManager.toggleWatcherServiceForeground(this@TunnelControlTile, tunnelConfig)
                        this@TunnelControlTile,
                        tunnelConfig
                    )
                }
            }
        }
@@ -122,19 +115,15 @@ class TunnelControlTile : TileService() {
                    Tunnel.State.UP -> {
                        qsTile.state = Tile.STATE_ACTIVE
                    }
                    Tunnel.State.DOWN -> {
                        qsTile.state = Tile.STATE_INACTIVE
                    }
                    else -> {
                        qsTile.state = Tile.STATE_UNAVAILABLE
                    }
                }
                val config = determineTileTunnel()
-                setTileDescription(
+                setTileDescription(config?.name ?: this.resources.getString(R.string.no_tunnel_available))
                    config?.name ?: this.resources.getString(R.string.no_tunnel_available)
                )
                qsTile.updateTile()
            } catch (e : Exception) {
                Timber.e("Unable to update tile state")
@@ -2,16 +2,13 @@ package com.zaneschepke.wireguardautotunnel.service.tunnel
 enum class HandshakeStatus {
    HEALTHY,
    STALE,
    UNHEALTHY,
    NEVER_CONNECTED,
-    NOT_STARTED
+    NOT_STARTED;
    ;
    companion object {
-        private const val WG_TYPICAL_HANDSHAKE_INTERVAL_WHEN_HEALTHY_SEC = 180
+        private const val WG_TYPICAL_HANDSHAKE_INTERVAL_WHEN_HEALTHY_SEC = 120
-        const val STATUS_CHANGE_TIME_BUFFER = 30
+        const val UNHEALTHY_TIME_LIMIT_SEC = WG_TYPICAL_HANDSHAKE_INTERVAL_WHEN_HEALTHY_SEC + 60
        const val STALE_TIME_LIMIT_SEC = WG_TYPICAL_HANDSHAKE_INTERVAL_WHEN_HEALTHY_SEC + STATUS_CHANGE_TIME_BUFFER
        const val NEVER_CONNECTED_TO_UNHEALTHY_TIME_LIMIT_SEC = 30
    }
 }
@@ -8,14 +8,11 @@ import kotlinx.coroutines.flow.SharedFlow
 interface VpnService : Tunnel {
    suspend fun startTunnel(tunnelConfig : TunnelConfig) : Tunnel.State
    suspend fun stopTunnel()
    val state : SharedFlow<Tunnel.State>
    val tunnelName : SharedFlow<String>
    val statistics : SharedFlow<Statistics>
    val lastHandshake : SharedFlow<Map<Key,Long>>
    val handshakeStatus : SharedFlow<HandshakeStatus>
    fun getState() : Tunnel.State
 }
@@ -4,15 +4,10 @@ import com.wireguard.android.backend.Backend
 import com.wireguard.android.backend.BackendException
 import com.wireguard.android.backend.Statistics
 import com.wireguard.android.backend.Tunnel
 import com.wireguard.config.Config
 import com.wireguard.crypto.Key
 import com.zaneschepke.wireguardautotunnel.Constants
 import com.zaneschepke.wireguardautotunnel.module.Kernel
 import com.zaneschepke.wireguardautotunnel.module.Userspace
 import com.zaneschepke.wireguardautotunnel.repository.SettingsDoa
 import com.zaneschepke.wireguardautotunnel.repository.model.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.util.NumberUtils
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -25,28 +20,20 @@ import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
 class WireGuardTunnel @Inject constructor(private val backend : Backend) : VpnService {
 class WireGuardTunnel
@Inject
 constructor(
    @Userspace private val userspaceBackend: Backend,
    @Kernel private val kernelBackend: Backend,
    private val settingsRepo: SettingsDoa
 ) : VpnService {
    private val _tunnelName = MutableStateFlow("")
    override val tunnelName get() = _tunnelName.asStateFlow()
-    private val _state =
+    private val _state = MutableSharedFlow<Tunnel.State>(
        MutableSharedFlow<Tunnel.State>(
        onBufferOverflow = BufferOverflow.DROP_OLDEST,
-            replay = 1
+        replay = 1)
        )
-    private val _handshakeStatus =
+    private val _handshakeStatus = MutableSharedFlow<HandshakeStatus>(replay = 1,
-        MutableSharedFlow<HandshakeStatus>(
+        onBufferOverflow = BufferOverflow.DROP_OLDEST)
            replay = 1,
            onBufferOverflow = BufferOverflow.DROP_OLDEST
        )
    override val state get() = _state.asSharedFlow()
    private val _statistics = MutableSharedFlow<Statistics>(replay = 1)
@@ -62,40 +49,14 @@ constructor(
    private lateinit var statsJob : Job
    private var config: Config? = null
    private var backend: Backend = userspaceBackend
    private var backendIsUserspace = true
    init {
        scope.launch {
            settingsRepo.getAllFlow().collect {
                val settings = it.first()
                if (settings.isKernelEnabled && backendIsUserspace) {
                    Timber.d("Setting kernel backend")
                    backend = kernelBackend
                    backendIsUserspace = false
                } else if (!settings.isKernelEnabled && !backendIsUserspace) {
                    Timber.d("Setting userspace backend")
                    backend = userspaceBackend
                    backendIsUserspace = true
                }
            }
        }
    }
    override suspend fun startTunnel(tunnelConfig: TunnelConfig) : Tunnel.State{
        return try {
            stopTunnelOnConfigChange(tunnelConfig)
            emitTunnelName(tunnelConfig.name)
-            config = TunnelConfig.configFromQuick(tunnelConfig.wgQuick)
+            val config = TunnelConfig.configFromQuick(tunnelConfig.wgQuick)
-            val state =
+            val state = backend.setState(
-                backend.setState(
+                this, Tunnel.State.UP, config)
                    this,
                    Tunnel.State.UP,
                    config
                )
            _state.emit(state)
            state
        } catch (e : Exception) {
@@ -137,17 +98,15 @@ constructor(
        val tunnel = this
        _state.tryEmit(state)
        if(state == Tunnel.State.UP) {
-            statsJob =
+            statsJob = scope.launch {
                scope.launch {
                val handshakeMap = HashMap<Key, Long>()
                var neverHadHandshakeCounter = 0
                while (true) {
                    val statistics = backend.getStatistics(tunnel)
                    _statistics.emit(statistics)
-                        statistics.peers().forEach { key ->
+                    statistics.peers().forEach {
-                            val handshakeEpoch =
+                        val handshakeEpoch = statistics.peer(it)?.latestHandshakeEpochMillis ?: 0L
-                                statistics.peer(key)?.latestHandshakeEpochMillis ?: 0L
+                        handshakeMap[it] = handshakeEpoch
                            handshakeMap[key] = handshakeEpoch
                        if(handshakeEpoch == 0L) {
                            if(neverHadHandshakeCounter >= HandshakeStatus.NEVER_CONNECTED_TO_UNHEALTHY_TIME_LIMIT_SEC) {
                                _handshakeStatus.emit(HandshakeStatus.NEVER_CONNECTED)
@@ -159,18 +118,12 @@ constructor(
                            }
                            return@forEach
                        }
-                            // TODO one day make each peer have their own dedicated status
+                        if((NumberUtils.getSecondsBetweenTimestampAndNow(handshakeEpoch) ?: 0L) >= HandshakeStatus.UNHEALTHY_TIME_LIMIT_SEC) {
-                            val lastHandshake = NumberUtils.getSecondsBetweenTimestampAndNow(
+                            _handshakeStatus.emit(HandshakeStatus.UNHEALTHY)
                                handshakeEpoch
                            )
                            if (lastHandshake != null) {
                                if (lastHandshake >= HandshakeStatus.STALE_TIME_LIMIT_SEC) {
                                    _handshakeStatus.emit(HandshakeStatus.STALE)
                        } else {
                            _handshakeStatus.emit(HandshakeStatus.HEALTHY)
                        }
                    }
                        }
                    _lastHandshake.emit(handshakeMap)
                    delay(Constants.VPN_STATISTIC_CHECK_INTERVAL)
                }
@@ -184,4 +137,6 @@ constructor(
            _lastHandshake.tryEmit(emptyMap())
        }
    }
 }
@@ -1,8 +0,0 @@
 package com.zaneschepke.wireguardautotunnel.ui
 import androidx.lifecycle.ViewModel
 import javax.inject.Inject
 class ActivityViewModel @Inject constructor() : ViewModel() {
    // TODO move shared logic to shared viewmodel
 }
@@ -12,6 +12,7 @@ import androidx.activity.compose.setContent
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.animation.ExitTransition
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.slideInHorizontally
@@ -58,14 +59,13 @@ import timber.log.Timber
@AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
-    @OptIn(
+
    @OptIn(ExperimentalAnimationApi::class,
        ExperimentalPermissionsApi::class
    )
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        setContent {
            // TODO move shared logic to shared viewmodel
            // val sharedViewModel = hiltViewModel<ActivityViewModel>()
            val navController = rememberNavController()
            val focusRequester = remember { FocusRequester() }
@@ -84,72 +84,54 @@ class MainActivity : AppCompatActivity() {
                }
                var vpnIntent by remember { mutableStateOf(GoBackend.VpnService.prepare(this)) }
-                val vpnActivityResultState =
+                val vpnActivityResultState = rememberLauncherForActivityResult(
                    rememberLauncherForActivityResult(
                    ActivityResultContracts.StartActivityForResult(),
                    onResult = {
                        val accepted = (it.resultCode == RESULT_OK)
                        if (accepted) {
                            vpnIntent = null
                        }
-                        }
+                    })
                    )
                LaunchedEffect(vpnIntent) {
                    if (vpnIntent != null) {
                        vpnActivityResultState.launch(vpnIntent)
-                    } else {
+                    } else requestNotificationPermission()
                        requestNotificationPermission()
                    }
                }
                fun showSnackBarMessage(message : String) {
                    lifecycleScope.launch(Dispatchers.Main) {
-                        val result =
+                        val result = snackbarHostState.showSnackbar(
                            snackbarHostState.showSnackbar(
                            message = message,
                            actionLabel = applicationContext.getString(R.string.okay),
-                                duration = SnackbarDuration.Short
+                            duration = SnackbarDuration.Short,
                        )
                        when (result) {
-                            SnackbarResult.ActionPerformed -> {
+                            SnackbarResult.ActionPerformed -> { snackbarHostState.currentSnackbarData?.dismiss() }
-                                snackbarHostState.currentSnackbarData?.dismiss()
+                            SnackbarResult.Dismissed -> { snackbarHostState.currentSnackbarData?.dismiss() }
                            }
                            SnackbarResult.Dismissed -> {
                                snackbarHostState.currentSnackbarData?.dismiss()
                            }
                        }
                    }
                }
-                Scaffold(
+                Scaffold(snackbarHost = {
                    snackbarHost = {
                        SnackbarHost(snackbarHostState) { snackbarData: SnackbarData ->
                            CustomSnackBar(
                                snackbarData.visuals.message,
                                isRtl = false,
-                                containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(
+                                containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)
                                    2.dp
                                )
                            )
                        }
                    },
-                    modifier =
+                    modifier = Modifier.onKeyEvent {
                    Modifier.onKeyEvent {
                        if (it.nativeKeyEvent.action == KeyEvent.ACTION_UP) {
                            when (it.nativeKeyEvent.keyCode) {
                                KeyEvent.KEYCODE_DPAD_UP -> {
                                    try {
                                        focusRequester.requestFocus()
                                    } catch(e : IllegalStateException) {
-                                        Timber.e(
+                                        Timber.e("No D-Pad focus request modifier added to element on screen")
                                            "No D-Pad focus request modifier added to element on screen"
                                        )
                                    }
                                    false
-                                }
+                                } else -> {
                                else -> {
                                   false
                                }
                            }
@@ -157,13 +139,13 @@ class MainActivity : AppCompatActivity() {
                            false
                        }
                    },
-                    bottomBar =
+                    bottomBar = if (vpnIntent == null && notificationPermissionState.status.isGranted) {
                    if (vpnIntent == null && notificationPermissionState.status.isGranted) {
                        { BottomNavBar(navController, Routes.navItems) }
                    } else {
                        {}
-                    }
+                    },
-                ) { padding ->
+                )
                { padding ->
                    if (vpnIntent != null) {
                        PermissionRequestFailedScreen(
                            padding = padding,
@@ -180,11 +162,7 @@ class MainActivity : AppCompatActivity() {
                                val intentSettings =
                                    Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
                                intentSettings.data =
-                                    Uri.fromParts(
+                                    Uri.fromParts(Constants.URI_PACKAGE_SCHEME, this.packageName, null)
                                        Constants.URI_PACKAGE_SCHEME,
                                        this.packageName,
                                        null
                                    )
                                startActivity(intentSettings)
                            },
                            message = getString(R.string.notification_permission_required),
@@ -194,36 +172,23 @@ class MainActivity : AppCompatActivity() {
                    }
                    NavHost(navController, startDestination = Routes.Main.name) {
-                        composable(
+                        composable(Routes.Main.name, enterTransition = {
                            Routes.Main.name,
                            enterTransition = {
                            when (initialState.destination.route) {
                                Routes.Settings.name, Routes.Support.name ->
                                    slideInHorizontally(
-                                            initialOffsetX = {
+                                        initialOffsetX = { -Constants.SLIDE_IN_TRANSITION_OFFSET },
-                                                -Constants.SLIDE_IN_TRANSITION_OFFSET
+                                        animationSpec = tween(Constants.SLIDE_IN_ANIMATION_DURATION)
                                            },
                                            animationSpec = tween(
                                                Constants.SLIDE_IN_ANIMATION_DURATION
                                            )
                                    )
                                else -> {
-                                        fadeIn(
+                                    fadeIn(animationSpec = tween(Constants.FADE_IN_ANIMATION_DURATION))
                                            animationSpec = tween(
                                                Constants.FADE_IN_ANIMATION_DURATION
                                            )
                                        )
                                }
                            }
-                            },
+                        }, exitTransition = {
                            exitTransition = {
                            ExitTransition.None
                        }
                            ) {
-                            MainScreen(padding = padding, showSnackbarMessage = { message ->
+                            MainScreen(padding = padding, showSnackbarMessage = { message -> showSnackBarMessage(message) }, navController = navController)
                                showSnackBarMessage(message)
                            }, navController = navController)
                        }
                        composable(Routes.Settings.name, enterTransition = {
                            when (initialState.destination.route) {
@@ -241,16 +206,10 @@ class MainActivity : AppCompatActivity() {
                                }
                                else -> {
-                                    fadeIn(
+                                    fadeIn(animationSpec = tween(Constants.FADE_IN_ANIMATION_DURATION))
                                        animationSpec = tween(Constants.FADE_IN_ANIMATION_DURATION)
                                    )
                                }
                            }
-                        }) {
+                        }) { SettingsScreen(padding = padding, showSnackbarMessage = { message -> showSnackBarMessage(message) }, focusRequester = focusRequester) }
                            SettingsScreen(padding = padding, showSnackbarMessage = { message ->
                                showSnackBarMessage(message)
                            }, focusRequester = focusRequester)
                        }
                        composable(Routes.Support.name, enterTransition = {
                            when (initialState.destination.route) {
                                Routes.Settings.name, Routes.Main.name ->
@@ -260,26 +219,16 @@ class MainActivity : AppCompatActivity() {
                                    )
                                else -> {
-                                    fadeIn(
+                                    fadeIn(animationSpec = tween(Constants.FADE_IN_ANIMATION_DURATION))
                                        animationSpec = tween(Constants.FADE_IN_ANIMATION_DURATION)
                                    )
                                }
                            }
-                        }) { SupportScreen(padding = padding, focusRequester = focusRequester) }
+                        }) { SupportScreen(padding = padding, focusRequester) }
                        composable("${Routes.Config.name}/{id}", enterTransition = {
                            fadeIn(animationSpec = tween(Constants.FADE_IN_ANIMATION_DURATION))
-                        }) {
+                        }) { it ->
                            val id = it.arguments?.getString("id")
                            if(!id.isNullOrBlank()) {
-                                ConfigScreen(
+                                ConfigScreen(navController = navController, id = id, showSnackbarMessage = { message -> showSnackBarMessage(message) }, focusRequester = focusRequester)}
                                    navController = navController,
                                    id = id,
                                    showSnackbarMessage = { message ->
                                        showSnackBarMessage(message)
                                    },
                                    focusRequester = focusRequester
                                )
                            }
                        }
                    }
                }
@@ -10,26 +10,25 @@ enum class Routes {
    Main,
    Settings,
    Support,
-    Config
+    Config;
-    ;
+
    companion object {
-        val navItems =
+        val navItems = listOf(
            listOf(
            BottomNavItem(
                name = "Tunnels",
                route = Main.name,
-                    icon = Icons.Rounded.Home
+                icon = Icons.Rounded.Home,
            ),
            BottomNavItem(
                name = "Settings",
                route = Settings.name,
-                    icon = Icons.Rounded.Settings
+                icon = Icons.Rounded.Settings,
            ),
            BottomNavItem(
                name = "Support",
                route = Support.name,
-                    icon = Icons.Rounded.QuestionMark
+                icon = Icons.Rounded.QuestionMark,
            )
        )
    }
@@ -1,10 +1,8 @@
 package com.zaneschepke.wireguardautotunnel.ui.common
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
@@ -13,27 +11,19 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import com.zaneschepke.wireguardautotunnel.R
@Composable
-fun ClickableIconButton(
+fun ClickableIconButton(onIconClick : () -> Unit, text : String, icon : ImageVector, enabled : Boolean) {
-    onIconClick: () -> Unit,
+    TextButton(onClick = {},
    text: String,
    icon: ImageVector,
    enabled: Boolean
 ) {
    TextButton(
        onClick = {},
        enabled = enabled
    ) {
-        Text(text, Modifier.weight(1f, false))
+        Text(text)
        Spacer(modifier = Modifier.size(ButtonDefaults.IconSpacing))
        Icon(
            imageVector = icon,
            contentDescription = stringResource(R.string.delete),
-            modifier =
+            modifier = Modifier.size(ButtonDefaults.IconSize).clickable {
            Modifier.size(ButtonDefaults.IconSize).weight(1f, false).clickable {
                if(enabled) {
                    onIconClick()
                }
@@ -16,21 +16,13 @@ import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
@Composable
-fun PermissionRequestFailedScreen(
+fun PermissionRequestFailedScreen(padding : PaddingValues, onRequestAgain : () -> Unit, message : String, buttonText : String ) {
    padding: PaddingValues,
    onRequestAgain: () -> Unit,
    message: String,
    buttonText: String
 ) {
    val scope = rememberCoroutineScope()
-    Column(
+    Column(horizontalAlignment = Alignment.CenterHorizontally,
        horizontalAlignment = Alignment.CenterHorizontally,
        verticalArrangement = Arrangement.Center,
-        modifier =
+        modifier = Modifier
        Modifier
            .fillMaxSize()
-            .padding(padding)
+            .padding(padding)) {
    ) {
        Text(message, textAlign = TextAlign.Center, modifier = Modifier.padding(15.dp))
        Button(onClick = {
            scope.launch {
@@ -23,18 +23,12 @@ import com.zaneschepke.wireguardautotunnel.util.NumberUtils
@OptIn(ExperimentalFoundationApi::class)
@Composable
-fun RowListItem(
+fun RowListItem(icon : @Composable () -> Unit, text : String, onHold : () -> Unit,
-    icon: @Composable () -> Unit,
+                onClick: () -> Unit, rowButton : @Composable () -> Unit,
-    text: String,
+                expanded : Boolean, statistics: Statistics?
    onHold: () -> Unit,
    onClick: () -> Unit,
    rowButton: @Composable () -> Unit,
    expanded: Boolean,
    statistics: Statistics?
                ) {
    Box(
-        modifier =
+        modifier = Modifier
        Modifier
            .animateContentSize()
            .clip(RoundedCornerShape(30.dp))
            .combinedClickable(
@@ -48,17 +42,13 @@ fun RowListItem(
    ) {
        Column {
            Row(
-                modifier =
+                modifier = Modifier
                Modifier
                    .fillMaxWidth()
                    .padding(horizontal = 14.dp, vertical = 5.dp),
                verticalAlignment = Alignment.CenterVertically,
                horizontalArrangement = Arrangement.SpaceBetween
            ) {
-                Row(
+                Row(verticalAlignment = Alignment.CenterVertically,) {
                    verticalAlignment = Alignment.CenterVertically,
                    modifier = Modifier.fillMaxWidth(.60f)
                ) {
                    icon()
                    Text(text)
                }
@@ -67,8 +57,7 @@ fun RowListItem(
            if(expanded) {
                statistics?.peers()?.forEach {
                    Row(
-                        modifier =
+                        modifier = Modifier
                        Modifier
                            .fillMaxWidth()
                            .padding(end = 10.dp, bottom = 10.dp, start = 10.dp),
                        verticalAlignment = Alignment.CenterVertically,
@@ -78,10 +67,8 @@ fun RowListItem(
                        val peerTx = statistics.peer(it)!!.txBytes
                        val peerRx = statistics.peer(it)!!.rxBytes
                        val peerId = it.toBase64().subSequence(0,3).toString() + "***"
-                        val handshakeSec =
+                        val handshakeSec = NumberUtils.getSecondsBetweenTimestampAndNow(handshakeEpoch)
-                            NumberUtils.getSecondsBetweenTimestampAndNow(handshakeEpoch)
+                        val handshake = if(handshakeSec == null) "never" else "$handshakeSec secs ago"
                        val handshake =
                            if (handshakeSec == null) "never" else "$handshakeSec secs ago"
                        val peerTxMB = NumberUtils.bytesToMB(peerTx).toThreeDecimalPlaceString()
                        val peerRxMB = NumberUtils.bytesToMB(peerRx).toThreeDecimalPlaceString()
                        val fontSize = 9.sp
@@ -25,7 +25,9 @@ import androidx.compose.ui.text.input.KeyboardType
 import com.zaneschepke.wireguardautotunnel.R
@Composable
-fun SearchBar(onQuery: (queryString: String) -> Unit) {
+fun SearchBar(
    onQuery : (queryString : String) -> Unit
 ) {
    // Immediately update and keep track of query from text field changes.
    var query: String by rememberSaveable { mutableStateOf("") }
    var showClearIcon by rememberSaveable { mutableStateOf(false) }
@@ -62,18 +64,16 @@ fun SearchBar(onQuery: (queryString: String) -> Unit) {
            }
        },
        maxLines = 1,
-        colors =
+        colors = TextFieldDefaults.colors(
        TextFieldDefaults.colors(
            focusedContainerColor = Color.Transparent,
            unfocusedContainerColor = Color.Transparent,
-            disabledContainerColor = Color.Transparent
+            disabledContainerColor = Color.Transparent,
        ),
        placeholder = { Text(text = stringResource(R.string.hint_search_packages)) },
        textStyle = MaterialTheme.typography.bodySmall,
        singleLine = true,
        keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Text),
-        modifier =
+        modifier = Modifier
        Modifier
            .fillMaxWidth()
            .background(color = MaterialTheme.colorScheme.background, shape = RectangleShape)
    )
@@ -10,14 +10,8 @@ import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardCapitalization
@Composable
-fun ConfigurationTextBox(
+fun
-    value: String,
+        ConfigurationTextBox(value : String, hint : String, onValueChange : (String) -> Unit, keyboardActions : KeyboardActions, label : String, modifier: Modifier) {
    hint: String,
    onValueChange: (String) -> Unit,
    keyboardActions: KeyboardActions,
    label: String,
    modifier: Modifier
 ) {
   OutlinedTextField(
        modifier = modifier,
        value = value,
@@ -30,11 +24,10 @@ fun ConfigurationTextBox(
        placeholder = {
            Text(hint)
        },
-        keyboardOptions =
+        keyboardOptions = KeyboardOptions(
        KeyboardOptions(
            capitalization = KeyboardCapitalization.None,
            imeAction = ImeAction.Done
        ),
-        keyboardActions = keyboardActions
+        keyboardActions = keyboardActions,
    )
 }
@@ -12,17 +12,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.Dp
@Composable
-fun ConfigurationToggle(
+fun ConfigurationToggle(label : String, enabled : Boolean, checked : Boolean, padding : Dp,
-    label: String,
+                        onCheckChanged : () -> Unit, modifier : Modifier = Modifier) {
    enabled: Boolean,
    checked: Boolean,
    padding: Dp,
    onCheckChanged: () -> Unit,
    modifier: Modifier = Modifier
 ) {
    Row(
-        modifier =
+        modifier = Modifier
        Modifier
            .fillMaxWidth()
            .padding(padding),
        verticalAlignment = Alignment.CenterVertically,
@@ -11,14 +11,12 @@ import androidx.navigation.NavController
 import androidx.navigation.compose.currentBackStackEntryAsState
@Composable
-fun BottomNavBar(
+fun BottomNavBar(navController : NavController, bottomNavItems : List<BottomNavItem>) {
-    navController: NavController,
+
    bottomNavItems: List<BottomNavItem>
 ) {
    val backStackEntry = navController.currentBackStackEntryAsState()
    NavigationBar(
-        containerColor = MaterialTheme.colorScheme.background
+        containerColor = MaterialTheme.colorScheme.background,
    ) {
        bottomNavItems.forEach { item ->
            val selected = item.route == backStackEntry.value?.destination?.route
@@ -29,13 +27,13 @@ fun BottomNavBar(
                label = {
                    Text(
                        text = item.name,
-                        fontWeight = FontWeight.SemiBold
+                        fontWeight = FontWeight.SemiBold,
                    )
                },
                icon = {
                    Icon(
                        imageVector = item.icon,
-                        contentDescription = "${item.name} Icon"
+                        contentDescription = "${item.name} Icon",
                    )
                }
            )
@@ -11,47 +11,36 @@ import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
@Composable
-fun AuthorizationPrompt(
+fun AuthorizationPrompt(onSuccess : () -> Unit, onFailure : () -> Unit, onError : (String) -> Unit) {
    onSuccess: () -> Unit,
    onFailure: () -> Unit,
    onError: (String) -> Unit
 ) {
    val context = LocalContext.current
    val biometricManager = BiometricManager.from(context)
    val bio = biometricManager.canAuthenticate(BIOMETRIC_WEAK or DEVICE_CREDENTIAL)
-    val isBiometricAvailable =
+    val isBiometricAvailable = remember {
        remember {
        when(bio){
            BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE -> {
                onError("Biometrics not available")
                false
            }
            BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED -> {
                onError("Biometrics not created")
                false
            }
            BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE -> {
                onError("Biometric hardware not found")
                false
            }
            BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED -> {
                onError("Biometric security update required")
                false
            }
            BiometricManager.BIOMETRIC_ERROR_UNSUPPORTED -> {
                onError("Biometrics not supported")
                false
            }
            BiometricManager.BIOMETRIC_STATUS_UNKNOWN -> {
                onError("Biometrics status unknown")
                false
            }
            BiometricManager.BIOMETRIC_SUCCESS -> true
            else -> false
        }
@@ -59,29 +48,22 @@ fun AuthorizationPrompt(
    if(isBiometricAvailable) {
        val executor = remember { ContextCompat.getMainExecutor(context) }
-        val promptInfo =
+        val promptInfo = BiometricPrompt.PromptInfo.Builder()
            BiometricPrompt.PromptInfo.Builder()
            .setAllowedAuthenticators(BIOMETRIC_WEAK or DEVICE_CREDENTIAL)
            .setTitle("Biometric Authentication")
            .setSubtitle("Log in using your biometric credential")
            .build()
-        val biometricPrompt =
+        val biometricPrompt = BiometricPrompt(
            BiometricPrompt(
            context as FragmentActivity,
            executor,
            object : BiometricPrompt.AuthenticationCallback() {
-                    override fun onAuthenticationError(
+                override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
                        errorCode: Int,
                        errString: CharSequence
                    ) {
                    super.onAuthenticationError(errorCode, errString)
                    onFailure()
                }
-                    override fun onAuthenticationSucceeded(
+                override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
                        result: BiometricPrompt.AuthenticationResult
                    ) {
                    super.onAuthenticationSucceeded(result)
                    onSuccess()
                }
@@ -34,12 +34,9 @@ fun CustomSnackBar(
    containerColor: Color = MaterialTheme.colorScheme.surface
 ) {
    val context = LocalContext.current
-    Snackbar(
+    Snackbar(containerColor = containerColor,
-        containerColor = containerColor,
+        modifier = Modifier.fillMaxWidth(
-        modifier =
+            if(WireGuardAutoTunnel.isRunningOnAndroidTv(context)) 1/3f else 2/3f).padding(bottom = 100.dp),
        Modifier.fillMaxWidth(
            if (WireGuardAutoTunnel.isRunningOnAndroidTv(context)) 1 / 3f else 2 / 3f
        ).padding(bottom = 100.dp),
        shape = RoundedCornerShape(16.dp)
        ) {
        CompositionLocalProvider(
@@ -12,10 +12,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@Composable
-fun SectionTitle(
+fun SectionTitle(title : String, padding : Dp) {
    title: String,
    padding: Dp
 ) {
    Text(
        title,
        textAlign = TextAlign.Center,
@@ -8,7 +8,7 @@ data class InterfaceProxy(
    var addresses : String = "",
    var dnsServers : String = "",
    var listenPort : String = "",
-    var mtu: String = ""
+    var mtu : String = "",
 ){
    companion object {
        fun from(i : Interface) : InterfaceProxy {
@@ -17,12 +17,7 @@ data class InterfaceProxy(
                privateKey = i.keyPair.privateKey.toBase64().trim(),
                addresses = i.addresses.joinToString(", ").trim(),
                dnsServers = i.dnsServers.joinToString(", ").replace("/", "").trim(),
-                listenPort = if (i.listenPort.isPresent) {
+                listenPort = if(i.listenPort.isPresent) i.listenPort.get().toString().trim() else "",
                    i.listenPort.get().toString()
                    .trim()
                } else {
                    ""
                },
                mtu = if(i.mtu.isPresent) i.mtu.get().toString().trim() else ""
            )
        }
@@ -13,30 +13,13 @@ data class PeerProxy(
        fun from(peer : Peer) : PeerProxy {
            return PeerProxy(
                publicKey = peer.publicKey.toBase64(),
-                preSharedKey = if (peer.preSharedKey.isPresent) {
+                preSharedKey = if(peer.preSharedKey.isPresent) peer.preSharedKey.get().toBase64().trim() else "",
-                    peer.preSharedKey.get().toBase64()
+                persistentKeepalive = if(peer.persistentKeepalive.isPresent) peer.persistentKeepalive.get().toString().trim() else "",
-                    .trim()
+                endpoint = if(peer.endpoint.isPresent) peer.endpoint.get().toString().trim() else "",
                } else {
                    ""
                },
                persistentKeepalive = if (peer.persistentKeepalive.isPresent) {
                    peer.persistentKeepalive.get()
                    .toString().trim()
                } else {
                    ""
                },
                endpoint = if (peer.endpoint.isPresent) {
                    peer.endpoint.get().toString()
                    .trim()
                } else {
                    ""
                },
                allowedIps = peer.allowedIps.joinToString(", ").trim()
            )
        }
-
+        val IPV4_PUBLIC_NETWORKS = setOf(
        val IPV4_PUBLIC_NETWORKS =
            setOf(
            "0.0.0.0/5", "8.0.0.0/7", "11.0.0.0/8", "12.0.0.0/6", "16.0.0.0/4", "32.0.0.0/3",
            "64.0.0.0/2", "128.0.0.0/3", "160.0.0.0/5", "168.0.0.0/6", "172.0.0.0/12",
            "172.32.0.0/11", "172.64.0.0/10", "172.128.0.0/9", "173.0.0.0/8", "174.0.0.0/7",
@@ -86,9 +86,7 @@ import kotlinx.coroutines.launch
 import timber.log.Timber
@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
-@OptIn(
+@OptIn(ExperimentalComposeUiApi::class, ExperimentalMaterial3Api::class,
    ExperimentalComposeUiApi::class,
    ExperimentalMaterial3Api::class,
    ExperimentalFoundationApi::class
 )
@Composable
@@ -99,11 +97,13 @@ fun ConfigScreen(
    showSnackbarMessage: (String) -> Unit,
    id: String
 ) {
    val context = LocalContext.current
    val scope = rememberCoroutineScope()
    val clipboardManager: ClipboardManager = LocalClipboardManager.current
    val keyboardController = LocalSoftwareKeyboardController.current
    val tunnel by viewModel.tunnel.collectAsStateWithLifecycle(null)
    val tunnelName = viewModel.tunnelName.collectAsStateWithLifecycle()
    val packages by viewModel.packages.collectAsStateWithLifecycle()
@@ -115,22 +115,19 @@ fun ConfigScreen(
    var showApplicationsDialog by remember { mutableStateOf(false) }
    var showAuthPrompt by remember { mutableStateOf(false) }
    var isAuthenticated by remember { mutableStateOf(false) }
-    val baseTextBoxModifier =
+    val baseTextBoxModifier = Modifier.onFocusChanged {
        Modifier.onFocusChanged {
        if(WireGuardAutoTunnel.isRunningOnAndroidTv(context)) {
            keyboardController?.hide()
        }
    }
-    val keyboardActions =
+    val keyboardActions = KeyboardActions(
        KeyboardActions(
        onDone = {
            keyboardController?.hide()
        }
    )
-    val keyboardOptions =
+    val keyboardOptions = KeyboardOptions(
        KeyboardOptions(
        capitalization = KeyboardCapitalization.None,
        imeAction = ImeAction.Done
    )
@@ -152,19 +149,15 @@ fun ConfigScreen(
    val applicationButtonText = {
        "Tunneling apps: " +
-                if (isAllApplicationsEnabled) {
+                if (isAllApplicationsEnabled) "all"
-                    "all"
+                else "${checkedPackages.size} " + (if (include) "included" else "excluded")
-                } else {
+
                    "${checkedPackages.size} " + (if (include) "included" else "excluded")
                }
    }
    if(showAuthPrompt) {
-        AuthorizationPrompt(
+        AuthorizationPrompt(onSuccess = {
            onSuccess = {
            showAuthPrompt = false
-                isAuthenticated = true
+            isAuthenticated = true },
            },
            onError = { error ->
                showSnackbarMessage(error)
                showAuthPrompt = false
@@ -172,13 +165,11 @@ fun ConfigScreen(
            onFailure = {
                showAuthPrompt = false
                showSnackbarMessage(context.getString(R.string.authentication_failed))
-            }
+            })
        )
    }
    if (showApplicationsDialog) {
-        val sortedPackages =
+        val sortedPackages = remember(packages) {
            remember(packages) {
            packages.sortedBy { viewModel.getPackageLabel(it) }
        }
        AlertDialog(onDismissRequest = {
@@ -189,8 +180,7 @@ fun ConfigScreen(
                shadowElevation = 2.dp,
                shape = RoundedCornerShape(12.dp),
                color = MaterialTheme.colorScheme.surface,
-                modifier =
+                modifier = Modifier
                Modifier
                    .fillMaxWidth()
                    .fillMaxHeight(if (isAllApplicationsEnabled) 1 / 5f else 4 / 5f)
            ) {
@@ -198,8 +188,7 @@ fun ConfigScreen(
                    modifier = Modifier.fillMaxWidth()
                ) {
                    Row(
-                        modifier =
+                        modifier = Modifier
                        Modifier
                            .fillMaxWidth()
                            .padding(horizontal = 20.dp, vertical = 7.dp),
                        verticalAlignment = Alignment.CenterVertically,
@@ -215,8 +204,7 @@ fun ConfigScreen(
                    }
                    if (!isAllApplicationsEnabled) {
                        Row(
-                            modifier =
+                            modifier = Modifier
                            Modifier
                                .fillMaxWidth()
                                .padding(
                                    horizontal = 20.dp,
@@ -251,8 +239,7 @@ fun ConfigScreen(
                            }
                        }
                        Row(
-                            modifier =
+                            modifier = Modifier
                            Modifier
                                .fillMaxWidth()
                                .padding(
                                    horizontal = 20.dp,
@@ -267,25 +254,21 @@ fun ConfigScreen(
                        LazyColumn(
                            horizontalAlignment = Alignment.Start,
                            verticalArrangement = Arrangement.Top,
-                            modifier =
+                            modifier = Modifier
                            Modifier
                                .fillMaxHeight(4 / 5f)
                        ) {
                            items(
                                sortedPackages,
-                                key = { it.packageName }
+                                key = { it.packageName }) { pack ->
                            ) { pack ->
                                Row(
                                    verticalAlignment = Alignment.CenterVertically,
                                    horizontalArrangement = Arrangement.SpaceBetween,
-                                    modifier =
+                                    modifier = Modifier
                                    Modifier
                                        .fillMaxSize()
                                        .padding(5.dp)
                                ) {
                                    Row(
-                                        modifier =
+                                        modifier = Modifier.fillMaxWidth(
                                        Modifier.fillMaxWidth(
                                            fillMaxWidth
                                        )
                                    ) {
@@ -295,13 +278,11 @@ fun ConfigScreen(
                                            )
                                        if (drawable != null) {
                                            Image(
-                                                painter =
+                                                painter = DrawablePainter(
                                                DrawablePainter(
                                                    drawable
                                                ),
                                                stringResource(id = R.string.icon),
-                                                modifier =
+                                                modifier = Modifier.size(
                                                Modifier.size(
                                                    50.dp,
                                                    50.dp
                                                )
@@ -310,8 +291,7 @@ fun ConfigScreen(
                                            Icon(
                                                Icons.Rounded.Android,
                                                stringResource(id = R.string.edit),
-                                                modifier =
+                                                modifier = Modifier.size(
                                                Modifier.size(
                                                    50.dp,
                                                    50.dp
                                                )
@@ -326,15 +306,11 @@ fun ConfigScreen(
                                        modifier = Modifier.fillMaxSize(),
                                        checked = (checkedPackages.contains(pack.packageName)),
                                        onCheckedChange = {
-                                            if (it) {
+                                            if (it) viewModel.onAddCheckedPackage(
-                                                viewModel.onAddCheckedPackage(
+                                                pack.packageName
                                            ) else viewModel.onRemoveCheckedPackage(
                                                pack.packageName
                                            )
                                            } else {
                                                viewModel.onRemoveCheckedPackage(
                                                    pack.packageName
                                                )
                                            }
                                        }
                                    )
                                }
@@ -343,8 +319,7 @@ fun ConfigScreen(
                    }
                    Row(
                        verticalAlignment = Alignment.CenterVertically,
-                        modifier =
+                        modifier = Modifier
                        Modifier
                            .fillMaxSize()
                            .padding(top = 5.dp),
                        horizontalArrangement = Arrangement.Center
@@ -352,8 +327,7 @@ fun ConfigScreen(
                        TextButton(
                            onClick = {
                                showApplicationsDialog = false
-                            }
+                            }) {
                        ) {
                            Text(stringResource(R.string.done))
                        }
                    }
@@ -362,6 +336,7 @@ fun ConfigScreen(
        }
    }
    if (tunnel != null) {
        Scaffold(
            floatingActionButtonPosition = FabPosition.End,
@@ -370,20 +345,16 @@ fun ConfigScreen(
                val hoverColor = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)
                var fobColor by remember { mutableStateOf(secondaryColor) }
                FloatingActionButton(
-                    modifier =
+                    modifier = Modifier.padding(bottom = 90.dp).onFocusChanged {
                    Modifier.padding(bottom = 90.dp).onFocusChanged {
                        if(WireGuardAutoTunnel.isRunningOnAndroidTv(context)) {
-                            fobColor = if (it.isFocused) hoverColor else secondaryColor
+                            fobColor = if (it.isFocused) hoverColor else secondaryColor }
                        }
                    },
                    onClick = {
                        scope.launch {
                            try {
                                viewModel.onSaveAllChanges()
                                navController.navigate(Routes.Main.name)
-                                showSnackbarMessage(
+                                showSnackbarMessage(context.resources.getString(R.string.config_changes_saved))
                                    context.resources.getString(R.string.config_changes_saved)
                                )
                            } catch (e : Exception) {
                                Timber.e(e.message)
                                showSnackbarMessage(e.message!!)
@@ -391,22 +362,20 @@ fun ConfigScreen(
                        }
                    },
                    containerColor = fobColor,
-                    shape = RoundedCornerShape(16.dp)
+                    shape = RoundedCornerShape(16.dp),
                ) {
                    Icon(
                        imageVector = Icons.Rounded.Save,
                        contentDescription = stringResource(id = R.string.save_changes),
-                        tint = Color.DarkGray
+                        tint = Color.DarkGray,
                    )
                }
-            }
+            }) {
        ) {
            Column {
                Column(
                    horizontalAlignment = Alignment.CenterHorizontally,
                    verticalArrangement = Arrangement.Top,
-                    modifier =
+                    modifier = Modifier
                    Modifier
                        .verticalScroll(rememberScrollState())
                        .weight(1f, true)
                        .fillMaxSize()
@@ -416,16 +385,11 @@ fun ConfigScreen(
                        shadowElevation = 2.dp,
                        shape = RoundedCornerShape(12.dp),
                        color = MaterialTheme.colorScheme.surface,
-                        modifier =
+                        modifier = (if (WireGuardAutoTunnel.isRunningOnAndroidTv(context))
                        (
                                if (WireGuardAutoTunnel.isRunningOnAndroidTv(context)) {
                            Modifier
                                .fillMaxHeight(fillMaxHeight)
                                .fillMaxWidth(fillMaxWidth)
-                                } else {
+                        else Modifier.fillMaxWidth(fillMaxWidth)).padding(
                                    Modifier.fillMaxWidth(fillMaxWidth)
                                }
                                ).padding(
                            top = 50.dp,
                            bottom = 10.dp
                        )
@@ -435,10 +399,7 @@ fun ConfigScreen(
                            verticalArrangement = Arrangement.Top,
                            modifier = Modifier.padding(15.dp).focusGroup()
                        ) {
-                            SectionTitle(
+                            SectionTitle(stringResource(R.string.interface_), padding = screenPadding)
                                stringResource(R.string.interface_),
                                padding = screenPadding
                            )
                            ConfigurationTextBox(
                                value = tunnelName.value,
                                onValueChange = { value ->
@@ -447,13 +408,10 @@ fun ConfigScreen(
                                keyboardActions = keyboardActions,
                                label = stringResource(R.string.name),
                                hint = stringResource(R.string.tunnel_name).lowercase(),
-                                modifier = baseTextBoxModifier.fillMaxWidth().focusRequester(
+                                modifier = baseTextBoxModifier.fillMaxWidth().focusRequester(focusRequester)
                                    focusRequester
                                )
                            )
                            OutlinedTextField(
-                                modifier =
+                                modifier = baseTextBoxModifier.fillMaxWidth().clickable {
                                baseTextBoxModifier.fillMaxWidth().clickable {
                                    showAuthPrompt = true
                                },
                                value = proxyInterface.privateKey,
@@ -467,8 +425,7 @@ fun ConfigScreen(
                                        modifier = Modifier.focusRequester(FocusRequester.Default),
                                        onClick = {
                                            viewModel.generateKeyPair()
-                                        }
+                                        }) {
                                    ) {
                                        Icon(
                                            Icons.Rounded.Refresh,
                                            stringResource(R.string.rotate_keys),
@@ -483,9 +440,7 @@ fun ConfigScreen(
                                keyboardActions = keyboardActions
                            )
                            OutlinedTextField(
-                                modifier = baseTextBoxModifier.fillMaxWidth().focusRequester(
+                                modifier = baseTextBoxModifier.fillMaxWidth().focusRequester(FocusRequester.Default),
                                    FocusRequester.Default
                                ),
                                value = proxyInterface.publicKey,
                                enabled = false,
                                onValueChange = {},
@@ -493,11 +448,8 @@ fun ConfigScreen(
                                    IconButton(
                                        modifier = Modifier.focusRequester(FocusRequester.Default),
                                        onClick = {
-                                            clipboardManager.setText(
+                                            clipboardManager.setText(AnnotatedString(proxyInterface.publicKey))
-                                                AnnotatedString(proxyInterface.publicKey)
+                                        }) {
                                            )
                                        }
                                    ) {
                                        Icon(
                                            Icons.Rounded.ContentCopy,
                                            stringResource(R.string.copy_public_key),
@@ -520,8 +472,7 @@ fun ConfigScreen(
                                    keyboardActions = keyboardActions,
                                    label = stringResource(R.string.addresses),
                                    hint = stringResource(R.string.comma_separated_list),
-                                    modifier =
+                                    modifier = baseTextBoxModifier
                                    baseTextBoxModifier
                                        .fillMaxWidth(3 / 5f)
                                        .padding(end = 5.dp)
                                )
@@ -541,8 +492,7 @@ fun ConfigScreen(
                                    keyboardActions = keyboardActions,
                                    label = stringResource(R.string.dns_servers),
                                    hint = stringResource(R.string.comma_separated_list),
-                                    modifier =
+                                    modifier = baseTextBoxModifier
                                    baseTextBoxModifier
                                        .fillMaxWidth(3 / 5f)
                                        .padding(end = 5.dp)
                                )
@@ -557,8 +507,7 @@ fun ConfigScreen(
                            }
                            Row(
                                verticalAlignment = Alignment.CenterVertically,
-                                modifier =
+                                modifier = Modifier
                                Modifier
                                    .fillMaxSize()
                                    .padding(top = 5.dp),
                                horizontalArrangement = Arrangement.Center
@@ -566,8 +515,7 @@ fun ConfigScreen(
                                TextButton(
                                    onClick = {
                                        showApplicationsDialog = true
-                                    }
+                                    }) {
                                ) {
                                    Text(applicationButtonText())
                                }
                            }
@@ -579,16 +527,11 @@ fun ConfigScreen(
                            shadowElevation = 2.dp,
                            shape = RoundedCornerShape(12.dp),
                            color = MaterialTheme.colorScheme.surface,
-                            modifier =
+                            modifier = (if (WireGuardAutoTunnel.isRunningOnAndroidTv(context))
                            (
                                    if (WireGuardAutoTunnel.isRunningOnAndroidTv(context)) {
                                Modifier
                                    .fillMaxHeight(fillMaxHeight)
                                    .fillMaxWidth(fillMaxWidth)
-                                    } else {
+                            else Modifier.fillMaxWidth(fillMaxWidth)).padding(
                                        Modifier.fillMaxWidth(fillMaxWidth)
                                    }
                                    ).padding(
                                top = 10.dp,
                                bottom = 10.dp
                            )
@@ -596,23 +539,18 @@ fun ConfigScreen(
                            Column(
                                horizontalAlignment = Alignment.Start,
                                verticalArrangement = Arrangement.Top,
-                                modifier =
+                                modifier = Modifier
                                Modifier
                                    .padding(horizontal = 15.dp)
                                    .padding(bottom = 10.dp)
                            ) {
                                Row(
                                    horizontalArrangement = Arrangement.SpaceBetween,
                                    verticalAlignment = Alignment.CenterVertically,
-                                    modifier =
+                                    modifier = Modifier
                                    Modifier
                                        .fillMaxWidth()
                                        .padding(horizontal = 5.dp)
                                ) {
-                                    SectionTitle(
+                                    SectionTitle(stringResource(R.string.peer), padding = screenPadding)
                                        stringResource(R.string.peer),
                                        padding = screenPadding
                                    )
                                    IconButton(
                                        onClick = {
                                            viewModel.onDeletePeer(index)
@@ -655,17 +593,10 @@ fun ConfigScreen(
                                    onValueChange = { value ->
                                        viewModel.onPersistentKeepaliveChanged(index, value)
                                    },
-                                    trailingIcon = {
+                                    trailingIcon = { Text(stringResource(R.string.seconds), modifier = Modifier.padding(end = 10.dp)) },
                                        Text(
                                            stringResource(R.string.seconds),
                                            modifier = Modifier.padding(end = 10.dp)
                                        )
                                    },
                                    label = { Text(stringResource(R.string.persistent_keepalive)) },
                                    singleLine = true,
-                                    placeholder = {
+                                    placeholder = { Text(stringResource(R.string.optional_no_recommend)) },
                                        Text(stringResource(R.string.optional_no_recommend))
                                    },
                                    keyboardOptions = keyboardOptions,
                                    keyboardActions = keyboardActions
                                )
@@ -694,9 +625,7 @@ fun ConfigScreen(
                                    },
                                    label = { Text(stringResource(R.string.allowed_ips)) },
                                    singleLine = true,
-                                    placeholder = {
+                                    placeholder = { Text(stringResource(R.string.comma_separated_list)) },
                                        Text(stringResource(R.string.comma_separated_list))
                                    },
                                    keyboardOptions = keyboardOptions,
                                    keyboardActions = keyboardActions
                                )
@@ -706,11 +635,11 @@ fun ConfigScreen(
                    Row(
                        horizontalArrangement = Arrangement.SpaceEvenly,
                        verticalAlignment = Alignment.CenterVertically,
-                        modifier =
+                        modifier = Modifier
                        Modifier
                            .fillMaxSize()
                            .padding(bottom = 140.dp)
                    ) {
                        Row(
                            verticalAlignment = Alignment.CenterVertically,
                            horizontalArrangement = Arrangement.Center
@@ -718,8 +647,7 @@ fun ConfigScreen(
                            TextButton(
                                onClick = {
                                    viewModel.addEmptyPeer()
-                                }
+                                }) {
                            ) {
                                Text(stringResource(R.string.add_peer))
                            }
                        }
@@ -23,20 +23,18 @@ import com.zaneschepke.wireguardautotunnel.ui.models.PeerProxy
 import com.zaneschepke.wireguardautotunnel.util.NumberUtils
 import com.zaneschepke.wireguardautotunnel.util.WgTunnelException
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@HiltViewModel
-class ConfigViewModel
+class ConfigViewModel @Inject constructor(private val application : Application,
@Inject
 constructor(
    private val application: Application,
                                          private val tunnelRepo : TunnelConfigDao,
                                          private val settingsRepo : SettingsDoa
 ) : ViewModel() {
    private val _tunnel = MutableStateFlow<TunnelConfig?>(null)
    private val _tunnelName = MutableStateFlow("")
    val tunnelName get() = _tunnelName.asStateFlow()
@@ -60,14 +58,13 @@ constructor(
    private val _isAllApplicationsEnabled = MutableStateFlow(false)
    val isAllApplicationsEnabled get() = _isAllApplicationsEnabled.asStateFlow()
    private val _isDefaultTunnel = MutableStateFlow(false)
    val isDefaultTunnel = _isDefaultTunnel.asStateFlow()
    private lateinit var tunnelConfig: TunnelConfig
    suspend fun onScreenLoad(id : String) {
        if(id != Constants.MANUAL_TUNNEL_CONFIG_ID) {
-            tunnelConfig = getTunnelConfigById(id) ?: throw WgTunnelException(
+            tunnelConfig = getTunnelConfigById(id) ?: throw WgTunnelException("Config not found")
                "Config not found"
            )
            emitScreenData()
        } else {
            emitEmptyScreenData()
@@ -87,6 +84,7 @@ constructor(
        }
    }
    private suspend fun emitScreenData() {
        emitTunnelConfig()
        emitPeersFromConfig()
@@ -147,7 +145,6 @@ constructor(
    fun onIncludeChange(include : Boolean) {
        _include.value = include
    }
    fun onAddCheckedPackage(packageName : String) {
        _checkedPackages.value.add(packageName)
    }
@@ -171,10 +168,7 @@ constructor(
        }
    }
-    private suspend fun determineAppInclusionState(
+    private suspend fun determineAppInclusionState(excludedApps : Set<String>, includedApps : Set<String>) {
        excludedApps: Set<String>,
        includedApps: Set<String>
    ) {
        if (excludedApps.isEmpty()) {
            emitIncludedAppsExist()
            emitCheckedApps(includedApps)
@@ -213,8 +207,7 @@ constructor(
    fun emitQueriedPackages(query : String) {
        viewModelScope.launch(Dispatchers.IO) {
-            val packages =
+            val packages = getAllInternetCapablePackages().filter {
                getAllInternetCapablePackages().filter {
                getPackageLabel(it).lowercase().contains(query.lowercase())
            }
            _packages.emit(packages)
@@ -225,16 +218,14 @@ constructor(
        return packageInfo.applicationInfo.loadLabel(application.packageManager).toString()
    }
    private fun getAllInternetCapablePackages() : List<PackageInfo> {
        return getPackagesHoldingPermissions(arrayOf(Manifest.permission.INTERNET))
    }
    private fun getPackagesHoldingPermissions(permissions: Array<String>): List<PackageInfo> {
        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            packageManager.getPackagesHoldingPermissions(
+            packageManager.getPackagesHoldingPermissions(permissions, PackageManager.PackageInfoFlags.of(0L))
                permissions,
                PackageManager.PackageInfoFlags.of(0L)
            )
        } else {
            packageManager.getPackagesHoldingPermissions(permissions, 0)
        }
@@ -244,10 +235,13 @@ constructor(
        return _isAllApplicationsEnabled.value
    }
    private fun isIncludeApplicationsEnabled() : Boolean {
        return _include.value
    }
    private suspend fun saveConfig(tunnelConfig: TunnelConfig) {
        tunnelRepo.save(tunnelConfig)
    }
    private suspend fun updateTunnelConfig(tunnelConfig: TunnelConfig?) {
        if(tunnelConfig != null) {
            saveConfig(tunnelConfig)
@@ -261,113 +255,82 @@ constructor(
            val setting = settings[0]
            if(setting.defaultTunnel != null) {
                if(tunnelConfig.id == TunnelConfig.from(setting.defaultTunnel!!).id) {
-                    settingsRepo.save(
+                    settingsRepo.save(setting.copy(
                        setting.copy(
                        defaultTunnel = tunnelConfig.toString()
-                        )
+                    ))
                    )
                }
            }
        }
    }
-    private fun buildPeerListFromProxyPeers(): List<Peer> {
+    fun buildPeerListFromProxyPeers() : List<Peer> {
        return _proxyPeers.value.map {
            val builder = Peer.Builder()
            if (it.allowedIps.isNotEmpty()) builder.parseAllowedIPs(it.allowedIps.trim())
            if (it.publicKey.isNotEmpty()) builder.parsePublicKey(it.publicKey.trim())
            if (it.preSharedKey.isNotEmpty()) builder.parsePreSharedKey(it.preSharedKey.trim())
            if (it.endpoint.isNotEmpty()) builder.parseEndpoint(it.endpoint.trim())
-            if (it.persistentKeepalive.isNotEmpty()) {
+            if (it.persistentKeepalive.isNotEmpty()) builder.parsePersistentKeepalive(it.persistentKeepalive.trim())
                builder.parsePersistentKeepalive(
                    it.persistentKeepalive.trim()
                )
            }
            builder.build()
        }
    }
-    private fun buildInterfaceListFromProxyInterface(): Interface {
+    fun buildInterfaceListFromProxyInterface() : Interface {
        val builder = Interface.Builder()
        builder.parsePrivateKey(_interface.value.privateKey.trim())
        builder.parseAddresses(_interface.value.addresses.trim())
        builder.parseDnsServers(_interface.value.dnsServers.trim())
        if(_interface.value.mtu.isNotEmpty()) builder.parseMtu(_interface.value.mtu.trim())
-        if (_interface.value.listenPort.isNotEmpty()) {
+        if(_interface.value.listenPort.isNotEmpty()) builder.parseListenPort(_interface.value.listenPort.trim())
            builder.parseListenPort(
                _interface.value.listenPort.trim()
            )
        }
        if(isAllApplicationsEnabled()) _checkedPackages.value.clear()
        if(_include.value) builder.includeApplications(_checkedPackages.value)
        if(!_include.value) builder.excludeApplications(_checkedPackages.value)
        return builder.build()
    }
    suspend fun onSaveAllChanges() {
        try {
            val peerList = buildPeerListFromProxyPeers()
            val wgInterface = buildInterfaceListFromProxyInterface()
            val config = Config.Builder().addPeers(peerList).setInterface(wgInterface).build()
-            val tunnelConfig =
+            val tunnelConfig = _tunnel.value?.copy(
                _tunnel.value?.copy(
                name = _tunnelName.value,
                wgQuick = config.toWgQuickString()
            )
            updateTunnelConfig(tunnelConfig)
        } catch (e : Exception) {
-            throw WgTunnelException(
+            throw WgTunnelException("Error: ${e.cause?.message?.lowercase() ?: "unknown error occurred"}")
                "Error: ${e.cause?.message?.lowercase() ?: "unknown error occurred"}"
            )
        }
    }
-    fun onPeerPublicKeyChange(
+    fun onPeerPublicKeyChange(index: Int, publicKey: String) {
-        index: Int,
+        _proxyPeers.value[index] = _proxyPeers.value[index].copy(
        publicKey: String
    ) {
        _proxyPeers.value[index] =
            _proxyPeers.value[index].copy(
            publicKey = publicKey
        )
    }
-    fun onPreSharedKeyChange(
+    fun onPreSharedKeyChange(index: Int, value: String) {
-        index: Int,
+        _proxyPeers.value[index] = _proxyPeers.value[index].copy(
        value: String
    ) {
        _proxyPeers.value[index] =
            _proxyPeers.value[index].copy(
            preSharedKey = value
        )
    }
-    fun onEndpointChange(
+    fun onEndpointChange(index: Int, value: String) {
-        index: Int,
+        _proxyPeers.value[index] = _proxyPeers.value[index].copy(
        value: String
    ) {
        _proxyPeers.value[index] =
            _proxyPeers.value[index].copy(
            endpoint = value
        )
    }
-    fun onAllowedIpsChange(
+    fun onAllowedIpsChange(index: Int, value: String) {
-        index: Int,
+        _proxyPeers.value[index] = _proxyPeers.value[index].copy(
        value: String
    ) {
        _proxyPeers.value[index] =
            _proxyPeers.value[index].copy(
            allowedIps = value
        )
    }
-    fun onPersistentKeepaliveChanged(
+    fun onPersistentKeepaliveChanged(index : Int, value : String) {
-        index: Int,
+        _proxyPeers.value[index] = _proxyPeers.value[index].copy(
        value: String
    ) {
        _proxyPeers.value[index] =
            _proxyPeers.value[index].copy(
            persistentKeepalive = value
        )
    }
@@ -382,51 +345,44 @@ constructor(
    fun generateKeyPair() {
        val keyPair = KeyPair()
-        _interface.value =
+        _interface.value = _interface.value.copy(
            _interface.value.copy(
            privateKey = keyPair.privateKey.toBase64(),
            publicKey = keyPair.publicKey.toBase64()
        )
    }
    fun onAddressesChanged(value: String) {
-        _interface.value =
+        _interface.value = _interface.value.copy(
            _interface.value.copy(
            addresses = value
        )
    }
    fun onListenPortChanged(value: String) {
-        _interface.value =
+        _interface.value = _interface.value.copy(
            _interface.value.copy(
            listenPort = value
        )
    }
    fun onDnsServersChanged(value: String) {
-        _interface.value =
+        _interface.value = _interface.value.copy(
            _interface.value.copy(
            dnsServers = value
        )
    }
    fun onMtuChanged(value: String) {
-        _interface.value =
+        _interface.value = _interface.value.copy(
            _interface.value.copy(
            mtu = value
        )
    }
    private fun onInterfacePublicKeyChange(value : String) {
-        _interface.value =
+        _interface.value = _interface.value.copy(
            _interface.value.copy(
            publicKey = value
        )
    }
    fun onPrivateKeyChange(value: String) {
-        _interface.value =
+        _interface.value = _interface.value.copy(
            _interface.value.copy(
            privateKey = value
        )
        if(NumberUtils.isValidKey(value)) {
@@ -88,7 +88,6 @@ import com.zaneschepke.wireguardautotunnel.ui.CaptureActivityPortrait
 import com.zaneschepke.wireguardautotunnel.ui.Routes
 import com.zaneschepke.wireguardautotunnel.ui.common.RowListItem
 import com.zaneschepke.wireguardautotunnel.ui.theme.brickRed
 import com.zaneschepke.wireguardautotunnel.ui.theme.corn
 import com.zaneschepke.wireguardautotunnel.ui.theme.mint
 import com.zaneschepke.wireguardautotunnel.util.WgTunnelException
 import kotlinx.coroutines.Dispatchers
@@ -103,6 +102,7 @@ fun MainScreen(
    showSnackbarMessage: (String) -> Unit,
    navController: NavController
 ) {
    val haptic = LocalHapticFeedback.current
    val context = LocalContext.current
    val isVisible = rememberSaveable { mutableStateOf(true) }
@@ -112,9 +112,7 @@ fun MainScreen(
    var showBottomSheet by remember { mutableStateOf(false) }
    var showPrimaryChangeAlertDialog by remember { mutableStateOf(false) }
    val tunnels by viewModel.tunnels.collectAsStateWithLifecycle(mutableListOf())
-    val handshakeStatus by viewModel.handshakeStatus.collectAsStateWithLifecycle(
+    val handshakeStatus by viewModel.handshakeStatus.collectAsStateWithLifecycle(HandshakeStatus.NOT_STARTED)
        HandshakeStatus.NOT_STARTED
    )
    var selectedTunnel by remember { mutableStateOf<TunnelConfig?>(null) }
    val state by viewModel.state.collectAsStateWithLifecycle(Tunnel.State.DOWN)
    val tunnelName by viewModel.tunnelName.collectAsStateWithLifecycle("")
@@ -122,13 +120,9 @@ fun MainScreen(
    val statistics by viewModel.statistics.collectAsStateWithLifecycle(null)
    // Nested scroll for control FAB
-    val nestedScrollConnection =
+    val nestedScrollConnection = remember {
        remember {
        object : NestedScrollConnection {
-                override fun onPreScroll(
+            override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
                    available: Offset,
                    source: NestedScrollSource
                ): Offset {
                // Hide FAB
                if (available.y < -1) {
                    isVisible.value = false
@@ -142,44 +136,26 @@ fun MainScreen(
        }
    }
-    val tunnelFileImportResultLauncher =
+    val tunnelFileImportResultLauncher = rememberLauncherForActivityResult(object : ActivityResultContracts.GetContent() {
-        rememberLauncherForActivityResult(
+        override fun createIntent(context: Context, input: String): Intent {
            object : ActivityResultContracts.GetContent() {
                override fun createIntent(
                    context: Context,
                    input: String
                ): Intent {
            val intent = super.createIntent(context, input)
            /* AndroidTV now comes with stubs that do nothing but display a Toast less helpful than
             * what we can do, so detect this and throw an exception that we can catch later. */
-                    val activitiesToResolveIntent =
+            val activitiesToResolveIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                context.packageManager.queryIntentActivities(intent, PackageManager.ResolveInfoFlags.of(PackageManager.MATCH_DEFAULT_ONLY.toLong()))
                            context.packageManager.queryIntentActivities(
                                intent,
                                PackageManager.ResolveInfoFlags.of(
                                    PackageManager.MATCH_DEFAULT_ONLY.toLong()
                                )
                            )
            } else {
-                            context.packageManager.queryIntentActivities(
+                context.packageManager.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY)
                                intent,
                                PackageManager.MATCH_DEFAULT_ONLY
                            )
            }
            if (activitiesToResolveIntent.all {
                    val name = it.activityInfo.packageName
-                            name.startsWith(Constants.GOOGLE_TV_EXPLORER_STUB) || name.startsWith(
+                    name.startsWith(Constants.GOOGLE_TV_EXPLORER_STUB) || name.startsWith(Constants.ANDROID_TV_EXPLORER_STUB)
-                                Constants.ANDROID_TV_EXPLORER_STUB
+                }) {
                            )
                        }
                    ) {
                throw WgTunnelException(context.getString(R.string.no_file_explorer))
            }
            return intent
        }
-            }
+    }) { data ->
        ) { data ->
        if (data == null) return@rememberLauncherForActivityResult
        scope.launch(Dispatchers.IO) {
            try {
@@ -190,8 +166,7 @@ fun MainScreen(
        }
    }
-    val scanLauncher =
+    val scanLauncher = rememberLauncherForActivityResult(
        rememberLauncherForActivityResult(
        contract = ScanContract(),
        onResult = {
            scope.launch {
@@ -201,9 +176,7 @@ fun MainScreen(
                    when(e) {
                        is WgTunnelException -> {
                            showSnackbarMessage(e.message)
-                            }
+                        } else -> {
                            else -> {
                            showSnackbarMessage("No QR code scanned")
                        }
                    }
@@ -224,22 +197,21 @@ fun MainScreen(
                        showPrimaryChangeAlertDialog = false
                        selectedTunnel = null
                    }
-                }) { Text(text = stringResource(R.string.okay)) }
+                })
                { Text(text = stringResource(R.string.okay)) }
            },
            dismissButton = {
                TextButton(onClick = {
                    showPrimaryChangeAlertDialog = false
-                }) { Text(text = stringResource(R.string.cancel)) }
+                })
                { Text(text = stringResource(R.string.cancel)) }
            },
            title = { Text(text = stringResource(R.string.primary_tunnel_change)) },
            text = { Text(text = stringResource(R.string.primary_tunnel_change_question)) }
        )
    }
-    fun onTunnelToggle(
+    fun onTunnelToggle(checked : Boolean , tunnel : TunnelConfig) {
        checked: Boolean,
        tunnel: TunnelConfig
    ) {
        try {
            if (checked) viewModel.onTunnelStart(tunnel) else viewModel.onTunnelStop()
        } catch (e : Exception) {
@@ -248,8 +220,7 @@ fun MainScreen(
    }
    Scaffold(
-        modifier =
+        modifier = Modifier.pointerInput(Unit) {
        Modifier.pointerInput(Unit) {
            detectTapGestures(onTap = {
                selectedTunnel = null
            })
@@ -259,30 +230,30 @@ fun MainScreen(
            AnimatedVisibility(
                visible = isVisible.value,
                enter = slideInVertically(initialOffsetY = { it * 2 }),
-                exit = slideOutVertically(targetOffsetY = { it * 2 })
+                exit = slideOutVertically(targetOffsetY = { it * 2 }),
            ) {
                val secondaryColor = MaterialTheme.colorScheme.secondary
                val hoverColor = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)
                var fobColor by remember { mutableStateOf(secondaryColor) }
                FloatingActionButton(
-                    modifier =
+                    modifier = Modifier
                    Modifier
                        .padding(bottom = 90.dp)
                        .onFocusChanged {
                            if (WireGuardAutoTunnel.isRunningOnAndroidTv(context)) {
                                fobColor = if (it.isFocused) hoverColor else secondaryColor
                            }
-                        },
+                        }
                    ,
                    onClick = {
                        showBottomSheet = true
                    },
                    containerColor = fobColor,
-                    shape = RoundedCornerShape(16.dp)
+                    shape = RoundedCornerShape(16.dp),
                ) {
                    Icon(
                        imageVector = Icons.Rounded.Add,
                        contentDescription = stringResource(id = R.string.add_tunnel),
-                        tint = Color.DarkGray
+                        tint = Color.DarkGray,
                    )
                }
            }
@@ -292,8 +263,7 @@ fun MainScreen(
            Column(
                horizontalAlignment = Alignment.CenterHorizontally,
                verticalArrangement = Arrangement.Center,
-                modifier =
+                modifier = Modifier
                Modifier
                    .fillMaxSize()
                    .padding(padding)
            ) {
@@ -309,8 +279,7 @@ fun MainScreen(
            ) {
                // Sheet content
                Row(
-                    modifier =
+                    modifier = Modifier
                    Modifier
                        .fillMaxWidth()
                        .clickable {
                            showBottomSheet = false
@@ -334,9 +303,7 @@ fun MainScreen(
                }
                if(!WireGuardAutoTunnel.isRunningOnAndroidTv(context)) {
                    Divider()
-                    Row(
+                    Row(modifier = Modifier
                        modifier =
                        Modifier
                        .fillMaxWidth()
                        .clickable {
                            scope.launch {
@@ -346,8 +313,7 @@ fun MainScreen(
                                scanOptions.setOrientationLocked(true)
                                scanOptions.setPrompt(context.getString(R.string.scanning_qr))
                                scanOptions.setBeepEnabled(false)
-                                    scanOptions.captureActivity =
+                                scanOptions.captureActivity = CaptureActivityPortrait::class.java
                                        CaptureActivityPortrait::class.java
                                scanLauncher.launch(scanOptions)
                            }
                        }
@@ -366,14 +332,11 @@ fun MainScreen(
                }
                Divider()
                Row(
-                    modifier =
+                    modifier = Modifier
                    Modifier
                        .fillMaxWidth()
                        .clickable {
                            showBottomSheet = false
-                            navController.navigate(
+                            navController.navigate("${Routes.Config.name}/${Constants.MANUAL_TUNNEL_CONFIG_ID}")
                                "${Routes.Config.name}/${Constants.MANUAL_TUNNEL_CONFIG_ID}"
                            )
                        }
                        .padding(10.dp)
                ) {
@@ -392,67 +355,47 @@ fun MainScreen(
        Column(
            horizontalAlignment = Alignment.Start,
            verticalArrangement = Arrangement.Top,
-            modifier =
+            modifier = Modifier
            Modifier
                .fillMaxSize()
                .padding(padding)
        ) {
            LazyColumn(
-                modifier =
+                modifier = Modifier
                Modifier
                    .fillMaxSize()
-                    .padding(top = 10.dp)
+                    .nestedScroll(nestedScrollConnection),
                    .nestedScroll(nestedScrollConnection)
            ) {
                items(tunnels, key = { tunnel -> tunnel.id }) { tunnel ->
-                    val leadingIconColor = (
+                   val leadingIconColor = (if (tunnelName == tunnel.name) when (handshakeStatus) {
                            if (tunnelName == tunnel.name) {
                                when (handshakeStatus) {
                        HandshakeStatus.HEALTHY -> mint
                        HandshakeStatus.UNHEALTHY -> brickRed
                                    HandshakeStatus.STALE -> corn
                        HandshakeStatus.NOT_STARTED -> Color.Gray
                        HandshakeStatus.NEVER_CONNECTED -> brickRed
-                                }
+                    } else {Color.Gray})
                            } else {
                                Color.Gray
                            }
                            )
                    val focusRequester = remember { FocusRequester() }
-                    val expanded =
+                    val expanded = remember {
                        remember {
                        mutableStateOf(false)
                    }
-                    RowListItem(
+                    RowListItem(icon = {
-                        icon = {
+                        if (settings.isTunnelConfigDefault(tunnel))
                            if (settings.isTunnelConfigDefault(tunnel)) {
                            Icon(
-                                    Icons.Rounded.Star,
+                                Icons.Rounded.Star, stringResource(R.string.status),
                                    stringResource(R.string.status),
                                tint = leadingIconColor,
-                                    modifier =
+                                modifier = Modifier
                                    Modifier
                                    .padding(end = 10.dp)
                                    .size(20.dp)
                            )
-                            } else {
+                        else Icon(
-                                Icon(
+                            Icons.Rounded.Circle, stringResource(R.string.status),
                                    Icons.Rounded.Circle,
                                    stringResource(R.string.status),
                            tint = leadingIconColor,
-                                    modifier =
+                            modifier = Modifier
                                    Modifier
                                .padding(end = 15.dp)
                                .size(15.dp)
                        )
                            }
                    },
                        text = tunnel.name,
                        onHold = {
-                            if ((state == Tunnel.State.UP) && (tunnel.name == tunnelName)) {
+                            if (state == Tunnel.State.UP && tunnel.name == tunnelName) {
-                                showSnackbarMessage(
+                                showSnackbarMessage(context.resources.getString(R.string.turn_off_tunnel))
                                    context.resources.getString(R.string.turn_off_tunnel)
                                )
                                return@RowListItem
                            }
                            haptic.performHapticFeedback(HapticFeedbackType.LongPress)
@@ -471,40 +414,25 @@ fun MainScreen(
                        statistics = statistics,
                        expanded = expanded.value,
                        rowButton = {
-                            if (tunnel.id == selectedTunnel?.id && !WireGuardAutoTunnel.isRunningOnAndroidTv(
+                            if (tunnel.id == selectedTunnel?.id && !WireGuardAutoTunnel.isRunningOnAndroidTv(context)) {
                                    context
                                )
                            ) {
                                Row {
                                    if(!settings.isTunnelConfigDefault(tunnel)) {
                                        IconButton(onClick = {
                                            if(settings.isAutoTunnelEnabled) {
-                                                showSnackbarMessage(
+                                                showSnackbarMessage(context.resources.getString(R.string.turn_off_auto))
-                                                    context.resources.getString(
+                                            } else showPrimaryChangeAlertDialog = true
                                                        R.string.turn_off_auto
                                                    )
                                                )
                                            } else {
                                                showPrimaryChangeAlertDialog = true
                                            }
                                        }) {
-                                            Icon(
+                                            Icon(Icons.Rounded.Star, stringResource(id = R.string.set_primary))
                                                Icons.Rounded.Star,
                                                stringResource(id = R.string.set_primary)
                                            )
                                        }
                                    }
                                    IconButton(onClick = {
-                                        navController.navigate(
+                                        navController.navigate("${Routes.Config.name}/${selectedTunnel?.id}")
                                            "${Routes.Config.name}/${selectedTunnel?.id}"
                                        )
                                    }) {
                                        Icon(Icons.Rounded.Edit, stringResource(id = R.string.edit))
                                    }
                                    IconButton(
                                        modifier = Modifier.focusable(),
-                                        onClick = { viewModel.onDelete(tunnel) }
+                                        onClick = { viewModel.onDelete(tunnel) }) {
                                    ) {
                                        Icon(
                                            Icons.Rounded.Delete,
                                            stringResource(id = R.string.delete)
@@ -514,10 +442,8 @@ fun MainScreen(
                            } else {
                                val checked = state == Tunnel.State.UP && tunnel.name == tunnelName
                                if(!checked) expanded.value = false
                                @Composable
-                                fun TunnelSwitch() =
+                                fun TunnelSwitch() = Switch(
                                    Switch(
                                    modifier = Modifier.focusRequester(focusRequester),
                                    checked = checked,
                                    onCheckedChange = { checked ->
@@ -530,19 +456,10 @@ fun MainScreen(
                                        if(!settings.isTunnelConfigDefault(tunnel)) {
                                            IconButton(onClick = {
                                                if(settings.isAutoTunnelEnabled) {
-                                                    showSnackbarMessage(
+                                                    showSnackbarMessage(context.resources.getString(R.string.turn_off_auto))
-                                                        context.resources.getString(
+                                                } else showPrimaryChangeAlertDialog = true
                                                            R.string.turn_off_auto
                                                        )
                                                    )
                                                } else {
                                                    showPrimaryChangeAlertDialog = true
                                                }
                                            }) {
-                                                Icon(
+                                                Icon(Icons.Rounded.Star, stringResource(id = R.string.set_primary))
                                                    Icons.Rounded.Star,
                                                    stringResource(id = R.string.set_primary)
                                                )
                                            }
                                        }
                                        IconButton(
@@ -551,21 +468,18 @@ fun MainScreen(
                                                if(state == Tunnel.State.UP && (tunnelName == tunnel.name) ) {
                                                    expanded.value = !expanded.value
                                                }
-                                            }
+                                            }) {
                                        ) {
                                            Icon(Icons.Rounded.Info, stringResource(R.string.info))
                                        }
                                        IconButton(onClick = {
-                                            if (state == Tunnel.State.UP && tunnel.name == tunnelName) {
+                                            if (state == Tunnel.State.UP && tunnel.name == tunnelName)
                                                showSnackbarMessage(
                                                    context.resources.getString(
                                                        R.string.turn_off_tunnel
                                                    )
                                                )
-                                            } else {
+                                            else {
-                                                navController.navigate(
+                                                navController.navigate("${Routes.Config.name}/${tunnel.id}")
                                                    "${Routes.Config.name}/${tunnel.id}"
                                                )
                                            }
                                        }) {
                                            Icon(
@@ -574,13 +488,13 @@ fun MainScreen(
                                            )
                                        }
                                        IconButton(onClick = {
-                                            if (state == Tunnel.State.UP && tunnel.name == tunnelName) {
+                                            if (state == Tunnel.State.UP && tunnel.name == tunnelName)
                                                showSnackbarMessage(
                                                    context.resources.getString(
                                                        R.string.turn_off_tunnel
                                                    )
                                                )
-                                            } else {
+                                            else {
                                                viewModel.onDelete(tunnel)
                                            }
                                        }) {
@@ -595,8 +509,7 @@ fun MainScreen(
                                    TunnelSwitch()
                                }
                            }
-                        }
+                        })
                    )
                }
            }
        }
@@ -22,9 +22,6 @@ import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
 import com.zaneschepke.wireguardautotunnel.util.NumberUtils
 import com.zaneschepke.wireguardautotunnel.util.WgTunnelException
 import dagger.hilt.android.lifecycle.HiltViewModel
 import java.io.InputStream
 import java.util.zip.ZipInputStream
 import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -32,16 +29,19 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.InputStream
 import java.util.zip.ZipInputStream
 import javax.inject.Inject
@HiltViewModel
-class MainViewModel
+class MainViewModel @Inject constructor(
@Inject
 constructor(
    private val application: Application,
    private val tunnelRepo: TunnelConfigDao,
    private val settingsRepo: SettingsDoa,
    private val vpnService: VpnService
 ) : ViewModel() {
    val tunnels get() = tunnelRepo.getAllFlow()
    val state get() = vpnService.state
@@ -62,8 +62,7 @@ constructor(
    }
    private fun validateWatcherServiceState(settings: Settings) {
-        val watcherState =
+        val watcherState = ServiceManager.getServiceState(
            ServiceManager.getServiceState(
            application.applicationContext,
            WireGuardConnectivityWatcherService::class.java
        )
@@ -75,6 +74,7 @@ constructor(
        }
    }
    fun onDelete(tunnel: TunnelConfig) {
        viewModelScope.launch {
            if (tunnelRepo.count() == 1L) {
@@ -106,7 +106,7 @@ constructor(
    private suspend fun stopActiveTunnel() {
        if (ServiceManager.getServiceState(
                application.applicationContext,
-                WireGuardTunnelService::class.java
+                WireGuardTunnelService::class.java,
            ) == ServiceState.STARTED
        ) {
            onTunnelStop()
@@ -133,10 +133,7 @@ constructor(
        }
    }
-    private suspend fun saveTunnelConfigFromStream(
+    private suspend fun saveTunnelConfigFromStream(stream: InputStream, fileName: String) {
        stream: InputStream,
        fileName: String
    ) {
        val bufferReader = stream.bufferedReader(charset = Charsets.UTF_8)
        val config = Config.parse(bufferReader)
        val tunnelName = getNameFromFileName(fileName)
@@ -158,9 +155,7 @@ constructor(
            when(fileExtension){
                Constants.CONF_FILE_EXTENSION -> saveTunnelFromConfUri(fileName, uri)
                Constants.ZIP_FILE_EXTENSION -> saveTunnelsFromZipUri(uri)
-                else -> throw WgTunnelException(
+                else -> throw WgTunnelException(application.getString(R.string.file_extension_message))
                    application.getString(R.string.file_extension_message)
                )
            }
        } catch (e: Exception) {
            throw WgTunnelException(e)
@@ -170,10 +165,8 @@ constructor(
    private suspend fun saveTunnelsFromZipUri(uri: Uri) {
        ZipInputStream(getInputStreamFromUri(uri)).use { zip ->
            generateSequence { zip.nextEntry }
-                .filterNot {
+                .filterNot { it.isDirectory ||
-                    it.isDirectory ||
+                        getFileExtensionFromFileName(it.name) != Constants.CONF_FILE_EXTENSION }
                            getFileExtensionFromFileName(it.name) != Constants.CONF_FILE_EXTENSION
                }
                .forEach {
                    val name = getNameFromFileName(it.name)
                    val config = Config.parse(zip)
@@ -184,10 +177,7 @@ constructor(
        }
    }
-    private suspend fun saveTunnelFromConfUri(
+    private suspend fun saveTunnelFromConfUri(name : String, uri: Uri) {
        name: String,
        uri: Uri
    ) {
        val stream = getInputStreamFromUri(uri)
        saveTunnelConfigFromStream(stream, name)
    }
@@ -200,10 +190,7 @@ constructor(
        tunnelRepo.save(tunnelConfig)
    }
-    private fun getFileNameByCursor(
+    private fun getFileNameByCursor(context: Context, uri: Uri): String {
        context: Context,
        uri: Uri
    ): String {
        val cursor = context.contentResolver.query(uri, null, null, null, null)
        if (cursor != null) {
            cursor.use {
@@ -237,10 +224,8 @@ constructor(
        }
    }
-    private fun getFileName(
+
-        context: Context,
+    private fun getFileName(context: Context, uri: Uri): String {
        uri: Uri
    ): String {
        validateUriContentScheme(uri)
        return try {
            getFileNameByCursor(context, uri)
@@ -38,7 +38,6 @@ import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -66,32 +65,29 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
 import com.wireguard.android.backend.Tunnel
 import com.wireguard.android.backend.WgQuickBackend
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.repository.datastore.DataStoreManager
 import com.zaneschepke.wireguardautotunnel.ui.common.ClickableIconButton
 import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationToggle
 import com.zaneschepke.wireguardautotunnel.ui.common.prompt.AuthorizationPrompt
 import com.zaneschepke.wireguardautotunnel.ui.common.text.SectionTitle
-import com.zaneschepke.wireguardautotunnel.util.FileUtils
+import com.zaneschepke.wireguardautotunnel.util.StorageUtil
 import com.zaneschepke.wireguardautotunnel.util.WgTunnelException
 import java.io.File
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.io.File
@OptIn(
    ExperimentalPermissionsApi::class,
-    ExperimentalLayoutApi::class,
+    ExperimentalLayoutApi::class, ExperimentalComposeUiApi::class
    ExperimentalComposeUiApi::class
 )
@Composable
 fun SettingsScreen(
    viewModel: SettingsViewModel = hiltViewModel(),
    padding: PaddingValues,
    showSnackbarMessage: (String) -> Unit,
-    focusRequester: FocusRequester
+    focusRequester: FocusRequester,
 ) {
    val scope = rememberCoroutineScope { Dispatchers.IO }
    val context = LocalContext.current
    val focusManager = LocalFocusManager.current
@@ -104,24 +100,16 @@ fun SettingsScreen(
    val fineLocationState = rememberPermissionState(Manifest.permission.ACCESS_FINE_LOCATION)
    var currentText by remember { mutableStateOf("") }
    val scrollState = rememberScrollState()
    var isLocationDisclaimerNeeded by remember { mutableStateOf(true) }
    var isBackgroundLocationGranted by remember { mutableStateOf(true) }
    var showAuthPrompt by remember { mutableStateOf(false) }
    var didExportFiles by remember { mutableStateOf(false) }
-    val isLocationDisclosureShown by viewModel.disclosureShown.collectAsStateWithLifecycle(
+
-        null
+
    )
    val vpnState = viewModel.vpnState.collectAsStateWithLifecycle(initialValue = Tunnel.State.DOWN)
    val screenPadding = 5.dp
    val fillMaxWidth = .85f
    fun setLocationDisclosureShown() = scope.launch {
        viewModel.dataStoreManager.saveToDataStore(
            DataStoreManager.LOCATION_DISCLOSURE_SHOWN,
            true
        )
    }
    fun exportAllConfigs() {
        try {
            val files = tunnels.map { File(context.cacheDir, "${it.name}.conf") }
@@ -130,7 +118,7 @@ fun SettingsScreen(
                    it.write(tunnels[index].wgQuick.toByteArray())
                }
            }
-            FileUtils.saveFilesToZip(context, files)
+            StorageUtil.saveFilesToZip(context, files)
            didExportFiles = true
            showSnackbarMessage(context.getString(R.string.exported_configs_message))
        } catch (e : Exception) {
@@ -138,6 +126,7 @@ fun SettingsScreen(
        }
    }
    fun saveTrustedSSID() {
        if (currentText.isNotEmpty()) {
            scope.launch {
@@ -152,13 +141,10 @@ fun SettingsScreen(
    }
    fun isAllAutoTunnelPermissionsEnabled() : Boolean {
-        return (
+        return(isBackgroundLocationGranted && fineLocationState.status.isGranted && !viewModel.isLocationServicesNeeded())
                isBackgroundLocationGranted &&
                        fineLocationState.status.isGranted &&
                        !viewModel.isLocationServicesNeeded()
                )
    }
    fun openSettings() {
        scope.launch {
            val intentSettings =
@@ -172,13 +158,11 @@ fun SettingsScreen(
    if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
        val backgroundLocationState =
            rememberPermissionState(Manifest.permission.ACCESS_BACKGROUND_LOCATION)
-        isBackgroundLocationGranted = if (!backgroundLocationState.status.isGranted) {
+        if(!backgroundLocationState.status.isGranted) {
-            false
+            isBackgroundLocationGranted = false
        } else {
-            SideEffect {
+            isLocationDisclaimerNeeded = false
-                setLocationDisclosureShown()
+            isBackgroundLocationGranted = true
            }
            true
        }
    }
@@ -186,19 +170,16 @@ fun SettingsScreen(
        if(!fineLocationState.status.isGranted) {
            isBackgroundLocationGranted = false
        } else {
-            SideEffect {
+            isLocationDisclaimerNeeded = false
                setLocationDisclosureShown()
            }
            isBackgroundLocationGranted = true
        }
    }
-        if (isLocationDisclosureShown != true) {
+    if(isLocationDisclaimerNeeded) {
        Column(
            horizontalAlignment = Alignment.CenterHorizontally,
            verticalArrangement = Arrangement.Top,
-                modifier =
+            modifier = Modifier
                Modifier
                .fillMaxSize()
                .verticalScroll(scrollState)
                .padding(padding)
@@ -206,8 +187,7 @@ fun SettingsScreen(
            Icon(
                Icons.Rounded.LocationOff,
                contentDescription = stringResource(id = R.string.map),
-                    modifier =
+                modifier = Modifier
                    Modifier
                    .padding(30.dp)
                    .size(128.dp)
            )
@@ -224,27 +204,21 @@ fun SettingsScreen(
                fontSize = 15.sp
            )
            Row(
-                    modifier =
+                modifier = if (WireGuardAutoTunnel.isRunningOnAndroidTv(context)) Modifier
                    if (WireGuardAutoTunnel.isRunningOnAndroidTv(context)) {
                        Modifier
                    .fillMaxWidth()
-                            .padding(10.dp)
+                    .padding(10.dp) else Modifier
                    } else {
                        Modifier
                    .fillMaxWidth()
-                            .padding(30.dp)
+                    .padding(30.dp),
                    },
                verticalAlignment = Alignment.CenterVertically,
                horizontalArrangement = Arrangement.SpaceEvenly
            ) {
                TextButton(onClick = {
-                        setLocationDisclosureShown()
+                    isLocationDisclaimerNeeded = false
                }) {
                    Text(stringResource(id = R.string.no_thanks))
                }
                TextButton(modifier = Modifier.focusRequester(focusRequester), onClick = {
                    openSettings()
                        setLocationDisclosureShown()
                }) {
                    Text(stringResource(id = R.string.turn_on))
                }
@@ -253,12 +227,12 @@ fun SettingsScreen(
        return
    }
    if(showAuthPrompt) {
-            AuthorizationPrompt(
+        AuthorizationPrompt(onSuccess = {
                onSuccess = {
            showAuthPrompt = false
-                    exportAllConfigs()
+            exportAllConfigs() },
                },
            onError = { error ->
                showSnackbarMessage(error)
                showAuthPrompt = false
@@ -266,16 +240,14 @@ fun SettingsScreen(
            onFailure = {
                showAuthPrompt = false
                showSnackbarMessage(context.getString(R.string.authentication_failed))
-                }
+            })
            )
    }
    if (tunnels.isEmpty()) {
        Column(
            horizontalAlignment = Alignment.CenterHorizontally,
            verticalArrangement = Arrangement.Center,
-                modifier =
+            modifier = Modifier
                Modifier
                .fillMaxSize()
                .padding(padding)
        ) {
@@ -292,8 +264,7 @@ fun SettingsScreen(
    Column(
        horizontalAlignment = Alignment.CenterHorizontally,
        verticalArrangement = Arrangement.Top,
-            modifier =
+        modifier = Modifier
            Modifier
            .fillMaxSize()
            .verticalScroll(scrollState)
            .clickable(indication = null, interactionSource = interactionSource) {
@@ -305,29 +276,21 @@ fun SettingsScreen(
            shadowElevation = 2.dp,
            shape = RoundedCornerShape(12.dp),
            color = MaterialTheme.colorScheme.surface,
-                modifier =
+            modifier = (if (WireGuardAutoTunnel.isRunningOnAndroidTv(context))
                (
                        if (WireGuardAutoTunnel.isRunningOnAndroidTv(context)) {
                Modifier
                    .height(IntrinsicSize.Min)
                    .fillMaxWidth(fillMaxWidth)
                    .padding(top = 10.dp)
-                        } else {
+            else Modifier
                            Modifier
                .fillMaxWidth(fillMaxWidth)
-                                .padding(top = 60.dp)
+                .padding(top = 60.dp)).padding(bottom = 25.dp)
                        }
                        ).padding(bottom = 10.dp)
        ) {
            Column(
                horizontalAlignment = Alignment.Start,
                verticalArrangement = Arrangement.Top,
                modifier = Modifier.padding(15.dp)
            ) {
-                    SectionTitle(
+                SectionTitle(title = stringResource(id = R.string.auto_tunneling), padding = screenPadding)
                        title = stringResource(id = R.string.auto_tunneling),
                        padding = screenPadding
                    )
                ConfigurationToggle(
                    stringResource(id = R.string.tunnel_on_wifi),
                    enabled = !(settings.isAutoTunnelEnabled || settings.isAlwaysOnVpnEnabled),
@@ -343,10 +306,9 @@ fun SettingsScreen(
                AnimatedVisibility(visible = settings.isTunnelOnWifiEnabled) {
                    Column {
                        FlowRow(
-                                modifier = Modifier
+                            modifier = Modifier.padding(screenPadding),
-                                    .padding(screenPadding)
+                            horizontalArrangement = Arrangement.spacedBy(8.dp),
-                                    .fillMaxWidth(),
+                            verticalArrangement = Arrangement.SpaceEvenly
                                horizontalArrangement = Arrangement.spacedBy(5.dp)
                        ) {
                            trustedSSIDs.forEach { ssid ->
                                ClickableIconButton(
@@ -361,11 +323,7 @@ fun SettingsScreen(
                                )
                            }
                            if(trustedSSIDs.isEmpty()) {
-                                    Text(
+                                Text(stringResource(R.string.none), fontStyle = FontStyle.Italic, color = Color.Gray)
                                        stringResource(R.string.none),
                                        fontStyle = FontStyle.Italic,
                                        color = Color.Gray
                                    )
                            }
                        }
                        OutlinedTextField(
@@ -373,8 +331,7 @@ fun SettingsScreen(
                            value = currentText,
                            onValueChange = { currentText = it },
                            label = { Text(stringResource(R.string.add_trusted_ssid)) },
-                                modifier =
+                            modifier = Modifier
                                Modifier
                                .padding(start = screenPadding, top = 5.dp, bottom = 10.dp)
                                .onFocusChanged {
                                    if (WireGuardAutoTunnel.isRunningOnAndroidTv(context)) {
@@ -382,42 +339,30 @@ fun SettingsScreen(
                                    }
                                },
                            maxLines = 1,
-                                keyboardOptions =
+                            keyboardOptions = KeyboardOptions(
                                KeyboardOptions(
                                capitalization = KeyboardCapitalization.None,
                                imeAction = ImeAction.Done
                            ),
-                                keyboardActions =
+                            keyboardActions = KeyboardActions(
                                KeyboardActions(
                                onDone = {
                                    saveTrustedSSID()
                                }
                            ),
                            trailingIcon = {
                                    if (currentText != "") {
                                IconButton(onClick = { saveTrustedSSID() }) {
                                    Icon(
                                        imageVector = Icons.Outlined.Add,
-                                                contentDescription =
+                                        contentDescription = if (currentText == "") stringResource(id = R.string.trusted_ssid_empty_description) else stringResource(
                                                if (currentText == "") {
                                                    stringResource(
                                                        id = R.string.trusted_ssid_empty_description
                                                    )
                                                } else {
                                                    stringResource(
                                            id = R.string.trusted_ssid_value_description
                                        ),
                                        tint = if (currentText == "") Color.Transparent else MaterialTheme.colorScheme.primary
                                    )
                                }
                            },
                                                tint = MaterialTheme.colorScheme.primary
                        )
                    }
                }
-                                }
+                ConfigurationToggle(stringResource(R.string.tunnel_mobile_data),
                            )
                        }
                    }
                    ConfigurationToggle(
                        stringResource(R.string.tunnel_mobile_data),
                    enabled = !(settings.isAutoTunnelEnabled || settings.isAlwaysOnVpnEnabled),
                    checked = settings.isTunnelOnMobileDataEnabled,
                    padding = screenPadding,
@@ -427,8 +372,7 @@ fun SettingsScreen(
                        }
                    }
                )
-                    ConfigurationToggle(
+                ConfigurationToggle(stringResource(id = R.string.tunnel_on_ethernet),
                        stringResource(id = R.string.tunnel_on_ethernet),
                    enabled = !(settings.isAutoTunnelEnabled || settings.isAlwaysOnVpnEnabled),
                    checked = settings.isTunnelOnEthernetEnabled,
                    padding = screenPadding,
@@ -451,8 +395,7 @@ fun SettingsScreen(
                )
                Row(
                    verticalAlignment = Alignment.CenterVertically,
-                        modifier =
+                    modifier = Modifier
                        Modifier
                        .fillMaxSize()
                        .padding(top = 5.dp),
                    horizontalArrangement = Arrangement.Center
@@ -460,9 +403,9 @@ fun SettingsScreen(
                    TextButton(
                        enabled = !settings.isAlwaysOnVpnEnabled,
                        onClick = {
                            //TODO fix logic for mobile only
                            if(!isAllAutoTunnelPermissionsEnabled() && settings.isTunnelOnWifiEnabled) {
-                                    val message =
+                                val message = if(!isBackgroundLocationGranted) {
                                        if (!isBackgroundLocationGranted) {
                                    context.getString(R.string.background_location_required)
                                } else if(viewModel.isLocationServicesNeeded()) {
                                    context.getString(R.string.location_services_required)
@@ -470,64 +413,17 @@ fun SettingsScreen(
                                    context.getString(R.string.precise_location_required)
                                }
                                showSnackbarMessage(message)
-                                } else {
+                            } else scope.launch {
                                    scope.launch {
                                viewModel.toggleAutoTunnel()
                            }
-                                }
+                        }) {
-                            }
+                        val autoTunnelButtonText = if(settings.isAutoTunnelEnabled) stringResource(R.string.disable_auto_tunnel)
-                        ) {
+                        else stringResource(id = R.string.enable_auto_tunnel)
                            val autoTunnelButtonText =
                                if (settings.isAutoTunnelEnabled) {
                                    stringResource(R.string.disable_auto_tunnel)
                                } else {
                                    stringResource(id = R.string.enable_auto_tunnel)
                                }
                        Text(autoTunnelButtonText)
                    }
                }
            }
        }
            if (WgQuickBackend.hasKernelSupport()) {
                Surface(
                    tonalElevation = 2.dp,
                    shadowElevation = 2.dp,
                    shape = RoundedCornerShape(12.dp),
                    color = MaterialTheme.colorScheme.surface,
                    modifier = Modifier
                        .fillMaxWidth(fillMaxWidth)
                        .padding(vertical = 10.dp)
                ) {
                    Column(
                        horizontalAlignment = Alignment.Start,
                        verticalArrangement = Arrangement.Top,
                        modifier = Modifier.padding(15.dp)
                    ) {
                        SectionTitle(
                            title = stringResource(id = R.string.kernel),
                            padding = screenPadding
                        )
                        ConfigurationToggle(
                            stringResource(R.string.use_kernel),
                            enabled = !(
                                    settings.isAutoTunnelEnabled || settings.isAlwaysOnVpnEnabled ||
                                            (vpnState.value == Tunnel.State.UP)
                                    ),
                            checked = settings.isKernelEnabled,
                            padding = screenPadding,
                            onCheckChanged = {
                                scope.launch {
                                    try {
                                        viewModel.onToggleKernelMode()
                                    } catch (e: WgTunnelException) {
                                        showSnackbarMessage(e.message)
                                    }
                                }
                            }
                        )
                    }
                }
            }
        if(!WireGuardAutoTunnel.isRunningOnAndroidTv(context)) {
            Surface(
                tonalElevation = 2.dp,
@@ -535,20 +431,17 @@ fun SettingsScreen(
                shape = RoundedCornerShape(12.dp),
                color = MaterialTheme.colorScheme.surface,
                modifier = Modifier
-                        .fillMaxWidth(fillMaxWidth).padding(vertical = 10.dp)
+                    .fillMaxWidth(fillMaxWidth)
-                        .padding(bottom = 140.dp)
+                    .height(IntrinsicSize.Min)
                    .padding(bottom = 180.dp)
            ) {
                Column(
                    horizontalAlignment = Alignment.Start,
                    verticalArrangement = Arrangement.Top,
                    modifier = Modifier.padding(15.dp)
                ) {
-                        SectionTitle(
+                    SectionTitle(title = stringResource(id = R.string.other), padding = screenPadding)
-                            title = stringResource(id = R.string.other),
+                    ConfigurationToggle(stringResource(R.string.always_on_vpn_support),
                            padding = screenPadding
                        )
                        ConfigurationToggle(
                            stringResource(R.string.always_on_vpn_support),
                        enabled = !settings.isAutoTunnelEnabled,
                        checked = settings.isAlwaysOnVpnEnabled,
                        padding = screenPadding,
@@ -558,8 +451,7 @@ fun SettingsScreen(
                            }
                        }
                    )
-                        ConfigurationToggle(
+                    ConfigurationToggle(stringResource(R.string.enabled_app_shortcuts),
                            stringResource(R.string.enabled_app_shortcuts),
                        enabled = true,
                        checked = settings.isShortcutsEnabled,
                        padding = screenPadding,
@@ -571,8 +463,7 @@ fun SettingsScreen(
                    )
                    Row(
                        verticalAlignment = Alignment.CenterVertically,
-                            modifier =
+                        modifier = Modifier
                            Modifier
                            .fillMaxSize()
                            .padding(top = 5.dp),
                        horizontalArrangement = Arrangement.Center
@@ -581,8 +472,7 @@ fun SettingsScreen(
                            enabled = !didExportFiles,
                            onClick = {
                                showAuthPrompt = true
-                                }
+                            }) {
                            ) {
                            Text(stringResource(R.string.export_configs))
                        }
                    }
@@ -594,3 +484,5 @@ fun SettingsScreen(
        }
    }
 }
@@ -6,45 +6,32 @@ import android.location.LocationManager
 import android.os.Build
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.wireguard.android.util.RootShell
 import com.zaneschepke.wireguardautotunnel.repository.SettingsDoa
 import com.zaneschepke.wireguardautotunnel.repository.TunnelConfigDao
 import com.zaneschepke.wireguardautotunnel.repository.datastore.DataStoreManager
 import com.zaneschepke.wireguardautotunnel.repository.model.Settings
 import com.zaneschepke.wireguardautotunnel.repository.model.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
 import com.zaneschepke.wireguardautotunnel.util.WgTunnelException
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.launch
-import timber.log.Timber
+import javax.inject.Inject
@HiltViewModel
-class SettingsViewModel
+class SettingsViewModel @Inject constructor(private val application : Application,
-@Inject
+                                            private val tunnelRepo : TunnelConfigDao, private val settingsRepo : SettingsDoa
 constructor(
    private val application: Application,
    private val tunnelRepo: TunnelConfigDao,
    private val settingsRepo: SettingsDoa,
    val dataStoreManager: DataStoreManager,
    private val rootShell: RootShell,
    private val vpnService: VpnService
 ) : ViewModel() {
    private val _trustedSSIDs = MutableStateFlow(emptyList<String>())
    val trustedSSIDs = _trustedSSIDs.asStateFlow()
    private val _settings = MutableStateFlow(Settings())
    val settings get() = _settings.asStateFlow()
    val vpnState get() = vpnService.state
    val tunnels get() = tunnelRepo.getAllFlow()
    val disclosureShown = dataStoreManager.locationDisclosureFlow
    init {
        isLocationServicesEnabled()
        viewModelScope.launch(Dispatchers.IO) {
@@ -55,6 +42,7 @@ constructor(
            }
        }
    }
    suspend fun onSaveTrustedSSID(ssid: String) {
        val trimmed = ssid.trim()
        if (!_settings.value.trustedNetworkSSIDs.contains(trimmed)) {
@@ -66,11 +54,9 @@ constructor(
    }
    suspend fun onToggleTunnelOnMobileData() {
-        settingsRepo.save(
+        settingsRepo.save(_settings.value.copy(
            _settings.value.copy(
            isTunnelOnMobileDataEnabled = !_settings.value.isTunnelOnMobileDataEnabled
-            )
+        ))
        )
    }
    suspend fun onDeleteTrustedSSID(ssid: String) {
@@ -78,8 +64,7 @@ constructor(
        settingsRepo.save(_settings.value)
    }
-    private fun emitFirstTunnelAsDefault() =
+    private fun emitFirstTunnelAsDefault() = viewModelScope.async {
        viewModelScope.async {
        _settings.emit(_settings.value.copy(defaultTunnel = getFirstTunnelConfig().toString()))
    }
@@ -93,11 +78,9 @@ constructor(
            val defaultTunnel = _settings.value.defaultTunnel
            ServiceManager.startWatcherService(application, defaultTunnel!!)
        }
-        settingsRepo.save(
+        settingsRepo.save(_settings.value.copy(
            _settings.value.copy(
            isAutoTunnelEnabled = !_settings.value.isAutoTunnelEnabled
-            )
+        ))
        )
    }
    private suspend fun getFirstTunnelConfig() : TunnelConfig {
@@ -108,10 +91,7 @@ constructor(
        if(_settings.value.defaultTunnel == null) {
            emitFirstTunnelAsDefault().await()
        }
-        val updatedSettings =
+        val updatedSettings = _settings.value.copy(isAlwaysOnVpnEnabled = !_settings.value.isAlwaysOnVpnEnabled)
            _settings.value.copy(
                isAlwaysOnVpnEnabled = !_settings.value.isAlwaysOnVpnEnabled
            )
        emitSettings(updatedSettings)
        saveSettings(updatedSettings)
    }
@@ -131,9 +111,7 @@ constructor(
            emitFirstTunnelAsDefault().await()
        }
        _settings.emit(
-            _settings.value.copy(
+            _settings.value.copy(isTunnelOnEthernetEnabled = !_settings.value.isTunnelOnEthernetEnabled)
                isTunnelOnEthernetEnabled = !_settings.value.isTunnelOnEthernetEnabled
            )
        )
        settingsRepo.save(_settings.value)
    }
@@ -149,49 +127,20 @@ constructor(
    }
    suspend fun onToggleShortcutsEnabled() {
-        settingsRepo.save(
+        settingsRepo.save(_settings.value.copy(
            _settings.value.copy(
            isShortcutsEnabled = !_settings.value.isShortcutsEnabled
-            )
+        ))
        )
    }
    suspend fun onToggleBatterySaver() {
-        settingsRepo.save(
+        settingsRepo.save(_settings.value.copy(
            _settings.value.copy(
            isBatterySaverEnabled = !_settings.value.isBatterySaverEnabled
-            )
+        ))
        )
    }
    private suspend fun saveKernelMode(on: Boolean) {
        settingsRepo.save(
            _settings.value.copy(
                isKernelEnabled = on
            )
        )
    }
    suspend fun onToggleKernelMode() {
        if (!_settings.value.isKernelEnabled) {
            try {
                rootShell.start()
                Timber.d("Root shell accepted!")
                saveKernelMode(on = true)
            } catch (e: RootShell.RootShellException) {
                saveKernelMode(on = false)
                throw WgTunnelException("Root shell denied!")
            }
        } else {
            saveKernelMode(on = false)
        }
    }
    suspend fun onToggleTunnelOnWifi() {
-        settingsRepo.save(
+        settingsRepo.save(_settings.value.copy(
            _settings.value.copy(
            isTunnelOnWifiEnabled = !_settings.value.isTunnelOnWifiEnabled
-            )
+        ))
        )
    }
 }
@@ -30,7 +30,6 @@ import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
@@ -45,25 +44,17 @@ import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.core.content.ContextCompat.startActivity
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.zaneschepke.wireguardautotunnel.BuildConfig
 import com.zaneschepke.wireguardautotunnel.Constants
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.SettingsViewModel
@Composable
-fun SupportScreen(
+fun SupportScreen(padding : PaddingValues, focusRequester: FocusRequester) {
-    viewModel: SettingsViewModel = hiltViewModel(),
+
    padding: PaddingValues,
    focusRequester: FocusRequester
 ) {
    val context = LocalContext.current
    val fillMaxWidth = .85f
    val settings by viewModel.settings.collectAsStateWithLifecycle()
    fun openWebPage(url: String) {
        val webpage: Uri = Uri.parse(url)
        val intent = Intent(Intent.ACTION_VIEW, webpage)
@@ -71,151 +62,76 @@ fun SupportScreen(
    }
    fun launchEmail() {
-        val intent =
+        val intent = Intent(Intent.ACTION_SEND).apply {
            Intent(Intent.ACTION_SEND).apply {
            type = Constants.EMAIL_MIME_TYPE
            putExtra(Intent.EXTRA_EMAIL, context.getString(R.string.my_email))
            putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.email_subject))
        }
-        startActivity(
+        startActivity(context,createChooser(intent, context.getString(R.string.email_chooser)),null)
            context,
            createChooser(intent, context.getString(R.string.email_chooser)),
            null
        )
    }
-    Column(
+        Column(horizontalAlignment = Alignment.CenterHorizontally,
        horizontalAlignment = Alignment.CenterHorizontally,
            verticalArrangement = Arrangement.Top,
-        modifier =
+            modifier = Modifier
        Modifier
                .fillMaxSize()
                .verticalScroll(rememberScrollState())
                .focusable()
-            .padding(padding)
+                .padding(padding)) {
    ) {
            Surface(
                tonalElevation = 2.dp,
                shadowElevation = 2.dp,
                shape = RoundedCornerShape(12.dp),
                color = MaterialTheme.colorScheme.surface,
-            modifier =
+                modifier = (if (WireGuardAutoTunnel.isRunningOnAndroidTv(context))
            (
                    if (WireGuardAutoTunnel.isRunningOnAndroidTv(context)) {
                    Modifier
                        .height(IntrinsicSize.Min)
                        .fillMaxWidth(fillMaxWidth)
                        .padding(top = 10.dp)
-                    } else {
+                else Modifier
                        Modifier
                    .fillMaxWidth(fillMaxWidth)
-                            .padding(top = 20.dp)
+                    .padding(top = 20.dp)).padding(bottom = 25.dp)
                    }
                    ).padding(bottom = 25.dp)
            ) {
                Column(modifier = Modifier.padding(20.dp)) {
-                Text(
+                    Text(stringResource(R.string.thank_you), textAlign = TextAlign.Start, modifier = Modifier.padding(bottom = 20.dp), fontSize = 16.sp)
-                    stringResource(R.string.thank_you),
+                    Text(stringResource(id = R.string.support_help_text), textAlign = TextAlign.Start, fontSize = 16.sp, modifier = Modifier.padding(bottom = 20.dp))
-                    textAlign = TextAlign.Start,
+                    TextButton(onClick = { openWebPage(context.resources.getString(R.string.docs_url)) }, modifier = Modifier.padding(vertical = 5.dp).focusRequester(focusRequester)) {
-                    modifier = Modifier.padding(bottom = 20.dp),
+                        Row(horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) {
                    fontSize = 16.sp
                )
                Text(
                    stringResource(id = R.string.support_help_text),
                    textAlign = TextAlign.Start,
                    fontSize = 16.sp,
                    modifier = Modifier.padding(bottom = 20.dp)
                )
                TextButton(onClick = {
                    openWebPage(context.resources.getString(R.string.docs_url))
                }, modifier = Modifier.padding(vertical = 5.dp).focusRequester(focusRequester)) {
                    Row(
                        horizontalArrangement = Arrangement.SpaceBetween,
                        verticalAlignment = Alignment.CenterVertically,
                        modifier = Modifier.fillMaxWidth()
                    ) {
                            Row {
                                Icon(Icons.Rounded.Book, stringResource(id = R.string.docs))
-                            Text(
+                                Text(stringResource(id = R.string.docs_description), textAlign = TextAlign.Justify, modifier = Modifier.padding(start = 10.dp))
                                stringResource(id = R.string.docs_description),
                                textAlign = TextAlign.Justify,
                                modifier = Modifier.padding(start = 10.dp)
                            )
                            }
                            Icon(Icons.Rounded.ArrowForward, stringResource(id = R.string.go))
                        }
                    }
                    Divider(color = MaterialTheme.colorScheme.onBackground, thickness = 0.5.dp)
-                TextButton(
+                    TextButton(onClick = { openWebPage(context.resources.getString(R.string.discord_url)) }, modifier = Modifier.padding(vertical = 5.dp)) {
-                    onClick = { openWebPage(context.resources.getString(R.string.discord_url)) },
+                        Row(horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) {
                    modifier = Modifier.padding(vertical = 5.dp)
                ) {
                    Row(
                        horizontalArrangement = Arrangement.SpaceBetween,
                        verticalAlignment = Alignment.CenterVertically,
                        modifier = Modifier.fillMaxWidth()
                    ) {
                            Row {
-                            Icon(
+                                Icon(imageVector = ImageVector.vectorResource(R.drawable.discord), stringResource(
-                                imageVector = ImageVector.vectorResource(R.drawable.discord),
+                                    id = R.string.discord), Modifier.size(25.dp))
-                                stringResource(
+                                Text(stringResource(id = R.string.discord_description), textAlign = TextAlign.Justify, modifier = Modifier.padding(start = 10.dp))
                                    id = R.string.discord
                                ),
                                Modifier.size(25.dp)
                            )
                            Text(
                                stringResource(id = R.string.discord_description),
                                textAlign = TextAlign.Justify,
                                modifier = Modifier.padding(start = 10.dp)
                            )
                            }
                            Icon(Icons.Rounded.ArrowForward, stringResource(id = R.string.go))
                        }
                    }
                    Divider(color = MaterialTheme.colorScheme.onBackground, thickness = 0.5.dp)
-                TextButton(
+                    TextButton(onClick = { openWebPage(context.resources.getString(R.string.github_url)) }, modifier = Modifier.padding(vertical = 5.dp)) {
-                    onClick = { openWebPage(context.resources.getString(R.string.github_url)) },
+                        Row(horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) {
                    modifier = Modifier.padding(vertical = 5.dp)
                ) {
                    Row(
                        horizontalArrangement = Arrangement.SpaceBetween,
                        verticalAlignment = Alignment.CenterVertically,
                        modifier = Modifier.fillMaxWidth()
                    ) {
                            Row {
-                            Icon(
+                                Icon(imageVector = ImageVector.vectorResource(R.drawable.github), stringResource(
                                imageVector = ImageVector.vectorResource(R.drawable.github),
                                stringResource(
                                    id = R.string.github
-                                ),
+                                ), Modifier.size(25.dp))
-                                Modifier.size(25.dp)
+                                Text("Open an issue", textAlign = TextAlign.Justify, modifier = Modifier.padding(start = 10.dp))
                            )
                            Text(
                                "Open an issue",
                                textAlign = TextAlign.Justify,
                                modifier = Modifier.padding(start = 10.dp)
                            )
                            }
                            Icon(Icons.Rounded.ArrowForward, stringResource(id = R.string.go))
                        }
                    }
                    Divider(color = MaterialTheme.colorScheme.onBackground, thickness = 0.5.dp)
-                TextButton(
+                    TextButton(onClick = { launchEmail() }, modifier = Modifier.padding(vertical = 5.dp)) {
-                    onClick = { launchEmail() },
+                        Row(horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) {
                    modifier = Modifier.padding(vertical = 5.dp)
                ) {
                    Row(
                        horizontalArrangement = Arrangement.SpaceBetween,
                        verticalAlignment = Alignment.CenterVertically,
                        modifier = Modifier.fillMaxWidth()
                    ) {
                            Row {
                                Icon(Icons.Rounded.Mail, stringResource(id = R.string.email))
-                            Text(
+                                Text(stringResource(id = R.string.email_description), textAlign = TextAlign.Justify, modifier = Modifier.padding(start = 10.dp))
                                stringResource(id = R.string.email_description),
                                textAlign = TextAlign.Justify,
                                modifier = Modifier.padding(start = 10.dp)
                            )
                            }
                            Icon(Icons.Rounded.ArrowForward, stringResource(id = R.string.go))
                        }
@@ -223,22 +139,10 @@ fun SupportScreen(
                }
            }
            Spacer(modifier = Modifier.weight(1f))
-        Text(
+            Text(stringResource(id = R.string.privacy_policy), style = TextStyle(textDecoration = TextDecoration.Underline),
-            stringResource(id = R.string.privacy_policy),
+                modifier = Modifier.clickable {
            style = TextStyle(textDecoration = TextDecoration.Underline),
            fontSize = 16.sp,
            modifier =
            Modifier.clickable {
                openWebPage(context.resources.getString(R.string.privacy_policy_url))
-            }
+            })
-        )
+            Text("App version: ${BuildConfig.VERSION_NAME}", Modifier.padding(25.dp))
        Row(
            horizontalArrangement = Arrangement.spacedBy(25.dp),
            verticalAlignment = Alignment.CenterVertically,
            modifier = Modifier.padding(25.dp)
        ) {
            Text("Version: ${BuildConfig.VERSION_NAME}")
            Text("Mode: ${if (settings.isKernelEnabled) "Kernel" else "Userspace" }")
        }
        }
    }
@@ -1,25 +0,0 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.support
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.zaneschepke.wireguardautotunnel.repository.SettingsDoa
 import com.zaneschepke.wireguardautotunnel.repository.model.Settings
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
@HiltViewModel
 class SupportViewModel @Inject constructor(
    private val settingsRepo: SettingsDoa
 ) : ViewModel() {
    private val _settings = MutableStateFlow(Settings())
    val settings get() = _settings.asStateFlow()
    init {
        viewModelScope.launch(Dispatchers.IO) {
            _settings.value = settingsRepo.getAll().first()
        }
    }
 }
@@ -13,6 +13,5 @@ val Pink40 = Color(0xFFFFFFFF)
 //status colors
 val brickRed = Color(0xFFCE4257)
 val corn = Color(0xFFFBEC5D)
 val pinkRed = Color(0xFFEF476F)
 val mint = Color(0xFF52B788)
@@ -15,8 +15,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.core.view.WindowCompat
-private val DarkColorScheme =
+private val DarkColorScheme = darkColorScheme(
    darkColorScheme(
    //primary = Purple80,
    primary = virdigris,
    secondary = virdigris,
@@ -25,11 +24,11 @@ private val DarkColorScheme =
    //tertiary = Pink80
 )
-private val LightColorScheme =
+private val LightColorScheme = lightColorScheme(
    lightColorScheme(
    primary = Purple40,
    secondary = PurpleGrey40,
    tertiary = Pink40
    /* Other default colors to override
    background = Color(0xFFFFFBFE),
    surface = Color(0xFFFFFBFE),
@@ -51,8 +50,8 @@ fun WireguardAutoTunnelTheme(
    dynamicColor: Boolean = false,
    content: @Composable () -> Unit
 ) {
-    val colorScheme =
+
-        when {
+    val colorScheme = when {
        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
            val context = LocalContext.current
            if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
@@ -7,10 +7,8 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.sp
 // Set of Material typography styles to start with
-val Typography =
+val Typography = Typography(
-    Typography(
+    bodyLarge = TextStyle(
        bodyLarge =
        TextStyle(
        fontFamily = FontFamily.Default,
        fontWeight = FontWeight.Normal,
        fontSize = 16.sp,
@@ -6,6 +6,7 @@ import java.time.Instant
 import kotlin.math.pow
 object NumberUtils {
    private const val BYTES_IN_KB = 1024.0
    private val BYTES_IN_MB = BYTES_IN_KB.pow(2.0)
    private val keyValidationRegex = """^[A-Za-z0-9+/]{42}[AEIMQUYcgkosw480]=${'$'}""".toRegex()
@@ -13,29 +13,23 @@ import java.time.Instant
 import java.util.zip.ZipEntry
 import java.util.zip.ZipOutputStream
-object FileUtils {
+object StorageUtil {
    private const val ZIP_FILE_MIME_TYPE = "application/zip"
-
+    private fun createDownloadsFileOutputStream(context: Context, fileName: String, mimeType : String = Constants.ALLOWED_FILE_TYPES) : OutputStream? {
    private fun createDownloadsFileOutputStream(
        context: Context,
        fileName: String,
        mimeType: String = Constants.ALLOWED_FILE_TYPES
    ): OutputStream? {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
            val resolver = context.contentResolver
-            val contentValues =
+            val contentValues = ContentValues().apply {
                ContentValues().apply {
                put(MediaColumns.DISPLAY_NAME, fileName)
                put(MediaColumns.MIME_TYPE, mimeType)
                put(MediaColumns.RELATIVE_PATH, Environment.DIRECTORY_DOWNLOADS)
            }
            val uri = resolver.insert(MediaStore.Downloads.EXTERNAL_CONTENT_URI, contentValues)
            if (uri != null) {
                return resolver.openOutputStream(uri)
            }
        } else {
-            val target =
+            val target = File(
                File(
                Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS),
                fileName
            )
@@ -44,15 +38,8 @@ object FileUtils {
        return null
    }
-    fun saveFilesToZip(
+    fun saveFilesToZip(context: Context, files : List<File>) {
-        context: Context,
+        val zipOutputStream = createDownloadsFileOutputStream(context, "wg-export_${Instant.now().epochSecond}.zip", ZIP_FILE_MIME_TYPE)
        files: List<File>
    ) {
        val zipOutputStream = createDownloadsFileOutputStream(
            context,
            "wg-export_${Instant.now().epochSecond}.zip",
            ZIP_FILE_MIME_TYPE
        )
        ZipOutputStream(zipOutputStream).use { zos ->
            files.forEach { file ->
                val entry = ZipEntry( file.name)
@@ -6,7 +6,6 @@ class WgTunnelException(e: Exception) : Exception() {
    constructor(message : String) : this(Exception(message))
    override val message: String = generateExceptionMessage(e)
    private fun generateExceptionMessage(e : Exception) : String {
        return when(e) {
            is BadConfigException -> "${e.section.name} ${e.location.name} ${e.reason.name}"
@@ -152,6 +152,5 @@
    <string name="email">Email</string>
    <string name="email_description">Send me an email</string>
    <string name="support_help_text">If you are experiencing issues, have improvement ideas, or just want to engage, the following resources are available:</string>
-    <string name="kernel">Kernel</string>
+
    <string name="use_kernel">Use kernel module</string>
 </resources>
@@ -3,16 +3,14 @@ import org.gradle.api.invocation.Gradle
 object BuildHelper {
    private fun getCurrentFlavor(gradle : Gradle): String {
        val taskRequestsStr = gradle.startParameter.taskRequests.toString()
-        val pattern: java.util.regex.Pattern =
+        val pattern: java.util.regex.Pattern = if (taskRequestsStr.contains("assemble")) {
            if (taskRequestsStr.contains("assemble")) {
            java.util.regex.Pattern.compile("assemble(\\w+)(Release|Debug)")
        } else {
            java.util.regex.Pattern.compile("bundle(\\w+)(Release|Debug)")
        }
        val matcher = pattern.matcher(taskRequestsStr)
-        val flavor =
+        val flavor = if (matcher.find()) {
            if (matcher.find()) {
            matcher.group(1).lowercase()
        } else {
            print("NO FLAVOR FOUND")
@@ -24,13 +22,8 @@ object BuildHelper {
    fun isGeneralFlavor(gradle : Gradle) : Boolean {
        return getCurrentFlavor(gradle) == "general"
    }
    fun isReleaseBuild(gradle: Gradle) : Boolean {
-        return (
+        return (gradle.startParameter.taskNames.size > 0 && gradle.startParameter.taskNames[0].contains(
-            gradle.startParameter.taskNames.size > 0 &&
+                "Release"))
                gradle.startParameter.taskNames[0].contains(
                    "Release",
                )
        )
    }
 }
@@ -1,7 +1,7 @@
 object Constants {
-    const val VERSION_NAME = "3.2.4"
+    const val VERSION_NAME = "3.2.3"
    const val JVM_TARGET = "17"
-    const val VERSION_CODE = 32400
+    const val VERSION_CODE = 32300
    const val TARGET_SDK = 34
    const val MIN_SDK = 26
    const val APP_ID = "com.zaneschepke.wireguardautotunnel"
@@ -1,5 +0,0 @@
 Enhancements:
 - Add basic WireGuard Kernel support
 - Improved location disclosure flow
 - Fix auto-tunnel permissions bug
 - Various other UI bug fixes
@@ -1,12 +1,11 @@
 [versions]
 accompanist = "0.32.0"
-activityCompose = "1.8.2"
+activityCompose = "1.8.1"
 androidx-junit = "1.1.5"
 appcompat = "1.6.1"
 biometricKtx = "1.2.0-alpha05"
 coreGoogleShortcuts = "1.1.0"
 coreKtx = "1.12.0"
 datastorePreferences = "1.0.0"
 desugar_jdk_libs = "2.0.4"
 espressoCore = "3.5.1"
 firebase-crashlytics-gradle = "2.9.9"
@@ -18,7 +17,7 @@ kotlinx-serialization-json = "1.6.2"
 lifecycle-runtime-compose = "2.6.2"
 material-icons-extended = "1.5.4"
 material3 = "1.1.2"
-navigationCompose = "2.7.6"
+navigationCompose = "2.7.5"
 roomVersion = "2.6.1"
 timber = "5.0.1"
 tunnel = "1.0.20230706"
@@ -26,7 +25,7 @@ androidGradlePlugin = "8.2.0"
 kotlin="1.9.10"
 ksp="1.9.10-1.0.13"
 composeBom="2023.10.01"
-firebaseBom= "32.7.0"
+firebaseBom= "32.6.0"
 compose="1.5.4"
 crashlytics= "18.6.0"
 analytics="21.5.0"
@@ -46,7 +45,6 @@ accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-
 androidx-biometric-ktx = { module = "androidx.biometric:biometric-ktx", version.ref = "biometricKtx" }
 androidx-core = { module = "androidx.core:core", version.ref = "coreKtx" }
 androidx-core-google-shortcuts = { module = "androidx.core:core-google-shortcuts", version.ref = "coreGoogleShortcuts" }
 androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastorePreferences" }
 androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "lifecycle-runtime-compose" }
 androidx-lifecycle-service = { module = "androidx.lifecycle:lifecycle-service", version.ref = "lifecycle-runtime-compose" }
 androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "roomVersion" }
@@ -63,7 +61,6 @@ androidx-compose-ui-tooling-preview = { module="androidx.compose.ui:ui-tooling-p
 androidx-compose-ui = { module="androidx.compose.ui:ui", version.ref="compose" }
 #hilt
 androidx-room-testing = { module = "androidx.room:room-testing", version.ref = "roomVersion" }
 desugar_jdk_libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar_jdk_libs" }
 hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hiltAndroid" }
 hilt-android-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hiltAndroid" }
@@ -0,0 +1,47 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
    <meta charset="UTF-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Document</title>
 </head>
 <body>
    <span style="white-space: pre;">  
 Privacy Policy
 ==============
 WG Tunnel provides an alternative Android client app for network tunnels using the WireGuard Protocol.
 Information you provide
 -----------------------
 No information provided to the App is transmitted to me or anyone else.
 The App does not collect information for purposes of our collection. Your
 data is not collected.
 Background Location
 ------------------------
 This application does collect location information (specifically Wi-Fi ssid name) in the background
 for the auto tunnel feature. This information is not stored or transmitted but is simple collected 
 by the app to determine whether or not to turn on the VPN. 
 Updates to this document
 ------------------------
 I will keep this document up-to-date. Your continued use of WG Tunnel confirms
 your acceptance of this Privacy Policy.
 Contact Me
 ----------
 If you have questions about this Privacy Policy, please contact me
 zanecschepke@gmail.com or Discord (invite link on this repository).
 Effective as of May 24, 2023
 Updated May 24, 2023
 </span> 
 </body>
 </html>
@@ -15,3 +15,4 @@ dependencyResolutionManagement {
 rootProject.name = "WG Tunnel"
 include(":app")
`@@ -15,3 +15,4 @@ dependencyResolutionManagement {`

	`rootProject.name = "WG Tunnel"`	`rootProject.name = "WG Tunnel"`
	`include(":app")`	`include(":app")`