Merge branch 'main' into weblate-librepass-android

README.md

@@ -14,7 +14,7 @@ that their passwords will remain private and inaccessible to unauthorized indivi
 ## Install
 
 [<img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" alt="Get it on IzzyDroid" height="70" align="center">](https://android.izzysoft.de/repo/apk/dev.medzik.librepass.android)
-[<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="70" align="center">](https://f-droid.org/en/packages/dev.medzik.librepass.android)
+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="70" align="center">](https://f-droid.org/en/packages/dev.medzik.librepass.android)
 
 You can download and install .apk of LibrePass app from [releases](https://github.com/LibrePass/android/releases).
 It will be also available in Google Play Store soon.

app/build.gradle.kts

@@ -13,8 +13,8 @@ android {
         applicationId = "dev.medzik.librepass.android"
         minSdk = libs.versions.android.sdk.min.get().toInt()
         targetSdk = libs.versions.android.sdk.target.get().toInt()
-        versionCode = 13
-        versionName = "1.2.2"
+        versionCode = 15
+        versionName = "1.2.3"
 
         vectorDrawables {
             useSupportLibrary = true

app/src/main/AndroidManifest.xml

@@ -6,6 +6,8 @@
         android:required="false" />
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
     <uses-permission android:name="android.permission.CAMERA" />
 
     <application

app/src/main/java/dev/medzik/librepass/android/ui/screens/auth/Unlock.kt

@@ -111,7 +111,7 @@ fun UnlockScreen(
                 KeyStore.initForDecryption(
                     alias = KeyAlias.BiometricAesKey,
                     initializationVector = Hex.decode(credentials.biometricAesKeyIV!!),
-                    deviceAuthentication = true
+                    deviceAuthentication = false
                 ),
                 onAuthenticationSucceeded = { cipher ->
                     viewModel.vault.aesKey = KeyStore.decrypt(cipher, credentials.biometricAesKey!!)

app/src/main/java/dev/medzik/librepass/android/ui/screens/settings/SettingsSecurity.kt

@@ -71,7 +71,7 @@ fun SettingsSecurityScreen(viewModel: LibrePassViewModel = hiltViewModel()) {
             context as MainActivity,
             KeyStore.initForEncryption(
                 KeyAlias.BiometricAesKey,
-                deviceAuthentication = true
+                deviceAuthentication = false
             ),
             onAuthenticationSucceeded = { cipher ->
                 val encryptedData =

app/src/main/java/dev/medzik/librepass/android/ui/screens/vault/Vault.kt

@@ -31,6 +31,7 @@ import dev.medzik.librepass.android.ui.Screen
 import dev.medzik.librepass.android.ui.components.CipherCard
 import dev.medzik.librepass.android.utils.KeyAlias
 import dev.medzik.librepass.android.utils.checkIfBiometricAvailable
+import dev.medzik.librepass.android.utils.haveNetworkConnection
 import dev.medzik.librepass.android.utils.showBiometricPromptForSetup
 import dev.medzik.librepass.android.utils.showErrorToast
 import dev.medzik.librepass.client.Server
@@ -112,12 +113,12 @@ fun VaultScreen(
                 cipher =
                     KeyStore.initForEncryption(
                         KeyAlias.BiometricAesKey,
-                        deviceAuthentication = true
+                        deviceAuthentication = false
                     ),
                 onAuthenticationSucceeded = { cipher ->
-                    scope.launch(Dispatchers.IO) {
-                        val encryptedData = KeyStore.encrypt(cipher, viewModel.vault.aesKey)
+                    val encryptedData = KeyStore.encrypt(cipher, viewModel.vault.aesKey)
 
+                    scope.launch(Dispatchers.IO) {
                         viewModel.credentialRepository.update(
                             credentials.copy(
                                 biometricReSetup = false,
@@ -169,7 +170,9 @@ fun VaultScreen(
         ciphers = viewModel.vault.sortAlphabetically()
 
         // sync remote ciphers
-        updateCiphers()
+        if (context.haveNetworkConnection()) {
+            updateCiphers()
+        }
     }
 
     val pullRefreshState = rememberPullRefreshState(refreshing, ::updateCiphers)

app/src/main/java/dev/medzik/librepass/android/utils/Network.kt

@@ -0,0 +1,10 @@
+package dev.medzik.librepass.android.utils
+
+import android.content.Context
+import android.net.ConnectivityManager
+
+fun Context.haveNetworkConnection(): Boolean {
+    val connectivityManager = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+    val activeNetwork = connectivityManager.activeNetwork
+    return activeNetwork != null
+}

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

@@ -0,0 +1,2 @@
+* Don't run keystore encryption in coroutine
+* Don't show toast with "Network error" after app launch

gradle/libs.versions.toml

@@ -35,7 +35,7 @@ test-junit = "1.1.5"
 zxing = "3.5.2"
 zxing-android = "4.3.0"
 # Plugins
-android-application = "8.2.2"
+android-application = "8.3.0"
 kotlin-ksp = "1.9.22-1.0.17"
 kotlin-android = "1.9.22"