fix: trusted SSIDs bug

Fixes bugs where trusted SSIDs were getting whitespace added every time they were saved to the DB. Fixes file explorer bug on AndroidTV where the app crashes if they do not have a file explorer installed on the device.
zaneschepke · Sep 25, 2023 · 11aea3f · 11aea3f
1 parent 7fbc51a
commit 11aea3f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -14,8 +14,8 @@ android {
         applicationId = "com.zaneschepke.wireguardautotunnel"
         minSdk = 26
         targetSdk = 34
-        versionCode = 30001
-        versionName = "3.0.1"
+        versionCode = 30002
+        versionName = "3.0.2"
 
         multiDexEnabled = true
 

diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/repository/DatabaseListConverters.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/repository/DatabaseListConverters.kt
@@ -5,7 +5,7 @@ import androidx.room.TypeConverter
 class DatabaseListConverters {
     @TypeConverter
     fun listToString(value: MutableList<String>): String {
-        return value.joinToString()
+        return value.joinToString(",")
     }
     @TypeConverter
     fun <T> stringToList(value: String): MutableList<String> {

diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/MainScreen.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/MainScreen.kt
@@ -214,7 +214,11 @@ fun MainScreen(
                                 addCategory(Intent.CATEGORY_OPENABLE)
                                 type = Constants.ALLOWED_FILE_TYPES
                             }
-                            pickFileLauncher.launch(fileSelectionIntent)
+                            if (fileSelectionIntent.resolveActivity(context.packageManager) != null) {
+                                pickFileLauncher.launch(fileSelectionIntent)
+                            } else {
+                                viewModel.showSnackBarMessage(context.getString(R.string.no_file_app))
+                            }
                         }
                         .padding(10.dp)
                 ) {
@@ -271,7 +275,7 @@ fun MainScreen(
                     .nestedScroll(nestedScrollConnection),
             ) {
                 items(tunnels, key = { tunnel -> tunnel.id }) {tunnel ->
-                    val focusRequester = FocusRequester()
+                    val focusRequester = remember { FocusRequester() }
                     RowListItem(leadingIcon = Icons.Rounded.Circle,
                         leadingIconColor = if (tunnelName == tunnel.name) when (handshakeStatus) {
                             HandshakeStatus.HEALTHY -> mint

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -96,4 +96,5 @@
     <string name="never">Never</string>
     <string name="stream_failed">Failed to open file stream.</string>
     <string name="unknown_error_message">An unknown error occurred.</string>
+    <string name="no_file_app">No file app installed.</string>
 </resources>