fix: nightly release bug

Fixes bug where auto tunnel tile was the opposite state

Closes #241

.github/workflows/pre-release.yml

@@ -1,124 +0,0 @@
-name: Android CI Tag Deployment (Pre-release)
-
-on:
-  workflow_dispatch:
-  push:
-    tags:
-      - '*.*.*-**'
-
-jobs:
-  build:
-    name: Build Signed APK
-
-    runs-on: ubuntu-latest
-
-    env:
-      SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
-      SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
-      SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
-      KEY_STORE_FILE: 'android_keystore.jks'
-      KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
-      GH_USER: ${{ secrets.GH_USER }}
-      GH_TOKEN: ${{ secrets.GH_TOKEN }}
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-          cache: gradle
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      # Here we need to decode keystore.jks from base64 string and place it
-      # in the folder specified in the release signing configuration
-      - name: Decode Keystore
-        id: decode_keystore
-        uses: timheuer/base64-to-file@v1.2
-        with:
-          fileName: ${{ env.KEY_STORE_FILE }}
-          fileDir: ${{ env.KEY_STORE_LOCATION }}
-          encodedString: ${{ secrets.KEYSTORE }}
-
-      # create keystore path for gradle to read
-      - name: Create keystore path env var
-        run: |
-          store_path=${{ env.KEY_STORE_LOCATION }}${{ env.KEY_STORE_FILE }}
-          echo "KEY_STORE_PATH=$store_path" >> $GITHUB_ENV
-
-      - name: Create service_account.json
-        id: createServiceAccount
-        run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
-
-      # Build and sign APK ("-x test" argument is used to skip tests)
-      # add fdroid flavor for apk upload
-      - name: Build Fdroid Release APK
-        run: ./gradlew :app:assembleFdroidRelease -x test
-
-      # get fdroid flavor release apk path
-      - name: Get apk path
-        id: apk-path
-        run: echo "path=$(find . -regex '^.*/build/outputs/apk/fdroid/release/.*\.apk$' -type f | head -1)" >> $GITHUB_OUTPUT
-      - name: Get version code
-        run: |
-          version_code=$(grep "VERSION_CODE" buildSrc/src/main/kotlin/Constants.kt | awk '{print $5}' | tr -d '\n')
-          echo "VERSION_CODE=$version_code" >> $GITHUB_ENV
-      # Save the APK after the Build job is complete to publish it as a Github release in the next job
-      - name: Upload APK
-        uses: actions/upload-artifact@v4.3.3
-        with:
-          name: wgtunnel
-          path: ${{ steps.apk-path.outputs.path }}
-      - name: Download APK from build
-        uses: actions/download-artifact@v4
-        with:
-          name: wgtunnel
-      - name: Create Release with Fastlane changelog notes
-        id: create_release
-        uses: softprops/action-gh-release@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          # fix hardcode changelog file name
-          body_path: ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/${{ env.VERSION_CODE }}.txt
-          tag_name: ${{ github.ref_name }}
-          name: ${{ github.ref_name }}
-          draft: false
-          prerelease: true
-          files: ${{ github.workspace }}/${{ steps.apk-path.outputs.path }}
-
-      - name: Install apksigner
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y apksigner
-
-      - name: Get checksum
-        id: checksum
-        run: echo "checksum=$(apksigner verify -print-certs ${{ steps.apk-path.outputs.path }} | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")" >> $GITHUB_OUTPUT
-
-      - name: Append checksum
-        id: append_checksum
-        uses: softprops/action-gh-release@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          body: |
-            
-            SHA256 fingerprint:
-            ```${{ steps.checksum.outputs.checksum }}```
-          tag_name: ${{ github.ref_name }}
-          name: ${{ github.ref_name }}
-          draft: false
-          prerelease: true
-          append_body: true
-
-      - name: Deploy with fastlane
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.2' # Not needed with a .ruby-version file
-          bundler-cache: true
-      - name: Distribute app to Beta track 🚀
-        run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane beta)
-

.github/workflows/release.yml

@@ -1,17 +1,40 @@
-# name of the workflow
-name: Android CI Tag Deployment (Release)
+name: release-android
 
 on:
+  schedule:
+    - cron: "4 3 * * *"
   workflow_dispatch:
-  push:
-    tags:
-      - '*.*.*'
-      - '!*.*.*-**'
+    inputs:
+      track:
+        type: choice
+        description: "Google play release track"
+        options:
+          - none
+          - internal
+          - alpha
+          - beta
+          - production
+        default: alpha
+        required: true
+      release_type:
+        type: choice
+        description: "GitHub release type"
+        options:
+          - none
+          - prerelease
+          - nightly
+          - release
+        default: release
+        required: true
+      tag_name:
+        description: "Tag name for release"
+        required: false
+        default: nightly
 
 jobs:
   build:
     name: Build Signed APK
-
+    if: ${{ inputs.release_type != 'none' }}
     runs-on: ubuntu-latest
 
     env:
@@ -21,7 +44,9 @@ jobs:
       KEY_STORE_FILE: 'android_keystore.jks'
       KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
       GH_USER: ${{ secrets.GH_USER }}
+      # GH needed for gh cli
       GH_TOKEN: ${{ secrets.GH_TOKEN }}
+      GH_REPO: ${{ github.repository }}
 
     steps:
       - uses: actions/checkout@v4
@@ -34,6 +59,10 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
+      - name: Install system dependencies
+        run: |
+          sudo apt update && sudo apt install -y gh apksigner
+
       # Here we need to decode keystore.jks from base64 string and place it
       # in the folder specified in the release signing configuration
       - name: Decode Keystore
@@ -57,75 +86,126 @@ jobs:
       # Build and sign APK ("-x test" argument is used to skip tests)
       # add fdroid flavor for apk upload
       - name: Build Fdroid Release APK
+        if: ${{ inputs.release_type != '' && inputs.release_type != 'nightly' }}
         run: ./gradlew :app:assembleFdroidRelease -x test
 
