refactor: switch to bound services

.github/workflows/build.yml

@@ -1,6 +1,4 @@
-name: build
-permissions:
-  contents: read
+name: Build
 
 on:
   workflow_dispatch:
@@ -22,7 +20,7 @@ on:
         default: fdroid
         options:
           - fdroid
-          - standalone
+          - full
     secrets:
       SIGNING_KEY_ALIAS:
         required: false
@@ -96,7 +94,10 @@ jobs:
         run: |
           store_path=${{ env.KEY_STORE_LOCATION }}${{ env.KEY_STORE_FILE }}
           echo "KEY_STORE_PATH=$store_path" >> $GITHUB_ENV
-
+      - name: Create service_account.json
+        if: ${{ inputs.build_type != 'debug' }}
+        id: createServiceAccount
+        run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
       - name: Build APK
         run: |
           flavor=${{ inputs.flavor }}
@@ -122,6 +123,6 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: android_artifacts_${{ inputs.flavor }}
-          path: app/build/outputs/apk/${{ inputs.flavor }}/${{ inputs.build_type  }}/wgtunnel-${{ inputs.flavor }}${{ inputs.flavor == 'fdroid' && '-release' || '' }}-*.apk
+          path: app/build/outputs/apk/${{ inputs.flavor }}/release/wgtunnel-${{ inputs.flavor }}-release-*.apk
           retention-days: 1
           if-no-files-found: warn

.github/workflows/nightly.yml

