Don't show toast with "Network error" after app launch

closes #102
LibrePass · Mar 2, 2024 · 7d86228 · 7d86228
1 parent 0e1fd79
commit 7d86228
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/app/src/main/AndroidManifest.xml b/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

diff --git a/app/src/main/java/dev/medzik/librepass/android/ui/screens/vault/Vault.kt b/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
@@ -169,7 +170,9 @@ fun VaultScreen(
         ciphers = viewModel.vault.sortAlphabetically()
 
         // sync remote ciphers
-        updateCiphers()
+        if (context.haveNetworkConnection()) {
+            updateCiphers()
+        }
     }
 
     val pullRefreshState = rememberPullRefreshState(refreshing, ::updateCiphers)

diff --git a/app/src/main/java/dev/medzik/librepass/android/utils/Network.kt b/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
+}