Merge branch 'release/5.5.2' into main

Author: rafakob

app/build.gradle.kts

@@ -15,8 +15,8 @@ android {
 
     defaultConfig {
         applicationId = "com.twofasapp"
-        versionName = "5.5.1"
-        versionCode = 5000032
+        versionName = "5.5.2"
+        versionCode = 5000033
     }
 
     applicationVariants.all {

app/src/main/AndroidManifest.xml

@@ -20,6 +20,10 @@
         android:name="android.hardware.camera.autofocus"
         android:required="false" />
 
+    <queries>
+        <package android:name="com.twofasapp.pass" />
+    </queries>
+
     <application
         android:name="com.twofasapp.App"
         android:allowBackup="false"

app/src/main/java/com/twofasapp/legacy/objectbox/converters/ServiceTypeConverter.kt

@@ -11,13 +11,13 @@ class ServiceTypeConverter : PropertyConverter<com.twofasapp.prefs.model.Service
 
         try {
             return com.twofasapp.prefs.model.ServiceType.values()
-                .firstOrNull { it.name.toLowerCase(Locale.ROOT) == databaseValue }
+                .firstOrNull { it.name.lowercase(Locale.ROOT) == databaseValue }
                 ?: com.twofasapp.prefs.model.ServiceType.Unknown
         } catch (e: Exception) {
             return com.twofasapp.prefs.model.ServiceType.Unknown
         }
     }
 
     override fun convertToDatabaseValue(entityProperty: com.twofasapp.prefs.model.ServiceType) =
-        entityProperty.name.toLowerCase(Locale.ROOT)
+        entityProperty.name.lowercase(Locale.ROOT)
 }

app/src/main/java/com/twofasapp/legacy/objectbox/converters/SyncStatusConverter.kt

@@ -7,12 +7,12 @@ import java.util.Locale
 class SyncStatusConverter : PropertyConverter<SyncStatus, String> {
     override fun convertToEntityProperty(databaseValue: String): SyncStatus {
         try {
-            return SyncStatus.valueOf(databaseValue.toUpperCase(Locale.ROOT))
+            return SyncStatus.valueOf(databaseValue.uppercase(Locale.ROOT))
         } catch (e: IllegalArgumentException) {
             return SyncStatus.SYNCED
         }
     }
 
     override fun convertToDatabaseValue(entityProperty: SyncStatus) =
-        entityProperty.name.toLowerCase(Locale.ROOT)
+        entityProperty.name.lowercase(Locale.ROOT)
 }

app/src/main/java/com/twofasapp/ui/main/MainViewModel.kt

@@ -50,7 +50,12 @@ internal class MainViewModel(
         }
 
         launchScoped {
-            runSafely { notificationsRepository.fetchNotifications(sessionRepository.getAppInstallTimestamp()) }
+            runSafely {
+                notificationsRepository.fetchNotifications(
+                    appInstallTimeMillis = sessionRepository.getAppInstallTimestamp(),
+                    noCompanionAppFromTimeMillis = sessionRepository.noCompanionAppFromTimestamp(),
+                )
+            }
         }
 
         launchScoped {

app/src/main/java/com/twofasapp/workmanager/OnAppStartWork.kt

@@ -155,9 +155,7 @@ class OnAppStartWork(
             category = category,
             link = link,
             message = message,
-            publishTime = Instant.now().toEpochMilli(),
-            push = false,
-            platform = "android",
+            createdAt = Instant.now().toEpochMilli(),
             isRead = false,
             internalRoute = internalRoute,
         )

build.gradle.kts

@@ -1,14 +1,12 @@
 buildscript {
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.versions.kotlin.get()}")
-        classpath("org.jetbrains.kotlin:kotlin-serialization:${libs.versions.kotlin.get()}")
-        classpath("com.google.gms:google-services:4.4.0")
-        classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.9")
+        classpath("com.google.gms:google-services:4.4.4")
+        classpath("com.google.firebase:firebase-crashlytics-gradle:3.0.6")
 
     }
 }
 
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.agpApplication) apply false
     alias(libs.plugins.agpLibrary) apply false