-      # get fdroid flavor release apk path
-      - name: Get apk path
-        id: apk-path
-        run: echo "path=$(find . -regex '^.*/build/outputs/apk/fdroid/release/.*\.apk$' -type f | head -1)" >> $GITHUB_OUTPUT
+
+      - name: Build Fdroid Nightly APK
+        if: ${{ inputs.release_type == '' || inputs.release_type == 'nightly' }}
+        run: ./gradlew :app:assembleFdroidNightly -x test
+
+      - if: ${{ inputs.release_type == '' || inputs.release_type == 'nightly' }}
+        run: echo "APK_PATH=$(find . -regex '^.*/build/outputs/apk/fdroid/nightly/.*\.apk$' -type f | head -1)" >> $GITHUB_ENV
+      - if: ${{ inputs.release_type != '' && inputs.release_type != 'nightly' }}
+        run: echo "APK_PATH=$(find . -regex '^.*/build/outputs/apk/fdroid/release/.*\.apk$' -type f | head -1)" >> $GITHUB_ENV
+
       - name: Get version code
+        if: ${{ inputs.release_type == 'release' || inputs.release_type == 'prerelease' }}
         run: |
           version_code=$(grep "VERSION_CODE" buildSrc/src/main/kotlin/Constants.kt | awk '{print $5}' | tr -d '\n')
           echo "VERSION_CODE=$version_code" >> $GITHUB_ENV
+
       # Save the APK after the Build job is complete to publish it as a Github release in the next job
       - name: Upload APK
-        uses: actions/upload-artifact@v4.3.3
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: wgtunnel
-          path: ${{ steps.apk-path.outputs.path }}
+          path: ${{ env.APK_PATH }}
+
       - name: Download APK from build
         uses: actions/download-artifact@v4
         with:
           name: wgtunnel
+
       - name: Repository Dispatch for my F-Droid repo
         uses: peter-evans/repository-dispatch@v3
+        if: ${{ inputs.release_type == 'release' }}
         with:
           token: ${{ secrets.PAT }}
           repository: zaneschepke/fdroid
           event-type: fdroid-update
+
+      - name: Set version release notes
+        if: ${{ inputs.release_type == 'release' || inputs.release_type == 'prerelease' }}
+        run: |
+          RELEASE_NOTES="$(cat ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/${{ env.VERSION_CODE }}.txt)"
+          echo "RELEASE_NOTES<<EOF" >> $GITHUB_ENV
+          echo "$RELEASE_NOTES" >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
+
+      - name: On nightly release
+        if: ${{ contains(env.TAG_NAME, 'nightly') }}
+        run: |
+          echo "RELEASE_NOTES=Nightly build for the latest development version of the app." >> $GITHUB_ENV
+          gh release delete nightly --yes || true
+
+      # Setup TAG_NAME, which is used as a general "name"
+      - if: github.event_name == 'workflow_dispatch'
+        run: echo "TAG_NAME=${{ github.event.inputs.tag_name }}" >> $GITHUB_ENV
+      - if: github.event_name == 'schedule'
+        run: echo "TAG_NAME=nightly" >> $GITHUB_ENV
+
+      - name: On nightly release
+        if: ${{ contains(env.TAG_NAME, 'nightly') }}
+        run: |
+          echo "RELEASE_NOTES=Nightly build of the latest development version of the android client." >> $GITHUB_ENV
+          gh release delete nightly --yes || true
+
+      - name: Get checksum
+        id: checksum
+        run: echo "checksum=$(apksigner verify -print-certs ${{ env.APK_PATH }} | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")" >> $GITHUB_OUTPUT
+
+
       - name: Create Release with Fastlane changelog notes
         id: create_release
         uses: softprops/action-gh-release@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          body_path: ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/${{ env.VERSION_CODE }}.txt
-          tag_name: ${{ github.ref_name }}
-          name: ${{ github.ref_name }}
-          draft: false
-          prerelease: false
-          files: ${{ github.workspace }}/${{ steps.apk-path.outputs.path }}
-
-      - name: Install apksigner
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y apksigner
-
-      - name: Get checksum
-        id: checksum
-        run: echo "checksum=$(apksigner verify -print-certs ${{ steps.apk-path.outputs.path }} | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")" >> $GITHUB_OUTPUT
-
-      - name: Append checksum
-        id: append_checksum
-        uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           body: |
+            ${{ env.RELEASE_NOTES }}
             
             SHA256 fingerprint:
             ```${{ steps.checksum.outputs.checksum }}```
-          tag_name: ${{ github.ref_name }}
-          name: ${{ github.ref_name }}
+          tag_name: ${{ env.TAG_NAME }}
+          name: ${{ env.TAG_NAME }}
           draft: false
-          prerelease: false
-          append_body: true
+          prerelease: ${{ inputs.release_type == 'prerelease' || inputs.release_type == '' || inputs.release_type == 'nightly' }}
+          make_latest: ${{ inputs.release_type == 'release' }}
+          files: ${{ github.workspace }}/${{ env.APK_PATH }}
+
+  publish-play:
+    if: ${{ inputs.track != 'none' && inputs.track != '' }}
+    name: Publish to Google Play
+    runs-on: ubuntu-latest
+
+    env:
+      SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
+      SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
+      SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
+      KEY_STORE_FILE: 'android_keystore.jks'
+      KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
+      GH_USER: ${{ secrets.GH_USER }}
+      GH_TOKEN: ${{ secrets.GH_TOKEN }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: gradle
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
 
       - name: Deploy with fastlane
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.2' # Not needed with a .ruby-version file
           bundler-cache: true
-      - name: Distribute app to Prod track 🚀
-        run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane production)
+
+      - name: Distribute app to Prod track 🚀
+        run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane ${{ inputs.track }})
 

app/build.gradle.kts

@@ -1,16 +1,17 @@
-import java.util.Properties
-
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.hilt.android)
     alias(libs.plugins.kotlinxSerialization)
     alias(libs.plugins.ksp)
