Hopefully fix a crash with invalid auth types on some devices

errr-maxx-builds · Apr 16, 2024 · c294376 · c294376
1 parent be2965b
commit c294376
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/app/src/main/java/tk/zwander/wifilist/data/ExportChoice.kt b/app/src/main/java/tk/zwander/wifilist/data/ExportChoice.kt
@@ -26,8 +26,10 @@ data class ExportChoice(
 
 @Composable
 fun rememberExportChoices(configs: List<WifiConfiguration>): List<ExportChoice> {
+    val context = LocalContext.current
+
     return remember(configs.toList()) {
-        val exportItems = configs.mapToExportItems()
+        val exportItems = configs.mapToExportItems(context)
 
         listOf(
             ExportChoice(

diff --git a/app/src/main/java/tk/zwander/wifilist/util/WiFiExportGenerator.kt b/app/src/main/java/tk/zwander/wifilist/util/WiFiExportGenerator.kt
@@ -2,18 +2,19 @@
 
 package tk.zwander.wifilist.util
 
+import android.content.Context
 import android.net.wifi.WifiConfiguration
 import com.google.gson.GsonBuilder
 import de.siegmar.fastcsv.writer.CsvWriter
 import tk.zwander.wifilist.data.WiFiExportItem
 import java.io.StringWriter
 
 object WiFiExportGenerator {
-    fun Collection<WifiConfiguration>.mapToExportItems(): List<WiFiExportItem> {
+    fun Collection<WifiConfiguration>.mapToExportItems(context: Context): List<WiFiExportItem> {
         return map {
             WiFiExportItem(
                 ssid = it.printableSsid,
-                security = WifiConfiguration.KeyMgmt.strings[it.authType],
+                security = it.getSecurityType(context = context),
                 password = it.simpleKey ?: "",
             )
         }
@@ -29,10 +30,10 @@ object WiFiExportGenerator {
         val writer = StringWriter()
         val csv = CsvWriter.builder().build(writer)
 
-        csv.writeRow("SSID", "PASSWORD", "SECURITY")
+        csv.writeRecord("SSID", "PASSWORD", "SECURITY")
 
         forEach { item ->
-            csv.writeRow(item.ssid, item.password, item.security)
+            csv.writeRecord(item.ssid, item.password, item.security)
         }
 
         csv.close()