Aperture: Fix crash on malformed Wi-Fi QR code

Change-Id: I6cb36edcfa7b4b89051e9cee2d6b28f40ca2c72f

1 files changed, 9 insertions, 1 deletions

diff --git a/app/src/main/java/org/lineageos/aperture/utils/WifiNetwork.kt b/app/src/main/java/org/lineageos/aperture/utils/WifiNetwork.kt
index 0b8cbd0..d6aeb70 100644
--- a/app/src/main/java/org/lineageos/aperture/utils/WifiNetwork.kt
+++ b/app/src/main/java/org/lineageos/aperture/utils/WifiNetwork.kt
@@ -25,6 +25,12 @@ data class WifiNetwork(
         SAE;
     }
 
+    init {
+        assert((encryptionType == EncryptionType.NONE) == (password == null)) {
+            "Invalid encryption type/password combination"
+        }
+    }
+
     @RequiresApi(Build.VERSION_CODES.Q)
     fun toNetworkSuggestion(): WifiNetworkSuggestion? = when (encryptionType) {
         EncryptionType.WEP -> null
@@ -63,7 +69,9 @@ data class WifiNetwork(
                 else -> EncryptionType.NONE
             }
 
-            return WifiNetwork(result.ssid, result.isHidden, result.password, encryptionType)
+            return runCatching {
+                WifiNetwork(result.ssid, result.isHidden, result.password, encryptionType)
+            }.getOrNull()
         }
     }
 }