+    alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.grgit)
 }
 
 android {
     namespace = Constants.APP_ID
     compileSdk = Constants.TARGET_SDK
+    compileSdkPreview = "VanillaIceCream"
 
     androidResources {
         generateLocaleConfig = true
@@ -35,44 +36,10 @@ android {
 
     signingConfigs {
         create(Constants.RELEASE) {
-            val properties =
-                Properties().apply {
-                    // created local file for signing details
-                    try {
-                        load(file("signing.properties").reader())
-                    } catch (_: Exception) {
-                        load(file("signing_template.properties").reader())
-                    }
-                }
-
-            // try to get secrets from env first for pipeline build, then properties file for local
-            // build
-            storeFile =
-                file(
-                    System.getenv()
-                        .getOrDefault(
-                            Constants.KEY_STORE_PATH_VAR,
-                            properties.getProperty(Constants.KEY_STORE_PATH_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),
-                    )
+            storeFile = getStoreFile()
+            storePassword = getSigningProperty(Constants.STORE_PASS_VAR)
+            keyAlias = getSigningProperty(Constants.KEY_ALIAS_VAR)
+            keyPassword = getSigningProperty(Constants.KEY_PASS_VAR)
         }
     }
 
@@ -103,6 +70,12 @@ android {
             signingConfig = signingConfigs.getByName(Constants.RELEASE)
         }
         debug { isDebuggable = true }
+
+        create(Constants.NIGHTLY) {
+            initWith(getByName("release"))
+            defaultConfig.versionName = nightlyVersionName()
+            defaultConfig.versionCode = nightlyVersionCode()
+        }
     }
     flavorDimensions.add(Constants.TYPE)
     productFlavors {
@@ -124,7 +97,6 @@ android {
         compose = true
         buildConfig = true
     }
-    composeOptions { kotlinCompilerExtensionVersion = Constants.COMPOSE_COMPILER_EXTENSION_VERSION }
     packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
 }
 
@@ -212,3 +184,11 @@ dependencies {
     // splash
     implementation(libs.androidx.core.splashscreen)
 }
+
+fun nightlyVersionCode() : Int {
+    return Constants.VERSION_CODE + Constants.NIGHTLY_CODE
+}
+
+fun nightlyVersionName() : String {
+    return Constants.VERSION_NAME + "-${grgitService.service.get().grgit.head().abbreviatedId}"
+}

app/src/main/AndroidManifest.xml

@@ -80,7 +80,6 @@
         <activity
             android:name=".ui.MainActivity"
             android:exported="true"
-            android:screenOrientation="portrait"
             android:theme="@style/Theme.WireguardAutoTunnel">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/notification/WireGuardNotification.kt

@@ -10,6 +10,7 @@ import android.graphics.Color
 import androidx.core.app.NotificationCompat
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.MainActivity
+import com.zaneschepke.wireguardautotunnel.ui.SplashActivity
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
@@ -59,7 +60,7 @@ class WireGuardNotification @Inject constructor(@ApplicationContext private val
                 }
         notificationManager.createNotificationChannel(channel)
         val pendingIntent: PendingIntent =
-            Intent(context, MainActivity::class.java).let { notificationIntent ->
+            Intent(context, SplashActivity::class.java).let { notificationIntent ->
                 PendingIntent.getActivity(
                     context,
                     0,

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/tile/AutoTunnelControlTile.kt

@@ -3,10 +3,15 @@ package com.zaneschepke.wireguardautotunnel.service.tile
 import android.os.Build
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.ServiceLifecycleDispatcher
+import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.module.ServiceScope
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
@@ -16,7 +21,7 @@ import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class AutoTunnelControlTile : TileService() {
+class AutoTunnelControlTile : TileService(), LifecycleOwner {
 
     @Inject
     lateinit var appDataRepository: AppDataRepository
@@ -24,15 +29,13 @@ class AutoTunnelControlTile : TileService() {
     @Inject
     lateinit var serviceManager: ServiceManager
 
-    @Inject
-    @ApplicationScope
-    lateinit var applicationScope: CoroutineScope
+    private val dispatcher = ServiceLifecycleDispatcher(this)
 
     private var manualStartConfig: TunnelConfig? = null
 
     override fun onStartListening() {
         super.onStartListening()
-        applicationScope.launch {
+        lifecycleScope.launch {
             val settings = appDataRepository.settings.getSettings()
             when (settings.isAutoTunnelEnabled) {
                 true -> {
@@ -44,7 +47,6 @@ class AutoTunnelControlTile : TileService() {
                         setTileDescription(this@AutoTunnelControlTile.getString(R.string.active))
                     }
                 }
-
                 false -> {
                     setTileDescription(this@AutoTunnelControlTile.getString(R.string.disabled))
                     setUnavailable()
@@ -61,9 +63,10 @@ class AutoTunnelControlTile : TileService() {
     override fun onClick() {
         super.onClick()
         unlockAndRun {
-            applicationScope.launch {
+            lifecycleScope.launch {
                 try {
                     appDataRepository.toggleWatcherServicePause()
+                    onStartListening()
                 } catch (e: Exception) {
                     Timber.e(e.message)
                 } finally {
@@ -98,4 +101,7 @@ class AutoTunnelControlTile : TileService() {
         }
         qsTile.updateTile()
     }
+
+    override val lifecycle: Lifecycle
+        get() = dispatcher.lifecycle
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/tile/TunnelControlTile.kt

@@ -3,6 +3,11 @@ package com.zaneschepke.wireguardautotunnel.service.tile
 import android.os.Build
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleService
+import androidx.lifecycle.ServiceLifecycleDispatcher
+import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
@@ -17,7 +22,7 @@ import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class TunnelControlTile : TileService() {
+class TunnelControlTile : TileService(), LifecycleOwner {
 
     @Inject
     lateinit var appDataRepository: AppDataRepository
@@ -28,16 +33,14 @@ class TunnelControlTile : TileService() {
     @Inject
     lateinit var serviceManager: ServiceManager
 
-    @Inject
-    @ApplicationScope
-    lateinit var applicationScope: CoroutineScope
+    private val dispatcher = ServiceLifecycleDispatcher(this)
 
     private var manualStartConfig: TunnelConfig? = null
 
     override fun onStartListening() {
         super.onStartListening()
         Timber.d("On start listening called")
-        applicationScope.launch {
+        lifecycleScope.launch {
             when (vpnService.getState()) {
                 TunnelState.UP -> {
                     setActive()
@@ -67,7 +70,7 @@ class TunnelControlTile : TileService() {
     override fun onClick() {
         super.onClick()
         unlockAndRun {
-            applicationScope.launch {
+            lifecycleScope.launch {
                 try {
                     if (vpnService.getState() == TunnelState.UP) {
                         serviceManager.stopVpnServiceForeground(
@@ -113,4 +116,7 @@ class TunnelControlTile : TileService() {
         }
         qsTile.updateTile()
     }
+
+    override val lifecycle: Lifecycle
+        get() = dispatcher.lifecycle
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/RowListItem.kt

@@ -15,6 +15,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -31,11 +33,12 @@ fun RowListItem(
     onClick: () -> Unit,
     rowButton: @Composable () -> Unit,
     expanded: Boolean,
-    statistics: TunnelStatistics?
+    statistics: TunnelStatistics?,
+    focusRequester: FocusRequester,
 ) {
     Box(
         modifier =
-        Modifier
+        Modifier.focusRequester(focusRequester)
             .animateContentSize()
             .clip(RoundedCornerShape(30.dp))
             .combinedClickable(

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

@@ -489,6 +489,7 @@ fun MainScreen(
             }
             item {
                 if (uiState.settings.isAutoTunnelEnabled) {
+                    val itemFocusRequester = remember { FocusRequester() }
                     val autoTunnelingLabel = buildAnnotatedString {
                         append(stringResource(id = R.string.auto_tunneling))
                         append(": ")
@@ -516,22 +517,29 @@ fun MainScreen(
                         rowButton = {
                             if (uiState.settings.isAutoTunnelPaused) {
                                 TextButton(
+                                    modifier = Modifier.focusRequester(itemFocusRequester),
                                     onClick = { viewModel.resumeAutoTunneling() },
                                 ) {
                                     Text(stringResource(id = R.string.resume))
                                 }
                             } else {
                                 TextButton(
+                                    modifier = Modifier.focusRequester(itemFocusRequester),
                                     onClick = { viewModel.pauseAutoTunneling() },
                                 ) {
                                     Text(stringResource(id = R.string.pause))
                                 }
                             }
                         },
-                        onClick = {},
+                        onClick = {
+                            if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+                                itemFocusRequester.requestFocus()
+                            }
+                        },
                         onHold = {},
                         expanded = false,
                         statistics = null,
+                        focusRequester = focusRequester
                     )
                 }
             }
@@ -562,6 +570,7 @@ fun MainScreen(
                     } else {
                         Color.Gray
                     })
+                val itemFocusRequester = remember { FocusRequester() }
                 val expanded = remember { mutableStateOf(false) }
                 RowListItem(
                     icon = {
@@ -607,11 +616,12 @@ fun MainScreen(
                             }
                         } else {
                             selectedTunnel = tunnel
-                            focusRequester.requestFocus()
+                            itemFocusRequester.requestFocus()
                         }
                     },
                     statistics = uiState.vpnState.statistics,
                     expanded = expanded.value,
+                    focusRequester = focusRequester,
                     rowButton = {
                         if (
                             tunnel.id == selectedTunnel?.id &&
@@ -667,7 +677,7 @@ fun MainScreen(
                             @Composable
                             fun TunnelSwitch() =
                                 Switch(
-                                    modifier = Modifier.focusRequester(focusRequester),
+                                    modifier = Modifier.focusRequester(itemFocusRequester),
                                     checked = checked,
                                     onCheckedChange = { checked ->
                                         if (!checked) expanded.value = false
@@ -678,7 +688,7 @@ fun MainScreen(
                                 Row {
                                     IconButton(
                                         onClick = {
-                                            if (uiState.settings.isAutoTunnelEnabled) {
+                                            if (uiState.settings.isAutoTunnelEnabled && !uiState.settings.isAutoTunnelPaused) {
                                                 appViewModel.showSnackbarMessage(
                                                     context.getString(R.string.turn_off_auto),
                                                 )

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

@@ -102,7 +102,6 @@ fun SettingsScreen(
     val scope = rememberCoroutineScope()
     val scrollState = rememberScrollState()
     val interactionSource = remember { MutableInteractionSource() }
-    //val pinExists = remember { mutableStateOf(PinManager.pinExists()) }
 
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     val kernelSupport by viewModel.kernelSupport.collectAsStateWithLifecycle()

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

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">WG Tunnel</string>
     <string name="vpn_channel_id">VPN Kanalı</string>
@@ -8,38 +7,38 @@
     <string name="github_url" translatable="false">https://github.com/zaneschepke/wgtunnel/issues</string>
     <string name="docs_url" translatable="false">https://zaneschepke.com/wgtunnel-docs/overview.html</string>
     <string name="privacy_policy_url" translatable="false">https://zaneschepke.com/wgtunnel-docs/privacypolicy.html</string>
-    <string name="error_file_extension">Dosya bir .conf veya .zip değil</string>
-    <string name="turn_off_tunnel">Eylem tünelin kapalı olmasını gerektiriyor</string>
-    <string name="no_tunnels">Henüz bir tünel ekli değil!</string>
+    <string name="error_file_extension">Dosya .conf veya .zip değil</string>
+    <string name="turn_off_tunnel">İşlem için tünelin kapalı olması gerekiyor</string>
+    <string name="no_tunnels">Henüz tünel eklenmedi!</string>
     <string name="discord_url" translatable="false">https://discord.gg/rbRRNh6H7V</string>
-    <string name="watcher_notification_text_active">Ağ durumu değişikliklerini izleme: etkin</string>
-    <string name="watcher_notification_text_paused">Ağ durumu değişikliklerini izleme: duraklatıldı</string>
+    <string name="watcher_notification_text_active">Ağ durum değişiklikleri izleniyor: aktif</string>
+    <string name="watcher_notification_text_paused">Ağ durum değişiklikleri izleniyor: duraklatıldı</string>
     <string name="tunnel_start_title">VPN bağlandı</string>
-    <string name="tunnel_start_text">Tünele bağlı</string>
+    <string name="tunnel_start_text">Tünele bağlandı</string>
     <string name="notification_permission_required">Bildirim izni gerekli.</string>
-    <string name="add_trusted_ssid">Güvenilir Wi-Fi adı ekle</string>
+    <string name="add_trusted_ssid">Güvenilir wifi adı ekle</string>
     <string name="tunnels">Tüneller</string>
     <string name="enable_auto_tunnel">Otomatik tünellemeyi başlat</string>
     <string name="disable_auto_tunnel">Otomatik tünellemeyi durdur</string>
-    <string name="tunnel_mobile_data">Mobil veri üzerinde tünel</string>
-    <string name="one_tunnel_required">Bu özelliği kullanabilmek için en az bir tünel gereklidir.</string>
-    <string name="privacy_policy">Gizlilik Politikası</string>
+    <string name="tunnel_mobile_data">Mobil veride tünel</string>
+    <string name="one_tunnel_required">Bu özelliği kullanmak için en az bir tünel gerekli</string>
+    <string name="privacy_policy">Gizlilik Politikasını Görüntüle</string>
     <string name="okay">Tamam</string>
-    <string name="tunnel_on_ethernet">Ethernet üzerinde tünel</string>
-    <string name="prominent_background_location_message">Bu özellik, uygulama kapalıyken bile Wi-Fi SSID izlemesini etkinleştirmek için arka plan konumu izni gerektirir. Daha fazla bilgi için lütfen Destek ekranında bağlantısı verilen Gizlilik Politikasına bakın.</string>
+    <string name="tunnel_on_ethernet">Ethernet\'te tünel</string>
+    <string name="prominent_background_location_message">Bu özellik, uygulama kapalıyken bile Wi-Fi SSID izlemesini etkinleştirmek için arka plan konum iznine ihtiyaç duyar. Daha fazla ayrıntı için lütfen Destek ekranında bağlantısı verilen Gizlilik Politikasına bakın.</string>
     <string name="prominent_background_location_title">Arka Plan Konum Açıklaması</string>
-    <string name="thank_you">WG Tunnel\'i kullandığınız için teşekkür ederiz!</string>
-    <string name="trusted_ssid_empty_description">SSID\'yi gir</string>
+    <string name="thank_you">WG Tunnel\'ı kullandığınız için teşekkürler!</string>
+    <string name="trusted_ssid_empty_description">SSID girin</string>
     <string name="trusted_ssid_value_description">SSID\'yi gönder</string>
-    <string name="add_tunnels_text">Dosyadan veya ZIP\'ten ekle</string>
+    <string name="add_tunnels_text">Dosyadan veya zip\'ten ekle</string>
     <string name="open_file">Dosya Aç</string>
     <string name="add_from_qr">QR kodundan ekle</string>
-    <string name="qr_scan">QR kodu tarat</string>
-    <string name="tunnel_name">Tünel adı</string>
-    <string name="add_tunnel">Tünel ekle</string>
+    <string name="qr_scan">QR Tarama</string>
+    <string name="tunnel_name">Tünel Adı</string>
+    <string name="add_tunnel">Tünel Ekle</string>
     <string name="exclude">Hariç tut</string>
     <string name="include">Dahil et</string>
-    <string name="tunnel_all">Tüm uygulamaları dahil et</string>
+    <string name="tunnel_all">Tüm uygulamaları tünelle</string>
     <string name="config_changes_saved">Yapılandırma değişiklikleri kaydedildi.</string>
     <string name="save_changes">Kaydet</string>
     <string name="icon">Simge</string>
@@ -55,15 +54,15 @@
     <string name="endpoint">Uç nokta (endpoint)</string>
     <string name="name">Ad</string>
     <string name="restart">Tüneli Yeniden Başlat</string>
-    <string name="vpn_connection_failed">Bağlantı kurulamadı</string>
+    <string name="vpn_connection_failed">Bağlantı başarısız</string>
     <string name="always_on_vpn_support">Her Zaman Açık VPN\'e İzin Ver</string>
     <string name="location_services_not_detected">Konum Hizmetleri Algılanmadı</string>
-    <string name="hint_search_packages">Uygulama arayın</string>
-    <string name="attempt_connection">Bağlantı kurulmaya çalışılıyor..</string>
+    <string name="hint_search_packages">Paketlerde ara</string>
+    <string name="attempt_connection">Bağlantı deneniyor..</string>
     <string name="vpn_starting">VPN başlatılıyor</string>
     <string name="db_name">wg-tunnel-db</string>
-    <string name="scanning_qr">QR taranıyor</string>
-    <string name="none">Güvenilir Wi-Fi adı yok</string>
+    <string name="scanning_qr">QR için taranıyor</string>
+    <string name="none">Güvenilir wifi adı yok</string>
     <string name="other">Diğer</string>
     <string name="auto_tunneling">Otomatik tünelleme</string>
     <string name="vpn_on">VPN açık</string>
@@ -71,50 +70,50 @@
     <string name="default_vpn_on">Birincil VPN açık</string>
     <string name="default_vpn_off">Birincil VPN kapalı</string>
     <string name="create_import">Sıfırdan oluştur</string>
-    <string name="turn_off_auto">Eylem, otomatik tünelin devre dışı bırakılmasını veya duraklatılmasını gerektirir</string>
-    <string name="turn_on_tunnel">Eylem aktif tünel gerektirir</string>
-    <string name="add_peer">Eş (peer) ekle</string>
+    <string name="turn_off_auto">İşlem için otomatik tünelin devre dışı veya duraklatılmış olması gerekiyor</string>
+    <string name="turn_on_tunnel">İşlem için aktif tünel gerekiyor</string>
+    <string name="add_peer">Eş ekle</string>
     <string name="done">Tamam</string>
     <string name="interface_">Arayüz</string>
-    <string name="rotate_keys">Tuşları döndür</string>
+    <string name="rotate_keys">Anahtarları döndür</string>
     <string name="private_key">Özel anahtar</string>
     <string name="copy_public_key">Genel anahtarı kopyala</string>
-    <string name="base64_key">Base64 anahtarı</string>
-    <string name="comma_separated_list">Virgül ile ayrılmış liste ekleyin</string>
-    <string name="listen_port">Bağlantı noktası</string>
-    <string name="random">(Rastgele)</string>
-    <string name="optional">(İsteğe bağlı)</string>
-    <string name="optional_no_recommend">(İsteğe bağlı, önerilmez)</string>
-    <string name="preshared_key">Ön paylaşımlı anahtar</string>
+    <string name="base64_key">base64 anahtar</string>
+    <string name="comma_separated_list">virgülle ayrılmış liste</string>
+    <string name="listen_port">Dinleme portu</string>
+    <string name="random">(rastgele)</string>
+    <string name="optional">(isteğe bağlı)</string>
+    <string name="optional_no_recommend">(isteğe bağlı, önerilmez)</string>
+    <string name="preshared_key">Önceden paylaşılmış anahtar</string>
     <string name="seconds">saniye</string>
-    <string name="persistent_keepalive">Kalıcı olarak canlı tutma</string>
+    <string name="persistent_keepalive">Kalıcı canlı tutma</string>
     <string name="cancel">İptal</string>
     <string name="error_authentication_failed">Kimlik doğrulama başarısız oldu</string>
-    <string name="error_authorization_failed">Yetkilendirilemedi</string>
+    <string name="error_authorization_failed">Yetkilendirme başarısız oldu</string>
     <string name="enabled_app_shortcuts">Uygulama kısayollarını etkinleştir</string>
     <string name="export_configs">Yapılandırmaları dışa aktar</string>
-    <string name="location_services_required">Gerekli konum hizmetleri</string>
+    <string name="export_configs_failed">Yapılandırmaları dışa aktarma başarısız oldu</string>
+    <string name="location_services_required">Konum hizmetleri gerekli</string>
     <string name="background_location_required">Arka plan konumu gerekli</string>
-    <string name="precise_location_required">Kesin konum gerekli</string>
+    <string name="precise_location_required">Hassas konum gerekli</string>
     <string name="unknown_error">Bilinmeyen bir hata oluştu</string>
-    <string name="exported_configs_message">Yapılandırmalar indirilenler\'e aktarıldı</string>
-    <string name="tunnel_on_wifi">Güvenilmeyen kablosuz internet bağlantısında tünel</string>
+    <string name="exported_configs_message">Yapılandırmalar indirilenler klasörüne aktarıldı</string>
+    <string name="tunnel_on_wifi">Güvenilmeyen wifi\'da tünel</string>
     <string name="my_email" translatable="false">support@zaneschepke.com</string>
     <string name="email_subject">WG Tunnel Desteği</string>
-    <string name="email_chooser">Bir e-posta gönderin…</string>
+    <string name="email_chooser">E-posta gönder…</string>
     <string name="go">git</string>
     <string name="docs_description">Belgeleri oku</string>
     <string name="discord_description">Topluluğa katıl</string>
     <string name="email_description">Bana e-posta gönder</string>
-    <string name="support_help_text">Sorun yaşıyorsanız, iyileştirme fikirleriniz varsa veya sadece etkileşimde bulunmak istiyorsanız, aşağıdaki kaynaklar mevcuttur:</string>
-    <string name="kernel">Çekirdek</string>
-    <string name="use_kernel">Çekirdek modülünü kullan</string>
-    <string name="error_ssid_exists">SSID zaten var</string>
-    <string name="error_root_denied">Kök kabuğu reddedildi</string>
-    <string name="error_no_file_explorer">Yüklü dosya gezgini yok</string>
+    <string name="support_help_text">Sorun yaşıyorsanız, iyileştirme fikirleriniz varsa veya sadece iletişime geçmek istiyorsanız, aşağıdaki kaynaklar mevcuttur:</string>
+    <string name="use_kernel">Kernel modülünü kullan</string>
+    <string name="error_ssid_exists">SSID zaten mevcut</string>
+    <string name="error_root_denied">Root kabuğu reddedildi</string>
+    <string name="error_no_file_explorer">Dosya gezgini yüklü değil</string>
     <string name="error_invalid_code">Geçersiz QR kodu</string>
     <string name="error_none">Hata yok</string>
-    <string name="location_services_missing_message">Uygulama, cihazınızda etkinleştirilen herhangi bir konum hizmeti algılamıyor. Cihaza bağlı olarak bu, güvenilmeyen Wi-Fi özelliğinin Wi-Fi adını okuyamamasına neden olabilir. Yine de devam etmek ister misiniz?</string>
+    <string name="location_services_missing_message">Uygulama, cihazınızda etkinleştirilmiş herhangi bir konum hizmeti algılamıyor. Cihaza bağlı olarak, bu durum güvenilmeyen wifi özelliğinin wifi adını okumasını engelleyebilir. Yine de devam etmek istiyor musunuz?</string>
     <string name="auto_tunnel_title">Otomatik Tünel Hizmeti</string>
     <string name="delete_tunnel">Tüneli sil</string>
     <string name="delete_tunnel_message">Bu tüneli silmek istediğinizden emin misiniz?</string>
@@ -124,37 +123,58 @@
     <string name="paused">duraklatıldı</string>
     <string name="active">aktif</string>
     <string name="tunneling_apps">Tünellenen uygulamalar</string>
-    <string name="included">dahil edildi</string>
-    <string name="excluded">hariç tutuldu</string>
+    <string name="included">dahil</string>
+    <string name="excluded">hariç</string>
     <string name="all">tümü</string>
-    <string name="always_on_disabled">Her zaman açık VPN bir tünel başlatmaya çalıştı, ancak bu özellik ayarlarda devre dışı bırakıldı.</string>
+    <string name="always_on_disabled">Her Zaman Açık VPN bir tüneli başlatmaya çalıştı, ancak bu özellik ayarlarda devre dışı bırakılmış.</string>
     <string name="no_email_detected">E-posta uygulaması algılanmadı</string>
     <string name="no_browser_detected">Tarayıcı algılanmadı</string>
-    <string name="logs_saved">İndirilenlere kaydedilen günlükler</string>
-    <string name="open_issue">Bir sorun bildir</string>
+    <string name="logs_saved">Günlükler indirilenler klasörüne kaydedildi</string>
+    <string name="open_issue">Sorun bildir</string>
     <string name="read_logs">Günlükleri oku</string>
-    <string name="auto">(Otomatik)</string>
-    <string name="config_parse_error">Yapılandırma kaydedilemedi</string>
-    <string name="incorrect_pin">PIN kodu yanlış</string>
-    <string name="pin_created">Pin başarıyla oluşturuldu</string>
-    <string name="enter_pin">PIN kodunuzu girin</string>
-    <string name="create_pin">PIN kodu oluştur</string>
+    <string name="auto">(otomatik)</string>
+    <string name="config_parse_error">Yapılandırma ayrıştırılamadı</string>
+    <string name="incorrect_pin">PIN yanlış</string>
+    <string name="pin_created">PIN başarıyla oluşturuldu</string>
+    <string name="enter_pin">PIN\'inizi girin</string>
+    <string name="create_pin">PIN oluştur</string>
     <string name="enable_app_lock">Uygulama kilidini etkinleştir</string>
     <string name="restart_on_ping">Ping başarısız olduğunda yeniden başlat (beta)</string>
     <string name="mobile_data_tunnel">Mobil veri tüneli olarak ayarla</string>
     <string name="set_primary_tunnel">Birincil tünel olarak ayarla</string>
-    <string name="use_tunnel_on_wifi_name">Wi-Fi adında tünel kullan</string>
-    <string name="no_wifi_names_configured">Bu tünel için yapılandırılmış Wi-Fi adı yok</string>
+    <string name="use_tunnel_on_wifi_name">Wifi adında tünel kullan</string>
+    <string name="no_wifi_names_configured">Bu tünel için yapılandırılmış wifi adı yok</string>
     <string name="general">Genel</string>
     <string name="edit_tunnel">Tüneli düzenle</string>
-    <string name="disabled">Devre dışı</string>
-    <string name="auto_on">Otomatik ayarlamayı sürdür</string>
-    <string name="auto_off">Otomatik ayarlamayı duraklat</string>
-    <string name="auto_tun_on">Otomatik tüneli sürdür</string>
+    <string name="disabled">devre dışı</string>
+    <string name="auto_on">Otomatik tüneli devam ettir</string>
+    <string name="auto_off">Otomatik tüneli duraklat</string>
+    <string name="auto_tun_on">Otomatik tüneli devam ettir</string>
     <string name="auto_tun_off">Otomatik tüneli duraklat</string>
     <string name="version">Sürüm</string>
     <string name="mode">Mod</string>
     <string name="userspace">Kullanıcı alanı</string>
     <string name="settings">Ayarlar</string>
     <string name="support">Destek</string>
-</resources>
+    <string name="backend">Arka uç</string>
+    <string name="kernel">Çekirdek</string>
+    <string name="use_amnezia">"Amnezia kullanıcı alanını kullan "</string>
+    <string name="junk_packet_count">Gereksiz paket sayısı</string>
+    <string name="junk_packet_minimum_size">Gereksiz paket minimum boyutu</string>
+    <string name="junk_packet_maximum_size">Gereksiz paket maksimum boyutu</string>
+    <string name="init_packet_junk_size">Başlatma paketi gereksiz boyutu</string>
+    <string name="response_packet_junk_size">Yanıt paketi gereksiz boyutu</string>
+    <string name="init_packet_magic_header">Başlatma paketi sihirli başlığı</string>
+    <string name="response_packet_magic_header">Yanıt paketi sihirli başlığı</string>
+    <string name="transport_packet_magic_header">Taşıma paketi sihirli başlığı</string>
+    <string name="underload_packet_magic_header">Düşük yük paketi sihirli başlığı</string>
+    <string name="telegram_url" translatable="false">https://t.me/wgtunnel</string>
+    <string name="unsure_how">nasıl devam edeceğinizden emin değilseniz</string>
+    <string name="see_the">Bakın:</string>
+    <string name="getting_started_url" translatable="false">https://zaneschepke.com/wgtunnel-docs/getting-started.html</string>
+    <string name="getting_started_guide">başlangıç kılavuzu</string>
+    <string name="amnezia" translatable="false">Amnezia</string>
+    <string name="wireguard" translatable="false">WireGuard</string>
+    <string name="error_file_format">Geçersiz tünel yapılandırma formatı</string>
+    <string name="restart_at_boot">Önyüklemede yeniden başlat</string>
+</resources>

build.gradle.kts

@@ -5,4 +5,5 @@ plugins {
     alias(libs.plugins.kotlinxSerialization) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.androidLibrary) apply false
+    alias(libs.plugins.compose.compiler) apply false
 }

buildSrc/src/main/kotlin/BuildHelper.kt

@@ -1,47 +0,0 @@
-import org.gradle.api.invocation.Gradle
-import java.io.File
-
-object BuildHelper {
-    private fun getCurrentFlavor(gradle: Gradle): String {
-        val taskRequestsStr = gradle.startParameter.taskRequests.toString()
-        val pattern: java.util.regex.Pattern =
-            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 =
-            if (matcher.find()) {
-                matcher.group(1).lowercase()
-            } else {
-                print("NO FLAVOR FOUND")
-                ""
-            }
-        return flavor
-    }
-
-    fun getLocalProperty(key: String, file: String = "local.properties"): String? {
-        val properties = java.util.Properties()
-        val localProperties = File(file)
-        if (localProperties.isFile) {
-            java.io.InputStreamReader(java.io.FileInputStream(localProperties), Charsets.UTF_8)
-                .use { reader ->
-                    properties.load(reader)
-                }
-        } else return null
-        return properties.getProperty(key)
-    }
-
-    fun isGeneralFlavor(gradle: Gradle): Boolean {
-        return getCurrentFlavor(gradle) == "general"
-    }
-
-    fun isReleaseBuild(gradle: Gradle): Boolean {
-        return (gradle.startParameter.taskNames.size > 0 &&
-            gradle.startParameter.taskNames[0].contains(
-                "Release",
-            ))
-    }
-}

buildSrc/src/main/kotlin/Constants.kt

@@ -1,13 +1,11 @@
 object Constants {
-    const val VERSION_NAME = "3.4.7"
+    const val VERSION_NAME = "3.4.8"
     const val JVM_TARGET = "17"
-    const val VERSION_CODE = 34700
+    const val VERSION_CODE = 34800
     const val TARGET_SDK = 34
     const val MIN_SDK = 26
     const val APP_ID = "com.zaneschepke.wireguardautotunnel"
     const val APP_NAME = "wgtunnel"
-    const val COMPOSE_COMPILER_EXTENSION_VERSION = "1.5.14"
-
 
     const val STORE_PASS_VAR = "SIGNING_STORE_PASSWORD"
     const val KEY_ALIAS_VAR = "SIGNING_KEY_ALIAS"
@@ -15,5 +13,9 @@ object Constants {
     const val KEY_STORE_PATH_VAR = "KEY_STORE_PATH"
 
     const val RELEASE = "release"
+    const val NIGHTLY = "nightly"
+    const val DEBUG = "debug"
     const val TYPE = "type"
+
+    const val NIGHTLY_CODE = 42
 }

buildSrc/src/main/kotlin/Extensions.kt

@@ -0,0 +1,75 @@
+import org.gradle.api.Project
+import org.gradle.api.invocation.Gradle
+import java.io.File
+import java.util.Properties
+
+private fun getCurrentFlavor(gradle: Gradle): String {
+    val taskRequestsStr = gradle.startParameter.taskRequests.toString()
+    val pattern: java.util.regex.Pattern =
+        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 =
+        if (matcher.find()) {
+            matcher.group(1).lowercase()
+        } else {
+            print("NO FLAVOR FOUND")
+            ""
+        }
+    return flavor
+}
+
+fun getLocalProperty(key: String, file: String = "local.properties"): String? {
+    val properties = java.util.Properties()
+    val localProperties = File(file)
+    if (localProperties.isFile) {
+        java.io.InputStreamReader(java.io.FileInputStream(localProperties), Charsets.UTF_8)
+            .use { reader ->
+                properties.load(reader)
+            }
+    } else return null
+    return properties.getProperty(key)
+}
+
+fun Project.isGeneralFlavor(gradle: Gradle): Boolean {
+    return getCurrentFlavor(gradle) == "general"
+}
+
+
+fun Project.getSigningProperties() : Properties {
+    return Properties().apply {
+        // created local file for signing details
+        try {
+            load(file("signing.properties").reader())
+        } catch (_: Exception) {
+            load(file("signing_template.properties").reader())
+        }
+    }
+}
+
+fun Project.getStoreFile() : File {
+    return file(
+        System.getenv()
+            .getOrDefault(
+                Constants.KEY_STORE_PATH_VAR,
+                getSigningProperties().getProperty(Constants.KEY_STORE_PATH_VAR),
+            ),
+    )
+}
+
+fun Project.getSigningProperty(property: String) : String {
+    // try to get secrets from env first for pipeline build, then properties file for local
+    return System.getenv()
+        .getOrDefault(
+            property,
+            getSigningProperties().getProperty(property),
+        )
+}
+
+
+
+

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

@@ -0,0 +1,5 @@
+What's new:
+- Fixes for AndroidTV UI tunnel control
+- Fixes portrait lock bug
+- Fixes pin lock bypass bug
+- Fixes auto tunnel tile bug

gradle/libs.versions.toml

@@ -1,20 +1,20 @@
 [versions]
 accompanist = "0.34.0"
-activityCompose = "1.9.0"
+activityCompose = "1.9.1"
 amneziawgAndroid = "1.2.0"
-androidx-junit = "1.1.5"
+androidx-junit = "1.2.1"
 appcompat = "1.7.0"
-biometricKtx = "1.2.0-alpha05"
+biometricKtx = "1.4.0-alpha01"
 coreGoogleShortcuts = "1.1.0"
 coreKtx = "1.13.1"
 datastorePreferences = "1.1.1"
 desugar_jdk_libs = "2.0.4"
-espressoCore = "3.5.1"
+espressoCore = "3.6.1"
 hiltAndroid = "2.51.1"
 hiltNavigationCompose = "1.2.0"
 junit = "4.13.2"
-kotlinx-serialization-json = "1.6.3"
-lifecycle-runtime-compose = "2.7.0"
+kotlinx-serialization-json = "1.7.1"
+lifecycle-runtime-compose = "2.8.4"
 material3 = "1.2.1"
 multifabVersion = "1.1.0"
 navigationCompose = "2.7.7"
@@ -22,16 +22,16 @@ pinLockCompose = "1.0.3"
 roomVersion = "2.6.1"
 timber = "5.0.1"
 tunnel = "1.0.20230706"
-androidGradlePlugin = "8.5.0"
-kotlin = "1.9.24"
-ksp = "1.9.24-1.0.20"
+androidGradlePlugin = "8.5.1"
+kotlin = "2.0.0"
+ksp = "2.0.0-1.0.23"
 composeBom = "2024.06.00"
 compose = "1.6.8"
 zxingAndroidEmbedded = "4.3.0"
 coreSplashscreen = "1.0.1"
+gradlePlugins-grgit="5.2.2"
 
 #plugins
-gradlePlugins-kotlinxSerialization = "1.9.24"
 material = "1.12.0"
 
 
@@ -98,5 +98,7 @@ android-application = { id = "com.android.application", version.ref = "androidGr
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hiltAndroid" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
-kotlinxSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "gradlePlugins-kotlinxSerialization" }
-androidLibrary = { id = "com.android.library", version.ref = "androidGradlePlugin" }
+kotlinxSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+androidLibrary = { id = "com.android.library", version.ref = "androidGradlePlugin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+grgit = { id = "org.ajoberstar.grgit.service", version.ref = "gradlePlugins-grgit" }

logcatter/build.gradle.kts

@@ -22,13 +22,17 @@ android {
                 "proguard-rules.pro",
             )
         }
+
+        create("nightly") {
+            initWith(getByName("release"))
+        }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = Constants.JVM_TARGET
     }
 }