fix no error were displayed if importing an invalid certificate was r…

…ejected
sunny-chung · Dec 17, 2023 · 3f610bf · 3f610bf
1 parent 882e585
commit 3f610bf
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/...nnychung/application/multiplatform/hellohttp/ux/SubprojectEnvironmentsEditorDialogView.kt b/...nnychung/application/multiplatform/hellohttp/ux/SubprojectEnvironmentsEditorDialogView.kt
@@ -439,8 +439,13 @@ fun CertificateEditorView(
      */
     fun parseAndAddCertificate(path: String) {
         val file = File(path)
-        val content = file.readBytes()
-        val cert: X509Certificate = CertificateFactory.getInstance("X.509").generateCertificate(content.inputStream()) as X509Certificate
+        val (content, cert: X509Certificate) = try {
+            val content = file.readBytes()
+            Pair(content, CertificateFactory.getInstance("X.509").generateCertificate(content.inputStream()) as X509Certificate)
+        } catch (e: Throwable) {
+            AppContext.ErrorMessagePromptViewModel.showErrorMessage("Error while reading the certificate -- ${e.message ?: e::class.simpleName}")
+            return
+        }
         log.d { "Loaded cert ${cert}" }
 
         onAddCertificate(