buildlogic/src/main/java/com/twofasapp/buildlogic/extension/KotlinAndroid.kt

@@ -2,13 +2,14 @@ package com.twofasapp.buildlogic.extension
 
 import com.android.build.api.dsl.CommonExtension
 import com.twofasapp.buildlogic.version.AppConfig
-import com.twofasapp.buildlogic.version.AppConfig.compileSdk
-import com.twofasapp.buildlogic.version.AppConfig.minSdk
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
-import org.gradle.api.plugins.ExtensionAware
+import org.gradle.api.tasks.testing.Test
+import org.gradle.kotlin.dsl.assign
 import org.gradle.kotlin.dsl.dependencies
-import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 internal fun Project.applyKotlinAndroid(
     commonExtension: CommonExtension<*, *, *, *, *, *>,
@@ -34,35 +35,21 @@ internal fun Project.applyKotlinAndroid(
         }
 
         buildFeatures {
-            viewBinding = true
             buildConfig = true
         }
 
-        kotlinOptions {
-            jvmTarget = "17"
-
-            freeCompilerArgs = freeCompilerArgs + listOf(
-                "-opt-in=kotlin.RequiresOptIn",
-                // Enable experimental coroutines APIs, including Flow
-                "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-                "-opt-in=kotlinx.coroutines.FlowPreview",
-                "-opt-in=kotlin.Experimental",
-                "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
-                "-opt-in=androidx.lifecycle.compose.ExperimentalLifecycleComposeApi",
-                "-P",
-                "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true",
-            )
-        }
-
         packaging {
             resources {
                 excludes += "META-INF/DEPENDENCIES"
                 excludes += "META-INF/LICENSE"
+                excludes += "META-INF/LICENSE.md"
+                excludes += "META-INF/LICENSE-notice.md"
                 excludes += "META-INF/LICENSE.txt"
                 excludes += "META-INF/license.txt"
                 excludes += "META-INF/NOTICE"
                 excludes += "META-INF/NOTICE.txt"
                 excludes += "META-INF/notice.txt"
+                excludes += "META-INF/ASL2.0"
                 excludes += "META-INF/INDEX.LIST"
                 excludes += "/META-INF/{AL2.0,LGPL2.1}"
             }
@@ -73,13 +60,32 @@ internal fun Project.applyKotlinAndroid(
                 isIncludeAndroidResources = true
             }
         }
+
+        tasks.withType<Test>().configureEach {
+            failOnNoDiscoveredTests = false
+        }
+
+        configureKotlin()
     }
 
     dependencies {
         add("coreLibraryDesugaring", libs.findLibrary("desugar").get())
     }
 }
 
-internal fun CommonExtension<*, *, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
-    (this as ExtensionAware).extensions.configure("kotlinOptions", block)
-}
+private fun Project.configureKotlin() {
+    tasks.withType<KotlinCompile>().configureEach {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+
+            freeCompilerArgs.addAll(
+                "-opt-in=kotlin.RequiresOptIn",
+                "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+                "-opt-in=kotlinx.coroutines.FlowPreview",
+                "-opt-in=kotlin.Experimental",
+                "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
+                "-opt-in=androidx.lifecycle.compose.ExperimentalLifecycleComposeApi",
+            )
+        }
+    }
+}

buildlogic/src/main/java/com/twofasapp/buildlogic/version/AppConfig.kt

@@ -2,6 +2,6 @@ package com.twofasapp.buildlogic.version
 
 object AppConfig {
     const val minSdk = 23
-    const val targetSdk = 35
-    const val compileSdk = 35
+    const val targetSdk = 36
+    const val compileSdk = 36
 }

core/designsystem/src/main/java/com/twofasapp/designsystem/common/NavigationBar.kt

@@ -24,6 +24,7 @@ fun TwNavigationBar(
         tonalElevation = 0.dp,
         modifier = modifier,
         content = content,
+        containerColor = TwTheme.color.surface,
     )
 }