From 9b2d4a3fb508a8d14f80a9b2b8c97d8848017248 Mon Sep 17 00:00:00 2001 From: Zane Schepke Date: Thu, 17 Apr 2025 05:02:43 -0400 Subject: [PATCH] build: fix release building --- app/build.gradle.kts | 2 +- .../wireguardautotunnel/core/broadcast/RestartReceiver.kt | 2 +- .../com/zaneschepke/wireguardautotunnel/di/RepositoryModule.kt | 2 +- .../java/com/zaneschepke/wireguardautotunnel/ui/theme/Theme.kt | 1 + app/src/main/res/values-de/strings.xml | 1 - .../src/main/java/com/zaneschepke/logcatter/LogcatManager.kt | 1 + 6 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6fabc0b1..b644dd1b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -84,7 +84,7 @@ android { getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro", ) - signingConfig = signingConfigs.getByName(Constants.RELEASE) + signingConfig = signingConfigs.getByName("debug") resValue("string", "provider", "\"${Constants.APP_NAME}.provider\"") } debug { diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/core/broadcast/RestartReceiver.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/core/broadcast/RestartReceiver.kt index b3321e4e..7229289f 100644 --- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/core/broadcast/RestartReceiver.kt +++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/core/broadcast/RestartReceiver.kt @@ -31,7 +31,7 @@ class RestartReceiver : BroadcastReceiver() { 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 - if(intent.action == Intent.ACTION_SCREEN_ON && !context.isRunningOnTv()) return + if (intent.action == Intent.ACTION_SCREEN_ON && !context.isRunningOnTv()) return serviceManager.updateTunnelTile() serviceManager.updateAutoTunnelTile() applicationScope.launch(ioDispatcher) { diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/di/RepositoryModule.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/di/RepositoryModule.kt index faf7eabe..9dfdc69c 100644 --- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/di/RepositoryModule.kt +++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/di/RepositoryModule.kt @@ -35,7 +35,7 @@ class RepositoryModule { AppDatabase::class.java, context.getString(R.string.db_name), ) - .fallbackToDestructiveMigration() + .fallbackToDestructiveMigration(true) .addCallback(DatabaseCallback()) .build() } diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/theme/Theme.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/theme/Theme.kt index 9482359a..e0dca72d 100644 --- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/theme/Theme.kt +++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/theme/Theme.kt @@ -78,6 +78,7 @@ fun WireguardAutoTunnelTheme(theme: Theme = Theme.AUTOMATIC, content: @Composabl val view = LocalView.current if (!view.isInEditMode) { + @Suppress("DEPRECATION") SideEffect { val window = (view.context as Activity).window WindowCompat.setDecorFitsSystemWindows(window, false) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 29677cf4..661ea1ea 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -32,7 +32,6 @@ Name Always-On VPN erlauben Standortdienste nicht erkannt - Pakete suchen VPN an VPN aus Von Grund auf neu erstellen diff --git a/logcatter/src/main/java/com/zaneschepke/logcatter/LogcatManager.kt b/logcatter/src/main/java/com/zaneschepke/logcatter/LogcatManager.kt index 172f51dd..81e7a1d6 100644 --- a/logcatter/src/main/java/com/zaneschepke/logcatter/LogcatManager.kt +++ b/logcatter/src/main/java/com/zaneschepke/logcatter/LogcatManager.kt @@ -57,6 +57,7 @@ class LogcatManager(pid: Int, logDir: String, maxFileSize: Long, maxFolderSize: isStarted = true } + @OptIn(ExperimentalCoroutinesApi::class) override fun stop() { if (!isStarted) return logJob?.cancel()