Merge branch 'master' into remote-desktop

2026-05-12 06:34:59 +00:00 · 2023-11-13 14:07:31 +00:00
parent 72b25385ba 338417d963
commit 86bc70fa5a
7 changed files with 43 additions and 11 deletions
@@ -214,7 +214,13 @@ fun rememberSaveFileLauncher(ciFile: CIFile?): FileChooserLauncher =
    if (filePath != null && to != null) {
      if (ciFile?.fileSource?.cryptoArgs != null) {
        createTmpFileAndDelete { tmpFile ->
-          decryptCryptoFile(filePath, ciFile.fileSource.cryptoArgs, tmpFile.absolutePath)
+          try {
+            decryptCryptoFile(filePath, ciFile.fileSource.cryptoArgs, tmpFile.absolutePath)
+          } catch (e: Exception) {
+            Log.e(TAG, "Unable to decrypt crypto file: " + e.stackTraceToString())
+            tmpFile.delete()
+            return@createTmpFileAndDelete
+          }
          copyFileToFile(tmpFile, to) {}
          tmpFile.delete()
        }