@@ -1,127 +0,0 @@
-name: nightly
-permissions:
-  contents: write
-  packages: write
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "4 3 * * *"
-
-jobs:
-  check_commits:
-    name: Check for New Commits
-    runs-on: ubuntu-latest
-    outputs:
-      has_new_commits: ${{ steps.check.outputs.new_commits }}
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-      - name: Check for new commits
-        id: check
-        env:
-          GITHUB_TOKEN: ${{ secrets.PAT }}
-        run: |
-          NEW_COMMITS=$(git rev-list --count --after="$(date -Iseconds -d '23 hours ago')" ${{ github.sha }})
-          echo "new_commits=$NEW_COMMITS" >> $GITHUB_OUTPUT
-
-  build-standalone-nightly:
-    uses: ./.github/workflows/build.yml
-    secrets: inherit
-    with:
-      build_type: "nightly"
-      flavor: standalone
-
-  publish:
-    needs:
-      - check_commits
-      - build-standalone-nightly
-    if: ${{ needs.check_commits.outputs.has_new_commits > 0 && inputs.release_type != 'none' }}
-    name: publish-nightly
-    runs-on: ubuntu-latest
-    steps:
-
-      - uses: actions/checkout@v4
-
-      - name: Install system dependencies
-        run: |
-          sudo apt update && sudo apt install -y gh apksigner
-      - name: Set latest tag
-        uses: rickstaa/action-create-tag@v1
-        id: tag_creation
-        with:
-          tag: "latest"
-          message: "Automated tag for HEAD commit"
-          force_push_tag: true
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          tag_exists_error: false
-
-      - name: Generate Changelog
-        id: changelog
-        uses: requarks/changelog-action@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          toTag: "nightly"
-          fromTag: "latest"
-          writeToFile: false
-
-      - name: Make download dir
-        run: mkdir ${{ github.workspace }}/temp
-
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-        with:
-          pattern: android_artifacts_*
-          path: ${{ github.workspace }}/temp
-
-      - name: Set release notes
-        run: |
-          echo "RELEASE_NOTES=Nightly build for the latest development version of the app." >> $GITHUB_ENV
-
-      - name: Delete previous nightly version
-        uses: ClementTsang/delete-tag-and-release@v0.4.0
-        with:
-          tag_name: "nightly"
-          delete_release: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Get checksum
-        id: checksum
-        run: |
-          file_path=$(find ${{ github.workspace }}/temp -type f -iname "*.apk" | head -n 1)
-          if [ -z "$file_path" ]; then
-            echo "No APK file found"
-            exit 1
-          fi
-          checksum=$(apksigner verify --print-certs "$file_path" | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")
-          echo "checksum=$checksum" >> $GITHUB_OUTPUT
-
-      - name: Create nightly release
-        id: create_release
-        uses: softprops/action-gh-release@v2
-        with:
-          body: |
-            ${{ env.RELEASE_NOTES }}
-
-            SHA-256 fingerprints for the 4096-bit signing certificate:
-            ```sh
-            ${{ steps.checksum.outputs.checksum }}
-            ```
-
-            To verify fingerprint:
-            ```sh
-            apksigner verify --print-certs [path to APK file] | grep SHA-256
-            ```
-
-            ### Changelog
-            ${{ steps.changelog.outputs.changes }}
-          tag_name: nightly
-          name: nightly
-          draft: false
-          prerelease: true
-          make_latest: false
-          files: |
-            ${{ github.workspace }}/temp/**/*.apk
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pr.yml

@@ -1,6 +1,4 @@
 name: on-pr
-permissions:
-  contents: read
 
 on:
     workflow_dispatch:

.github/workflows/publish.yml

@@ -1,9 +1,8 @@
 name: publish
-permissions:
-  contents: write
-  packages: write
 
 on:
+  schedule:
+    - cron: "4 3 * * *"
   workflow_dispatch:
     inputs:
       track:
@@ -23,60 +22,95 @@ on:
         options:
           - none
           - prerelease
+          - nightly
           - release
         default: release
         required: true
       tag_name:
         description: "Tag name for release"
         required: false
-        default: 1.1.1
+        default: nightly
       flavor:
         type: choice
         description: "Product flavor"
         required: true
-        default: standalone
+        default: full
         options:
           - fdroid
-          - standalone
+          - full
   workflow_call:
     inputs:
       flavor:
         type: string
         description: "Product flavor"
         required: false
-        default: standalone
+        default: full
+
+env:
+  UPLOAD_DIR_ANDROID: android_artifacts
+
+permissions:
+  contents: write
+  packages: write
 
 jobs:
+  check_commits:
+    name: Check for New Commits
+    runs-on: ubuntu-latest
+    outputs:
+      has_new_commits: ${{ steps.check.outputs.new_commits }}
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Check for new commits
+        id: check
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
+        run: |
+          NEW_COMMITS=$(git rev-list --count --after="$(date -Iseconds -d '23 hours ago')" ${{ github.sha }})
+          echo "new_commits=$NEW_COMMITS" >> $GITHUB_OUTPUT
 
   build-fdroid:
     if: ${{ inputs.release_type == 'release' || inputs.flavor == 'fdroid' }}
     uses: ./.github/workflows/build.yml
     secrets: inherit
     with:
-      build_type: ${{ inputs.release_type }}
+      build_type: ${{ inputs.release_type == '' && 'nightly' || inputs.release_type }}
       flavor: fdroid
 
-  build-standalone:
-    if: ${{ inputs.release_type == 'release' || inputs.release_type == 'prerelease' || inputs.flavor == 'standalone' }}
+  build-full:
+    if: ${{ inputs.release_type == 'release' || inputs.release_type == 'nightly' || inputs.release_type == 'prerelease' || inputs.flavor == 'full' }}
     uses: ./.github/workflows/build.yml
     secrets: inherit
     with:
-      build_type: ${{ inputs.release_type }}
-      flavor: standalone
+      build_type: ${{ inputs.release_type == '' && 'nightly' || inputs.release_type }}
+      flavor: full
 
   publish:
     needs:
-      - build-standalone
+      - check_commits
+      - build-full
+    if: ${{ needs.check_commits.outputs.has_new_commits > 0 && inputs.release_type != 'none' }}
     name: publish-github
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
+          fetch-depth: 0
           ref: main
       - name: Install system dependencies
         run: |
           sudo apt update && sudo apt install -y gh apksigner
-
+      - name: Set TAG_NAME
+        run: |
+          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+            echo "TAG_NAME=${{ github.event.inputs.tag_name }}" >> $GITHUB_ENV
+          elif [ "${{ github.event_name }}" = "schedule" ]; then
+            echo "TAG_NAME=nightly" >> $GITHUB_ENV
+            echo "RELEASE_TYPE=nightly" >> $GITHUB_ENV
+          fi
       - name: Set latest tag
         uses: rickstaa/action-create-tag@v1
         id: tag_creation
@@ -92,26 +126,22 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           latest: true
-
       - name: Generate Changelog
         id: changelog
         uses: requarks/changelog-action@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          toTag: ${{ steps.latest_release.outputs.tag_name }}
+          toTag: ${{ github.event_name == 'schedule' && 'nightly' || steps.latest_release.outputs.tag_name }}
           fromTag: "latest"
           writeToFile: false
-
       - name: Make download dir
         run: mkdir ${{ github.workspace }}/temp
-
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
           pattern: android_artifacts_*
           path: ${{ github.workspace }}/temp
           merge-multiple: true
-
       - name: Set version release notes
         if: ${{ inputs.release_type == 'release' }}
         run: |
@@ -121,22 +151,36 @@ jobs:
           echo "$RELEASE_NOTES" >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
 
+      - name: On nightly release notes
+        if: ${{ contains(env.TAG_NAME, 'nightly') }}
+        run: |
+          echo "RELEASE_NOTES=Nightly build for the latest development version of the app." >> $GITHUB_ENV
+
       - name: On prerelease release notes
         if: ${{ inputs.release_type == 'prerelease' }}
         run: |
           echo "RELEASE_NOTES=Testing version of app for specific feature." >> $GITHUB_ENV
 
-      - name: Get checksum
+      - name: Delete previous release
+        if: ${{ contains(env.TAG_NAME, 'nightly') || inputs.release_type == 'prerelease' }}
+        uses: ClementTsang/delete-tag-and-release@v0.4.0
+        with:
+          tag_name: ${{ env.TAG_NAME }}
+          delete_release: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get checksums
         id: checksum
         run: |
-          file_path=$(find ${{ github.workspace }}/temp -type f -iname "*.apk" | head -n 1)
-          if [ -z "$file_path" ]; then
-            echo "No APK file found"
-            exit 1
-          fi
-          checksum=$(apksigner verify --print-certs "$file_path" | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")
-          echo "checksum=$checksum" >> $GITHUB_OUTPUT
-
+          checksums=""
+          for file_path in $(find ${{ github.workspace }}/temp -type f -iname "*.apk"); do
+            checksum=$(apksigner verify -print-certs $file_path | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")
+            checksums="$checksums\n$file_path: $checksum"
+          done
+          echo "checksum<<EOF" >> $GITHUB_OUTPUT
+          echo -e "$checksums" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
       - name: Create Release
         id: create_release
         uses: softprops/action-gh-release@v2
@@ -156,13 +200,13 @@ jobs:
 
             ### Changelog
             ${{ steps.changelog.outputs.changes }}
-          tag_name: ${{ github.event.inputs.tag_name }}
-          name: ${{ github.event.inputs.tag_name }}
+          tag_name: ${{ env.TAG_NAME }}
+          name: ${{ env.TAG_NAME }}
           draft: false
-          prerelease: ${{ inputs.release_type == 'prerelease' }}
+          prerelease: ${{ inputs.release_type == 'prerelease' || inputs.release_type == '' || inputs.release_type == 'nightly' }}
           make_latest: ${{ inputs.release_type == 'release' }}
           files: |
-            ${{ github.workspace }}/temp/**/*.apk
+            ${{ github.workspace }}/temp/*
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -180,7 +224,7 @@ jobs:
           event-type: fdroid-update
 
   publish-play:
-    if: ${{ inputs.track != 'none' }}
+    if: ${{ inputs.track != 'none' && inputs.track != '' }}
     name: Publish to Google Play
     runs-on: ubuntu-latest
 

app/build.gradle.kts

@@ -103,16 +103,13 @@ android {
             dimension = "type"
             buildConfigField("String", "FLAVOR", "\"google\"")
         }
-        create("standalone") {
-            dimension = "type"
-            buildConfigField("String", "FLAVOR", "\"standalone\"")
-        }
+        create("full") { dimension = "type" }
     }
 
     compileOptions {
-        isCoreLibraryDesugaringEnabled = true
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
+        isCoreLibraryDesugaringEnabled = true
     }
     kotlinOptions { jvmTarget = Constants.JVM_TARGET }
     buildFeatures {
@@ -124,6 +121,7 @@ android {
     licensee {
         Constants.allowedLicenses.forEach { allow(it) }
         allowUrl(Constants.XZING_LICENSE_URL)
+        allowUrl("https://rafaellins.mit-license.org/2021/")
     }
 
     applicationVariants.all {
@@ -197,7 +195,6 @@ dependencies {
     implementation(libs.kotlinx.serialization.json)
 
     implementation(libs.zxing.android.embedded)
-
     implementation(libs.material.icons.extended)
 
     implementation(libs.androidx.biometric.ktx)
@@ -210,7 +207,7 @@ dependencies {
     implementation(libs.androidx.work.runtime)
     implementation(libs.androidx.hilt.work)
 
-    implementation(libs.qrose)
+    implementation(libs.qrcode.kotlin)
     implementation(libs.semver4j)
 
     implementation(libs.ktor.client.core)

app/src/main/AndroidManifest.xml

@@ -62,10 +62,6 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.App.Start"
         tools:targetApi="tiramisu">
-		<activity
-			android:name="com.journeyapps.barcodescanner.CaptureActivity"
-			android:screenOrientation="portrait"
-			tools:replace="screenOrientation" />
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -82,6 +78,10 @@
                 <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
             </intent-filter>
         </activity>
+        <activity
+            android:name="com.journeyapps.barcodescanner.CaptureActivity"
+            android:screenOrientation="portrait"
+            tools:replace="screenOrientation" />
 
         <activity
             android:name=".core.shortcut.ShortcutsActivity"
@@ -166,11 +166,15 @@
         <receiver
             android:name=".core.broadcast.RestartReceiver"
             android:enabled="true"
-            android:exported="false">
+            android:exported="false"
+			android:directBootAware="true">
             <intent-filter>
+				<action android:name="android.intent.action.SCREEN_ON" />
+				<action android:name="android.intent.action.USER_PRESENT" />
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
                 <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
+				<action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
 				<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
             </intent-filter>
         </receiver>

app/src/main/java/com/zaneschepke/wireguardautotunnel/MainActivity.kt

@@ -22,6 +22,7 @@ import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.background
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.*
+import androidx.compose.material.icons.rounded.Settings
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
@@ -38,6 +39,7 @@ import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
 import com.zaneschepke.networkmonitor.NetworkMonitor
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.dialog.VpnDeniedDialog
@@ -53,6 +55,7 @@ import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.disclosure.Loca
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.MainScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.autotunnel.TunnelAutoTunnelScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.ConfigScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.scanner.ScannerScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.SplitTunnelScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.tunneloptions.TunnelOptionsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.pin.PinLockScreen
@@ -107,7 +110,6 @@ class MainActivity : AppCompatActivity() {
             val isTv = isRunningOnTv()
             val appUiState by viewModel.uiState.collectAsStateWithLifecycle()
             val appViewState by viewModel.appViewState.collectAsStateWithLifecycle()
-            val tunnelError by viewModel.tunnelManager.errorEvents.collectAsStateWithLifecycle(null)
 
             val navController = rememberNavController()
             val backStackEntry by navController.currentBackStackEntryAsState()
@@ -132,7 +134,6 @@ class MainActivity : AppCompatActivity() {
                             vpnPermissionDenied = true
                         } else {
                             vpnPermissionDenied = false
-                            showVpnPermissionDialog = false
                         }
                     },
                 )
@@ -150,15 +151,6 @@ class MainActivity : AppCompatActivity() {
                     viewModel.handleEvent(AppEvent.SetBatteryOptimizeDisableShown)
                 }
 
-            LaunchedEffect(tunnelError) {
-                if (tunnelError == null) return@LaunchedEffect
-                val message = tunnelError!!.second.toStringRes()
-                val context = this@MainActivity
-                snackbar.showSnackbar(
-                    context.getString(R.string.tunnel_error_template, context.getString(message))
-                )
-            }
-
             with(appViewState) {
                 LaunchedEffect(isConfigChanged) {
                     if (isConfigChanged) {
@@ -174,6 +166,21 @@ class MainActivity : AppCompatActivity() {
                         viewModel.handleEvent(AppEvent.MessageShown)
                     }
                 }
+                LaunchedEffect(appUiState.activeTunnels) {
+                    appUiState.activeTunnels.mapNotNull { (tunnelConf, tunnelState) ->
+                        (tunnelState.status as? TunnelStatus.Error)?.let { error ->
+                            val message = error.error.toStringRes()
+                            val context = this@MainActivity
+                            snackbar.showSnackbar(
+                                context.getString(
+                                    R.string.tunnel_error_template,
+                                    context.getString(message),
+                                )
+                            )
+                            viewModel.handleEvent(AppEvent.ClearTunnelError(tunnelConf))
+                        }
+                    }
+                }
                 LaunchedEffect(popBackStack) {
                     if (popBackStack) {
                         navController.popBackStack()
@@ -207,10 +214,7 @@ class MainActivity : AppCompatActivity() {
                     WireguardAutoTunnelTheme(theme = appUiState.appState.theme) {
                         VpnDeniedDialog(
                             showVpnPermissionDialog,
-                            onDismiss = {
-                                showVpnPermissionDialog = false
-                                vpnPermissionDenied = false
-                            },
+                            onDismiss = { showVpnPermissionDialog = false },
                         )
 
                         Scaffold(
@@ -296,10 +300,11 @@ class MainActivity : AppCompatActivity() {
                                         appUiState.tunnels
                                             .firstOrNull { it.id == args.id }
                                             ?.let { config ->
-                                                TunnelOptionsScreen(config, viewModel, appViewState)
+                                                TunnelOptionsScreen(config, viewModel)
                                             }
                                     }
                                     composable<Route.Lock> { PinLockScreen(viewModel) }
+                                    composable<Route.Scanner> { ScannerScreen(viewModel) }
                                     composable<Route.KillSwitch> {
                                         KillSwitchScreen(appUiState, viewModel)
                                     }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/broadcast/RestartReceiver.kt

@@ -3,12 +3,12 @@ package com.zaneschepke.wireguardautotunnel.core.broadcast
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.zaneschepke.logcatter.LogReader
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
@@ -26,12 +26,14 @@ class RestartReceiver : BroadcastReceiver() {
 
     @Inject lateinit var tunnelManager: TunnelManager
 
-    @Inject lateinit var logReader: LogReader
-
     @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
 
     override fun onReceive(context: Context, intent: Intent) {
         Timber.d("RestartReceiver triggered with action: ${intent.action}")
+        // screen on for Android TV only to help with sleep shutdowns
+        val isTv = context.isRunningOnTv()
+        if (intent.action == Intent.ACTION_SCREEN_ON && !isTv) return
+        if (intent.action == Intent.ACTION_USER_PRESENT && !isTv) return
         serviceManager.updateTunnelTile()
         serviceManager.updateAutoTunnelTile()
         applicationScope.launch(ioDispatcher) {
@@ -49,7 +51,6 @@ class RestartReceiver : BroadcastReceiver() {
             } else {
                 Timber.d("Restore on boot disabled, skipping")
             }
-            if (intent.action == Intent.ACTION_MY_PACKAGE_REPLACED) logReader.deleteAndClearLogs()
         }
     }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/service/TunnelForegroundService.kt

@@ -165,12 +165,8 @@ class TunnelForegroundService : LifecycleService() {
             } else {
                 pingJobs[tun]?.cancel() // Cancel any stale job
                 if (tun.isPingEnabled) {
-                    if (tun.isStaticallyConfigured()) {
-                        Timber.d("Skipping ping for statically configured tunnel")
-                    } else {
-                        pingJobs[tun] = startPingJob(tun)
-                        Timber.d("Started ping job for ${tun.tunName}")
-                    }
+                    pingJobs[tun] = startPingJob(tun)
+                    Timber.d("Started ping job for ${tun.tunName}")
                 }
             }
         }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/BaseTunnel.kt

@@ -1,5 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
+import com.wireguard.android.backend.BackendException
 import com.wireguard.android.backend.Tunnel
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
@@ -10,11 +11,14 @@ import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
 import com.zaneschepke.wireguardautotunnel.util.extensions.asTunnelState
+import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.concurrent.thread
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
@@ -27,10 +31,6 @@ abstract class BaseTunnel(
     private val serviceManager: ServiceManager,
 ) : TunnelProvider {
 
-    private val _errorEvents =
-        MutableSharedFlow<Pair<TunnelConf, BackendError>>(replay = 0, extraBufferCapacity = 1)
-    override val errorEvents = _errorEvents.asSharedFlow()
-
     private val activeTuns = MutableStateFlow<Map<TunnelConf, TunnelState>>(emptyMap())
     private val tunThreads = ConcurrentHashMap<Int, Thread>()
     override val activeTunnels = activeTuns.asStateFlow()
@@ -45,34 +45,37 @@ abstract class BaseTunnel(
 
     abstract fun stopBackend(tunnel: TunnelConf)
 
+    override suspend fun clearError(tunnelConf: TunnelConf) =
+        updateTunnelStatus(tunnelConf, TunnelStatus.Down)
+
     override fun hasVpnPermission(): Boolean {
         return serviceManager.hasVpnPermission()
     }
 
     protected suspend fun updateTunnelStatus(
         tunnelConf: TunnelConf,
-        status: TunnelStatus? = null,
+        state: TunnelStatus? = null,
         stats: TunnelStatistics? = null,
     ) {
         tunStatusMutex.withLock {
-            activeTuns.update { currentTuns ->
-                val originalConf = currentTuns.getKeyById(tunnelConf.id) ?: tunnelConf
-                val existingState = currentTuns.getValueById(tunnelConf.id) ?: TunnelState()
-                val newState = status ?: existingState.status
+            activeTuns.update { current ->
+                val originalConf = current.getKeyById(tunnelConf.id) ?: tunnelConf
+                val existingState = current.getValueById(tunnelConf.id) ?: TunnelState()
+                val newState = state ?: existingState.status
                 if (newState == TunnelStatus.Down) {
                     Timber.d("Removing tunnel ${tunnelConf.id} from activeTunnels as state is DOWN")
                     cleanUpTunThread(tunnelConf)
-                    currentTuns - originalConf
+                    current - originalConf
                 } else if (existingState.status == newState && stats == null) {
                     Timber.d("Skipping redundant state update for ${tunnelConf.id}: $newState")
-                    currentTuns
+                    current
                 } else {
                     val updated =
                         existingState.copy(
                             status = newState,
                             statistics = stats ?: existingState.statistics,
                         )
-                    currentTuns + (originalConf to updated)
+                    current + (originalConf to updated)
                 }
             }
         }
@@ -114,17 +117,23 @@ abstract class BaseTunnel(
         if (this@BaseTunnel is UserspaceTunnel) stopActiveTunnels()
         tunMutex.withLock {
             tunThreads[tunnelConf.id] = thread {
-                runBlocking {
-                    try {
-                        Timber.d("Starting tunnel ${tunnelConf.id}...")
-                        startTunnelInner(tunnelConf)
-                        Timber.d("Started complete for tunnel ${tunnelConf.name}...")
-                    } catch (e: InterruptedException) {
-                        Timber.w(
-                            "Tunnel start has been interrupted as ${tunnelConf.name} failed to start"
-                        )
+                runCatching {
+                        runBlocking {
+                            try {
+                                Timber.d("Starting tunnel ${tunnelConf.id}...")
+                                startTunnelInner(tunnelConf)
+                                Timber.d("Started complete for tunnel ${tunnelConf.name}...")
+                            } catch (e: BackendError) {
+                                Timber.e(e, "Failed to start tunnel ${tunnelConf.name} userspace")
+                                updateTunnelStatus(tunnelConf, TunnelStatus.Error(e))
+                            } catch (e: InterruptedException) {
+                                Timber.w(
+                                    "Tunnel start has been interrupted as ${tunnelConf.name} failed to start"
+                                )
+                            }
+                        }
                     }
-                }
+                    .onFailure { Timber.w("Tunnel start has been interrupted") }
             }
         }
     }
@@ -138,10 +147,11 @@ abstract class BaseTunnel(
             Timber.d("Started for tun ${tunnelConf.id}...")
             saveTunnelActiveState(tunnelConf, true)
             serviceManager.startTunnelForegroundService()
-        } catch (e: BackendError) {
+        } catch (e: BackendException) {
             Timber.e(e, "Failed to start backend for ${tunnelConf.name}")
-            _errorEvents.emit(tunnelConf to e)
-            updateTunnelStatus(tunnelConf, TunnelStatus.Down)
+            val backendError = e.toBackendError()
+            updateTunnelStatus(tunnelConf, TunnelStatus.Error(backendError))
+            throw backendError
         }
     }
 
@@ -153,27 +163,26 @@ abstract class BaseTunnel(
     override suspend fun stopTunnel(tunnelConf: TunnelConf?, reason: TunnelStatus.StopReason) {
         if (tunnelConf == null) return stopActiveTunnels()
         tunMutex.withLock {
-            if (activeTuns.isStarting(tunnelConf.id))
-                return handleStuckStartingTunnelShutdown(tunnelConf)
-            updateTunnelStatus(tunnelConf, TunnelStatus.Stopping(reason))
-            stopTunnelInner(tunnelConf)
+            try {
+                if (activeTuns.isStarting(tunnelConf.id))
+                    return handleStuckStartingTunnelShutdown(tunnelConf)
+                updateTunnelStatus(tunnelConf, TunnelStatus.Stopping(reason))
+                stopTunnelInner(tunnelConf)
+            } catch (e: BackendError) {
+                Timber.e(e, "Failed to stop tunnel ${tunnelConf.id}")
+                updateTunnelStatus(tunnelConf, TunnelStatus.Error(e))
+            }
         }
     }
 
     private suspend fun stopTunnelInner(tunnelConf: TunnelConf) {
-        try {
-            val tunnel = activeTuns.findTunnel(tunnelConf.id) ?: return
-            stopBackend(tunnel)
-            saveTunnelActiveState(tunnelConf, false)
-            removeActiveTunnel(tunnel)
-        } catch (e: BackendError) {
-            Timber.e(e, "Failed to stop tunnel ${tunnelConf.id}")
-            _errorEvents.emit(tunnelConf to e)
-            updateTunnelStatus(tunnelConf, TunnelStatus.Down)
-        }
+        val tunnel = activeTuns.findTunnel(tunnelConf.id) ?: return
+        stopBackend(tunnel)
+        saveTunnelActiveState(tunnelConf, false)
+        removeActiveTunnel(tunnel)
     }
 
-    private fun handleServiceStateOnChange() {
+    private suspend fun handleServiceStateOnChange() {
         if (activeTuns.value.isEmpty() && bouncingTunnelIds.isEmpty())
             serviceManager.stopTunnelForegroundService()
     }
@@ -192,6 +201,7 @@ abstract class BaseTunnel(
             Timber.e(e, "Failed to stop tunnel thread for ${tunnel.name}")
         } finally {
             updateTunnelStatus(tunnel, TunnelStatus.Down)
+            cleanUpTunThread(tunnel)
         }
     }
 
@@ -212,7 +222,7 @@ abstract class BaseTunnel(
             bouncingTunnelIds[tunnelConf.id] = reason
             try {
                 stopTunnel(tunnelConf, reason)
-                delay(BOUNCE_DELAY)
+                delay(300L)
                 startTunnel(tunnelConf)
             } finally {
                 bouncingTunnelIds.remove(tunnelConf.id)
@@ -226,8 +236,4 @@ abstract class BaseTunnel(
 
     override suspend fun runningTunnelNames(): Set<String> =
         activeTuns.value.keys.map { it.tunName }.toSet()
-
-    companion object {
-        const val BOUNCE_DELAY = 300L
-    }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/TunnelManager.kt

@@ -5,7 +5,6 @@ import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.di.Kernel
 import com.zaneschepke.wireguardautotunnel.di.Userspace
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendError
 import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
@@ -16,7 +15,6 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.flatMapLatest
@@ -64,9 +62,6 @@ constructor(
                 initialValue = emptyMap(),
             )
 
-    override val errorEvents: SharedFlow<Pair<TunnelConf, BackendError>>
-        get() = tunnelProviderFlow.value.errorEvents
-
     override val bouncingTunnelIds: ConcurrentHashMap<Int, TunnelStatus.StopReason> =
         tunnelProviderFlow.value.bouncingTunnelIds
 
@@ -74,6 +69,10 @@ constructor(
         return userspaceTunnel.hasVpnPermission()
     }
 
+    override suspend fun clearError(tunnelConf: TunnelConf) {
+        tunnelProviderFlow.value.clearError(tunnelConf)
+    }
+
     override suspend fun updateTunnelStatistics(tunnel: TunnelConf) {
         tunnelProviderFlow.value.updateTunnelStatistics(tunnel)
     }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/TunnelProvider.kt

@@ -1,13 +1,11 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendError
 import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
 import java.util.concurrent.ConcurrentHashMap
-import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.StateFlow
 
 interface TunnelProvider {
@@ -48,11 +46,11 @@ interface TunnelProvider {
 
     val activeTunnels: StateFlow<Map<TunnelConf, TunnelState>>
 
-    val errorEvents: SharedFlow<Pair<TunnelConf, BackendError>>
-
     val bouncingTunnelIds: ConcurrentHashMap<Int, TunnelStatus.StopReason>
 
     fun hasVpnPermission(): Boolean
 
+    suspend fun clearError(tunnelConf: TunnelConf)
+
     suspend fun updateTunnelStatistics(tunnel: TunnelConf)
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/UserspaceTunnel.kt

@@ -50,9 +50,8 @@ constructor(
         } catch (e: BackendException) {
             Timber.e(e, "Failed to stop tunnel ${tunnel.id}")
             throw e.toBackendError()
-        } finally {
-            handlePreviouslyEnabledVpnKillSwitch()
         }
+        handlePreviouslyEnabledVpnKillSwitch()
     }
 
     // stop vpn kill switch if we need to resolve DNS for peer endpoints

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/entity/TunnelConf.kt

@@ -60,10 +60,6 @@ data class TunnelConf(
         return result
     }
 
-    fun isStaticallyConfigured(): Boolean {
-        return toAmConfig().peers.all { it.endpoint.get().host.isValidIpv4orIpv6Address() }
-    }
-
     fun copyWithCallback(
         id: Int = this.id,
         tunName: String = this.tunName,

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/enums/ConfigType.kt

@@ -1,6 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.domain.enums
 
 enum class ConfigType {
-    AM,
+    AMNEZIA,
     WG,
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/enums/TunnelStatus.kt

@@ -1,6 +1,7 @@
 package com.zaneschepke.wireguardautotunnel.domain.enums
 
 sealed class TunnelStatus {
+    data class Error(val error: BackendError) : TunnelStatus()
 
     data object Up : TunnelStatus()
 

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/state/AmneziaStatistics.kt

@@ -12,7 +12,6 @@ class AmneziaStatistics(private val statistics: Statistics) : TunnelStatistics()
                 rxBytes = stats.rxBytes,
                 txBytes = stats.txBytes,
                 latestHandshakeEpochMillis = stats.latestHandshakeEpochMillis,
-                resolvedEndpoint = stats.resolvedEndpoint,
             )
         }
     }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/state/TunnelStatistics.kt

@@ -8,7 +8,6 @@ abstract class TunnelStatistics {
         val rxBytes: Long,
         val txBytes: Long,
         val latestHandshakeEpochMillis: Long,
-        val resolvedEndpoint: String,
     )
 
     abstract fun peerStats(peer: Key): PeerStats?

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/state/WireGuardStatistics.kt

@@ -12,7 +12,6 @@ class WireGuardStatistics(private val statistics: Statistics) : TunnelStatistics
                 txBytes = peerStats.txBytes,
                 rxBytes = peerStats.rxBytes,
                 latestHandshakeEpochMillis = peerStats.latestHandshakeEpochMillis,
-                resolvedEndpoint = peerStats.rosolvedEndpoint,
             )
         }
     }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/Route.kt

@@ -29,6 +29,8 @@ sealed class Route {
 
     @Serializable data object Lock : Route()
 
+    @Serializable data object Scanner : Route()
+
     @Serializable data object License : Route()
 
     @Serializable data class Config(val id: Int) : Route()

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/navigation/components/currentNavBackStackEntryAsNavBarState.kt

@@ -4,7 +4,16 @@ import android.os.Build
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.*
+import androidx.compose.material.icons.rounded.Add
+import androidx.compose.material.icons.rounded.CopyAll
+import androidx.compose.material.icons.rounded.Delete
+import androidx.compose.material.icons.rounded.Download
+import androidx.compose.material.icons.rounded.Edit
+import androidx.compose.material.icons.rounded.Menu
+import androidx.compose.material.icons.rounded.PlayArrow
+import androidx.compose.material.icons.rounded.Save
+import androidx.compose.material.icons.rounded.SelectAll
+import androidx.compose.material.icons.rounded.Stop
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.Text
@@ -231,17 +240,8 @@ fun currentNavBackStackEntryAsNavBarState(
                         showBottom = true,
                         topTitle = { tunnel?.name?.let { Text(it) } },
                         topTrailing = {
-                            Row {
-                                ActionIconButton(Icons.Rounded.QrCode2, R.string.show_qr) {
-                                    tunnel?.id?.let {
-                                        viewModel.handleEvent(
-                                            AppEvent.SetShowModal(AppViewState.ModalType.QR)
-                                        )
-                                    }
-                                }
-                                ActionIconButton(Icons.Rounded.Edit, R.string.edit_tunnel) {
-                                    tunnel?.id?.let { navController.navigate(Route.Config(it)) }
-                                }
+                            ActionIconButton(Icons.Rounded.Edit, R.string.edit_tunnel) {
+                                tunnel?.id?.let { navController.navigate(Route.Config(it)) }
                             }
                         },
                         route = args?.let { Route.TunnelOptions(it.id) },

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/MainScreen.kt

@@ -9,8 +9,6 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.journeyapps.barcodescanner.ScanContract
-import com.journeyapps.barcodescanner.ScanOptions
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.dialog.InfoDialog
@@ -47,17 +45,6 @@ fun MainScreen(appUiState: AppUiState, appViewState: AppViewState, viewModel: Ap
             onData = { data -> viewModel.handleEvent(AppEvent.ImportTunnelFromFile(data)) },
         )
 
-    val scanLauncher =
-        rememberLauncherForActivityResult(
-            contract = ScanContract(),
-            onResult = { result ->
-                {
-                    if (result != null && result.contents.isNotEmpty())
-                        viewModel.handleEvent(AppEvent.ImportTunnelFromQrCode(result.contents))
-                }
-            },
-        )
-
     val requestPermissionLauncher =
         rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted
             ->
@@ -69,7 +56,7 @@ fun MainScreen(appUiState: AppUiState, appViewState: AppViewState, viewModel: Ap
                 )
                 return@rememberLauncherForActivityResult
             }
-            scanLauncher.launch(ScanOptions().setDesiredBarcodeFormats(ScanOptions.QR_CODE))
+            navController.navigate(Route.Scanner)
         }
 
     if (appViewState.showModal == AppViewState.ModalType.DELETE) {

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/components/ExportTunnelsBottomSheet.kt

@@ -93,7 +93,7 @@ fun ExportTunnelsBottomSheet(viewModel: AppViewModel) {
         ExportOptionRow(
             label = stringResource(R.string.export_tunnels_amnezia),
             onClick = {
-                exportConfigType = ConfigType.AM
+                exportConfigType = ConfigType.AMNEZIA
                 if (!isAuthorized && !isTv) {
                     showAuthPrompt = true
                 } else {

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/components/TunnelStatisticsRow.kt

@@ -8,9 +8,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.derivedStateOf
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -24,90 +21,49 @@ import com.zaneschepke.wireguardautotunnel.util.extensions.toThreeDecimalPlaceSt
 @Composable
 fun TunnelStatisticsRow(statistics: TunnelStatistics?, tunnelConf: TunnelConf) {
     val config = TunnelConf.configFromAmQuick(tunnelConf.wgQuick)
-    Column(
-        modifier = Modifier.fillMaxWidth().padding(start = 45.dp, bottom = 10.dp, end = 10.dp),
-        verticalArrangement = Arrangement.spacedBy(10.dp, Alignment.CenterVertically),
-        horizontalAlignment = Alignment.Start,
-    ) {
-        config.peers.forEach { peer ->
-            val peerId = remember { peer.publicKey.toBase64().subSequence(0, 3).toString() + "***" }
-            val endpoint =
-                remember(statistics) { statistics?.peerStats(peer.publicKey)?.resolvedEndpoint }
-            val peerRxMB by
-                remember(statistics) {
-                    derivedStateOf {
-                        statistics
-                            ?.peerStats(peer.publicKey)
-                            ?.rxBytes
-                            ?.let { NumberUtils.bytesToMB(it) }
-                            ?.toThreeDecimalPlaceString()
+    config.peers.forEach { peer ->
+        Row(
+            modifier = Modifier.fillMaxWidth().padding(end = 10.dp, bottom = 10.dp, start = 45.dp),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(5.dp, Alignment.Start),
+        ) {
+            val peerId = peer.publicKey.toBase64().subSequence(0, 3).toString() + "***"
+            val peerRx = statistics?.peerStats(peer.publicKey)?.rxBytes ?: 0
+            val peerTx = statistics?.peerStats(peer.publicKey)?.txBytes ?: 0
+            val peerTxMB = NumberUtils.bytesToMB(peerTx).toThreeDecimalPlaceString()
+            val peerRxMB = NumberUtils.bytesToMB(peerRx).toThreeDecimalPlaceString()
+            val handshake =
+                statistics?.peerStats(peer.publicKey)?.latestHandshakeEpochMillis?.let {
+                    if (it == 0L) {
+                        stringResource(R.string.never)
+                    } else {
+                        "${NumberUtils.getSecondsBetweenTimestampAndNow(it)} ${stringResource(R.string.sec)}"
                     }
-                }
-            val peerTxMB by
-                remember(statistics) {
-                    derivedStateOf {
-                        statistics
-                            ?.peerStats(peer.publicKey)
-                            ?.txBytes
-                            ?.let { NumberUtils.bytesToMB(it) }
-                            ?.toThreeDecimalPlaceString()
-                    }
-                }
-            val handshake by
-                remember(statistics) {
-                    derivedStateOf {
-                        statistics?.peerStats(peer.publicKey)?.latestHandshakeEpochMillis?.let {
-                            if (it == 0L) {
-                                null
-                            } else {
-                                "${NumberUtils.getSecondsBetweenTimestampAndNow(it)}"
-                            }
-                        }
-                    }
-                }
-            Row(
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.spacedBy(16.dp, Alignment.Start),
-            ) {
+                } ?: stringResource(R.string.never)
+            Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
                 Text(
                     stringResource(R.string.peer).lowercase() + ": $peerId",
                     style = MaterialTheme.typography.bodySmall,
                     color = MaterialTheme.colorScheme.outline,
                 )
                 Text(
-                    stringResource(R.string.handshake) +
-                        ": ${if(handshake == null) stringResource(R.string.never) else handshake + " " + stringResource(R.string.sec)}",
+                    "tx: $peerTxMB MB",
                     style = MaterialTheme.typography.bodySmall,
                     color = MaterialTheme.colorScheme.outline,
                 )
             }
-            Row(
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.spacedBy(16.dp, Alignment.Start),
-            ) {
+            Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
                 Text(
-                    "rx: ${peerRxMB ?: 0.00} MB",
+                    stringResource(R.string.handshake) + ": $handshake",
                     style = MaterialTheme.typography.bodySmall,
                     color = MaterialTheme.colorScheme.outline,
                 )
                 Text(
-                    "tx: ${peerTxMB ?: 0.00} MB",
+                    "rx: $peerRxMB MB",
                     style = MaterialTheme.typography.bodySmall,
                     color = MaterialTheme.colorScheme.outline,
                 )
             }
-            if (endpoint != null) {
-                Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.spacedBy(16.dp, Alignment.Start),
-                ) {
-                    Text(
-                        "endpoint: $endpoint",
-                        style = MaterialTheme.typography.bodySmall,
-                        color = MaterialTheme.colorScheme.outline,
-                    )
-                }
-            }
         }
     }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/config/components/InterfaceFields.kt

@@ -52,9 +52,8 @@ fun InterfaceFields(
             if (isAuthenticated) VisualTransformation.None else PasswordVisualTransformation(),
         trailingIcon = {
             IconButton(
-                enabled = true,
+                enabled = isAuthenticated,
                 onClick = {
-                    if (!isAuthenticated) return@IconButton showAuthPrompt()
                     val keypair = com.wireguard.crypto.KeyPair()
                     onInterfaceChange(
                         interfaceState.copy(

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/scanner/ScannerScreen.kt

@@ -0,0 +1,33 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.main.scanner
+
+import android.app.Activity
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.remember
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.viewinterop.AndroidView
+import com.journeyapps.barcodescanner.CompoundBarcodeView
+import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
+
+@Composable
+fun ScannerScreen(viewModel: AppViewModel) {
+    val context = LocalContext.current
+
+    val barcodeView = remember {
+        CompoundBarcodeView(context).apply {
+            this.initializeFromIntent((context as Activity).intent)
+            this.setStatusText("")
+            this.decodeSingle { result ->
+                result.text?.let { barCodeOrQr ->
+                    viewModel.handleEvent(AppEvent.ImportTunnelFromQrCode(barCodeOrQr))
+                }
+            }
+        }
+    }
+    AndroidView(factory = { barcodeView })
+    DisposableEffect(Unit) {
+        barcodeView.resume()
+        onDispose { barcodeView.pause() }
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/tunneloptions/TunnelOptionsScreen.kt

@@ -6,53 +6,18 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.ui.common.SectionDivider
 import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SurfaceSelectionGroupButton
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.tunneloptions.components.*
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.AuthorizationPromptWrapper
-import com.zaneschepke.wireguardautotunnel.ui.state.AppViewState
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 
 @Composable
-fun TunnelOptionsScreen(
-    tunnelConf: TunnelConf,
-    viewModel: AppViewModel,
-    appViewState: AppViewState,
-) {
-    val isTv = LocalIsAndroidTV.current
-
-    var showAuthPrompt by remember { mutableStateOf(!isTv) }
-    var isAuthorized by remember { mutableStateOf(isTv) }
-
-    if (appViewState.showModal == AppViewState.ModalType.QR) {
-
-        // Show authorization prompt if needed
-        if (showAuthPrompt) {
-            AuthorizationPromptWrapper(
-                onDismiss = { showAuthPrompt = false },
-                onSuccess = {
-                    showAuthPrompt = false
-                    isAuthorized = true
-                },
-                viewModel = viewModel,
-            )
-        }
-        if (isAuthorized) {
-            QrCodeDialog(
-                tunnelConf = tunnelConf,
-                onDismiss = {
-                    viewModel.handleEvent(AppEvent.SetShowModal(AppViewState.ModalType.NONE))
-                },
-            )
-        }
-    }
+fun TunnelOptionsScreen(tunnelConf: TunnelConf, viewModel: AppViewModel) {
 
     Column(
         horizontalAlignment = Alignment.Start,

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/tunneloptions/components/QrCodeDialog.kt

@@ -1,190 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main.tunneloptions.components
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Check
-import androidx.compose.material.icons.outlined.VpnKey
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.MultiChoiceSegmentedButtonRow
-import androidx.compose.material3.SegmentedButton
-import androidx.compose.material3.SegmentedButtonDefaults
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.DialogProperties
-import com.zaneschepke.wireguardautotunnel.MainActivity
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.enums.ConfigType
-import com.zaneschepke.wireguardautotunnel.util.extensions.setScreenBrightness
-import io.github.alexzhirkevich.qrose.options.QrBallShape
-import io.github.alexzhirkevich.qrose.options.QrBrush
-import io.github.alexzhirkevich.qrose.options.QrErrorCorrectionLevel
-import io.github.alexzhirkevich.qrose.options.QrFrameShape
-import io.github.alexzhirkevich.qrose.options.QrOptions
-import io.github.alexzhirkevich.qrose.options.QrPixelShape
-import io.github.alexzhirkevich.qrose.options.circle
-import io.github.alexzhirkevich.qrose.options.roundCorners
-import io.github.alexzhirkevich.qrose.options.solid
-import io.github.alexzhirkevich.qrose.rememberQrCodePainter
-
-@Composable
-fun QrCodeDialog(tunnelConf: TunnelConf, onDismiss: () -> Unit) {
-    val context = LocalContext.current
-    val activity = context as? MainActivity
-
-    // Handle screen brightness
-    DisposableEffect(Unit) {
-        activity?.setScreenBrightness(1.0f)
-        onDispose { activity?.setScreenBrightness(-1f) }
-    }
-
-    QrCodeAlertDialog(tunnelConf = tunnelConf, onDismiss = onDismiss)
-}
-
-@Composable
-private fun QrCodeAlertDialog(tunnelConf: TunnelConf, onDismiss: () -> Unit) {
-    Surface(color = Color.White, tonalElevation = 0.dp) {
-        AlertDialog(
-            containerColor = Color.White,
-            onDismissRequest = onDismiss,
-            confirmButton = {
-                TextButton(onClick = onDismiss) {
-                    Text(stringResource(R.string.done), color = MaterialTheme.colorScheme.surface)
-                }
-            },
-            title = {
-                Text(
-                    text = tunnelConf.name,
-                    color = Color.Black,
-                    style = MaterialTheme.typography.titleLarge,
-                )
-            },
-            text = { QrCodeContent(tunnelConf = tunnelConf) },
-            properties = DialogProperties(usePlatformDefaultWidth = true),
-        )
-    }
-}
-
-@Composable
-private fun QrCodeContent(tunnelConf: TunnelConf) {
-    var selectedOption by remember { mutableStateOf(ConfigType.WG) }
-    val qrCodeText =
-        when (selectedOption) {
-            ConfigType.AM -> tunnelConf.toAmConfig().toAwgQuickString(true)
-            ConfigType.WG -> tunnelConf.toWgConfig().toWgQuickString(true)
-        }
-
-    Column(
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.spacedBy(12.dp, Alignment.Top),
-    ) {
-        val qrCodePainter = rememberQrCodePainter(data = qrCodeText, options = createQrOptions())
-        Image(
-            painter = qrCodePainter,
-            contentDescription = stringResource(R.string.show_qr),
-            modifier =
-                Modifier.size(300.dp)
-                    .align(Alignment.CenterHorizontally)
-                    .padding(16.dp)
-                    .background(Color.White),
-        )
-        ConfigTypeSelector(
-            selectedOption = selectedOption,
-            onOptionSelected = { selectedOption = it },
-        )
-    }
-}
-
-@Composable
-private fun ConfigTypeSelector(selectedOption: ConfigType, onOptionSelected: (ConfigType) -> Unit) {
-    MultiChoiceSegmentedButtonRow(modifier = Modifier.fillMaxWidth().padding(horizontal = 24.dp)) {
-        ConfigType.entries.sortedDescending().forEachIndexed { index, entry ->
-            val isActive = selectedOption == entry
-            val typeName =
-                stringResource(
-                    when (entry) {
-                        ConfigType.AM -> R.string.amnezia
-                        ConfigType.WG -> R.string.wireguard
-                    }
-                )
-            SegmentedButton(
-                shape =
-                    SegmentedButtonDefaults.itemShape(
-                        index = index,
-                        count = ConfigType.entries.size,
-                        baseShape = RoundedCornerShape(8.dp),
-                    ),
-                icon = {
-                    SegmentedButtonDefaults.Icon(
-                        active = isActive,
-                        activeContent = {
-                            Icon(
-                                imageVector = Icons.Outlined.Check,
-                                contentDescription = stringResource(R.string.select),
-                                tint = MaterialTheme.colorScheme.primary,
-                                modifier = Modifier.size(SegmentedButtonDefaults.IconSize),
-                            )
-                        },
-                    ) {
-                        Icon(
-                            imageVector = Icons.Outlined.VpnKey,
-                            contentDescription = typeName,
-                            tint = Color.Black,
-                            modifier = Modifier.size(SegmentedButtonDefaults.IconSize),
-                        )
-                    }
-                },
-                colors =
-                    SegmentedButtonDefaults.colors()
-                        .copy(
-                            activeContainerColor = Color.White,
-                            inactiveContainerColor = Color.White,
-                        ),
-                onCheckedChange = { onOptionSelected(entry) },
-                checked = isActive,
-            ) {
-                Text(
-                    text = typeName,
-                    color = Color.Black,
-                    style = MaterialTheme.typography.labelMedium,
-                )
-            }
-        }
-    }
-}
-
-private fun createQrOptions(): QrOptions = QrOptions {
-    shapes {
-        darkPixel = QrPixelShape.circle()
-        ball = QrBallShape.circle()
-        frame = QrFrameShape.roundCorners(0.2f)
-    }
-    colors {
-        dark = QrBrush.solid(Color.Black)
-        frame = QrBrush.solid(Color.Black)
-        ball = QrBrush.solid(Color.Black)
-    }
-    errorCorrectionLevel = QrErrorCorrectionLevel.Medium
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/support/SupportScreen.kt

@@ -23,7 +23,6 @@ import com.zaneschepke.wireguardautotunnel.ui.common.label.GroupLabel
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.components.ContactSupportOptions
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.components.GeneralSupportOptions
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.components.UpdateSection
-import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.extensions.canInstallPackages
 import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
 import com.zaneschepke.wireguardautotunnel.util.extensions.requestInstallPackagesPermission
@@ -55,7 +54,7 @@ fun SupportScreen(viewModel: SupportViewModel = hiltViewModel(), appViewModel: A
         InfoDialog(
             onDismiss = { viewModel.handleUpdateShown() },
             onAttest = {
-                if (BuildConfig.FLAVOR != Constants.STANDALONE_FLAVOR) {
+                if (BuildConfig.FLAVOR != "full") {
                     uiState.appUpdate?.apkUrl?.let { context.openWebUrl(it) }
                     return@InfoDialog
                 }
@@ -87,8 +86,7 @@ fun SupportScreen(viewModel: SupportViewModel = hiltViewModel(), appViewModel: A
             },
             confirmText = {
                 Text(
-                    if (BuildConfig.FLAVOR != Constants.STANDALONE_FLAVOR)
-                        stringResource(R.string.download)
+                    if (BuildConfig.FLAVOR != "full") stringResource(R.string.download)
                     else stringResource(R.string.download_and_install)
                 )
             },
@@ -126,7 +124,7 @@ fun SupportScreen(viewModel: SupportViewModel = hiltViewModel(), appViewModel: A
                 if (
                     BuildConfig.DEBUG ||
                         BuildConfig.VERSION_NAME.contains("beta") ||
-                        BuildConfig.FLAVOR == Constants.GOOGLE_PLAY_FLAVOR
+                        BuildConfig.FLAVOR == "google"
                 )
                     return@UpdateSection context.showToast(R.string.update_check_unsupported)
                 context.showToast(R.string.checking_for_update)

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/support/components/ContactSupportOptions.kt

@@ -85,7 +85,7 @@ fun ContactSupportOptions(context: android.content.Context) {
                         ),
                     )
                 )
-                if (BuildConfig.FLAVOR != Constants.GOOGLE_PLAY_FLAVOR) {
+                if (BuildConfig.FLAVOR == Constants.FDROID_FLAVOR) {
                     add(
                         SelectionItem(
                             leadingIcon = Icons.Filled.Favorite,

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/state/AppViewState.kt

@@ -18,7 +18,6 @@ data class AppViewState(
         NONE,
         DELETE,
         INFO,
-        QR,
     }
 
     enum class BottomSheet {

app/src/main/java/com/zaneschepke/wireguardautotunnel/util/Constants.kt

@@ -35,7 +35,5 @@ object Constants {
     const val QR_CODE_NAME_PROPERTY = "# Name ="
 
     const val FDROID_FLAVOR = "fdroid"
-    const val GOOGLE_PLAY_FLAVOR = "google"
-    const val STANDALONE_FLAVOR = "standalone"
     const val RELEASE = "release"
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/util/extensions/ContextExtensions.kt

@@ -1,7 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.util.extensions
 
 import android.Manifest
-import android.app.Activity
 import android.content.ComponentName
 import android.content.Context
 import android.content.Context.POWER_SERVICE
@@ -18,9 +17,6 @@ import android.widget.Toast
 import androidx.core.content.FileProvider
 import androidx.core.location.LocationManagerCompat
 import androidx.core.net.toUri
-import androidx.core.view.WindowCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.WindowInsetsControllerCompat
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.core.service.tile.AutoTunnelControlTile
 import com.zaneschepke.wireguardautotunnel.core.service.tile.TunnelControlTile
@@ -229,22 +225,3 @@ fun Context.installApk(apkFile: File) {
         }
     startActivity(intent)
 }
-
-fun Activity.setScreenBrightness(brightness: Float) {
-    window.attributes = window.attributes.apply { screenBrightness = brightness }
-}
-
-fun Activity.enableImmersiveMode() {
-    WindowCompat.setDecorFitsSystemWindows(window, false)
-    val controller = WindowCompat.getInsetsController(window, window.decorView)
-    controller.systemBarsBehavior =
-        WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
-    controller.hide(WindowInsetsCompat.Type.systemBars())
-}
-
-fun Activity.disableImmersiveMode() {
-    WindowCompat.setDecorFitsSystemWindows(window, true)
-    val controller = WindowCompat.getInsetsController(window, window.decorView)
-    controller.show(WindowInsetsCompat.Type.systemBars())
-    window.statusBarColor = android.graphics.Color.TRANSPARENT
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/util/extensions/StringExtensions.kt

@@ -1,29 +1,14 @@
 package com.zaneschepke.wireguardautotunnel.util.extensions
 
+import java.util.regex.Pattern
 import timber.log.Timber
 
 val hasNumberInParentheses = """^(.+?)\((\d+)\)$""".toRegex()
 
 fun String.isValidIpv4orIpv6Address(): Boolean {
-    val sanitized = removeSurrounding("[", "]")
-    val ipv6Pattern =
-        Regex(
-            "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:)" +
-                "{1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]" +
-                "{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:" +
-                "[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4})" +
-                "{1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}" +
-                ":((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]" +
-                "{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}" +
-                "[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:)" +
-                "{1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))"
-        )
-    val ipv4Pattern =
-        Regex(
-            "^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}" +
-                "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"
-        )
-    return ipv4Pattern.matches(sanitized) || ipv6Pattern.matches(sanitized)
+    val ipv4Pattern = Pattern.compile("^(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\$")
+    val ipv6Pattern = Pattern.compile("^([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4}\$")
+    return ipv4Pattern.matcher(this).matches() || ipv6Pattern.matcher(this).matches()
 }
 
 fun String.hasNumberInParentheses(): Boolean {

app/src/main/java/com/zaneschepke/wireguardautotunnel/viewmodel/AppViewModel.kt

@@ -56,7 +56,7 @@ constructor(
     @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
     @MainDispatcher private val mainDispatcher: CoroutineDispatcher,
     @AppShell private val rootShell: Provider<RootShell>,
-    val tunnelManager: TunnelManager,
+    private val tunnelManager: TunnelManager,
     private val serviceManager: ServiceManager,
     private val logReader: LogReader,
     private val fileUtils: FileUtils,
@@ -206,6 +206,7 @@ constructor(
                     is AppEvent.ShowMessage -> handleShowMessage(event.message)
                     is AppEvent.PopBackStack ->
                         _appViewState.update { it.copy(popBackStack = event.pop) }
+                    is AppEvent.ClearTunnelError -> tunnelManager.clearError(event.tunnel)
                     AppEvent.ToggleRemoteControl -> handleToggleRemoteControl(state.appState)
                     AppEvent.ClearSelectedTunnels -> clearSelectedTunnels()
                     is AppEvent.SetShowModal ->
@@ -264,9 +265,6 @@ constructor(
             }
         }
 
-    private fun handleTunnelErrors() =
-        viewModelScope.launch { tunnelManager.errorEvents.collect { errorEvent -> } }
-
     private suspend fun handleAppReadyCheck(tunnels: List<TunnelConf>) {
         if (tunnels.size == appDataRepository.tunnels.count()) {
             _appViewState.update { it.copy(isAppReady = true) }
@@ -400,7 +398,6 @@ constructor(
 
     private suspend fun handleClipboardImport(config: String, tunnels: List<TunnelConf>) {
         runCatching {
-                Timber.d("Config: $config")
                 val amConfig = TunnelConf.configFromAmQuick(config)
                 val tunnelConf = TunnelConf.tunnelConfigFromAmConfig(amConfig)
                 saveTunnel(
@@ -689,7 +686,7 @@ constructor(
             if (tunnels.isEmpty()) return
             val (files, shareFileName) =
                 when (configType) {
-                    ConfigType.AM -> {
+                    ConfigType.AMNEZIA -> {
                         val amFiles = fileUtils.createAmFiles(tunnels)
                         if (amFiles.isEmpty()) {
                             throw IOException("No valid Amnezia config files created")

app/src/main/java/com/zaneschepke/wireguardautotunnel/viewmodel/event/AppEvent.kt

@@ -106,6 +106,8 @@ sealed class AppEvent {
 
     data class ShowMessage(val message: StringValue) : AppEvent()
 
+    data class ClearTunnelError(val tunnel: TunnelConf) : AppEvent()
+
     data class PopBackStack(val pop: Boolean) : AppEvent()
 
     data class SetBottomSheet(val showSheet: AppViewState.BottomSheet) : AppEvent()

app/src/main/res/values/strings.xml

@@ -258,8 +258,4 @@
     <string name="update_check_unsupported">Update check not supported this build type.</string>
     <string name="darker">Darker</string>
     <string name="amoled">AMOLED</string>
-    <string name="show_qr">Show QR</string>
-    <string name="amnezia">Amnezia</string>
-    <string name="wireguard">WireGuard</string>
-    <string name="done">Done</string>
 </resources>

app/src/main/res/values/themes.xml

@@ -6,8 +6,6 @@
         <item name="android:colorPrimary">@color/background</item>
         <item name="android:windowAllowReturnTransitionOverlap">true</item>
         <item name="android:windowAllowEnterTransitionOverlap">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
 
     <style name="Theme.App.Start" parent="@style/Theme.SplashScreen">

buildSrc/src/main/kotlin/Extensions.kt

@@ -80,8 +80,8 @@ fun Project.computeVersionName(): String {
             // Bump minor for pre-release
             val preReleaseVersion = Semver.of(
                 baseVersion.major,
-                baseVersion.minor,
-                0 + 1,
+                baseVersion.minor + 1,
+                0
             )
             "${preReleaseVersion}-beta+git.${getGitCommitHash()}"
         }

gradle/libs.versions.toml

@@ -1,12 +1,12 @@
 [versions]
-accompanist = "0.37.3"
+accompanist = "0.37.2"
 activityCompose = "1.10.1"
-amneziawgAndroid = "1.4.0"
+amneziawgAndroid = "1.3.8"
 androidx-junit = "1.2.1"
 appcompat = "1.7.0"
 biometricKtx = "1.2.0-alpha05"
 coreKtx = "1.16.0"
-datastorePreferences = "1.2.0-alpha01"
+datastorePreferences = "1.1.4"
 desugar_jdk_libs = "2.1.5"
 espressoCore = "3.6.1"
 hiltAndroid = "2.56.2"
@@ -18,18 +18,17 @@ lifecycle-runtime-compose = "2.8.7"
 material3 = "1.3.2"
 navigationCompose = "2.8.9"
 pinLockCompose = "1.0.4"
-qrose = "1.0.1"
+qrcodeKotlin = "4.4.1"
 roomVersion = "2.7.1"
 semver4j = "3.1.0"
 slf4jAndroid = "1.7.36"
 timber = "5.0.1"
-tunnel = "1.3.0"
+tunnel = "1.2.14"
 androidGradlePlugin = "8.9.2"
 kotlin = "2.1.20"
 ksp = "2.1.20-2.0.0"
 composeBom = "2025.04.01"
-compose = "1.8.0"
-icons = "1.7.8"
+compose = "1.7.8"
 workRuntimeKtxVersion = "2.10.1"
 zxingAndroidEmbedded = "4.3.0"
 coreSplashscreen = "1.0.1"
@@ -96,10 +95,10 @@ ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktorCli
 ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktorClientCore" }
 ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktorClientCore" }
 lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycle-runtime-compose" }
-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "icons" }
+material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "compose" }
 
 pin-lock-compose = { module = "com.zaneschepke:pin_lock_compose", version.ref = "pinLockCompose" }
-qrose = { module = "io.github.alexzhirkevich:qrose", version.ref = "qrose" }
+qrcode-kotlin = { module = "io.github.g0dkar:qrcode-kotlin", version.ref = "qrcodeKotlin" }
 semver4j = { module = "com.vdurmont:semver4j", version.ref = "semver4j" }
 slf4j-android = { module = "org.slf4j:slf4j-android", version.ref = "slf4jAndroid" }
 timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" }