From c9c19d043f51977afae8077c00e9492090c12dcd Mon Sep 17 00:00:00 2001
From: Bernhard <34011017+Colfenor@users.noreply.github.com>
Date: Wed, 24 Feb 2021 01:16:29 +0100
Subject: [PATCH] KeeShare: Default to unsigned container unless specifically
 chosen

*Fix #6081 - Prevent assert and crash due to user entered data
---
 src/keeshare/ShareExport.cpp | 6 +-----
 src/keeshare/ShareImport.cpp | 5 +----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/keeshare/ShareExport.cpp b/src/keeshare/ShareExport.cpp
index c1797ac6..aedbc04a 100644
--- a/src/keeshare/ShareExport.cpp
+++ b/src/keeshare/ShareExport.cpp
@@ -224,9 +224,5 @@ ShareObserver::Result ShareExport::intoContainer(const QString& resolvedPath,
     if (KeeShare::isContainerType(info, KeeShare::signedContainerFileType())) {
         return intoSignedContainer(resolvedPath, reference, targetDb.data());
     }
-    if (KeeShare::isContainerType(info, KeeShare::unsignedContainerFileType())) {
-        return intoUnsignedContainer(resolvedPath, reference, targetDb.data());
-    }
-    Q_ASSERT(false);
-    return {reference.path, ShareObserver::Result::Error, tr("Unexpected export error occurred")};
+    return intoUnsignedContainer(resolvedPath, reference, targetDb.data());
 }
diff --git a/src/keeshare/ShareImport.cpp b/src/keeshare/ShareImport.cpp
index a767ab3a..38a477aa 100644
--- a/src/keeshare/ShareImport.cpp
+++ b/src/keeshare/ShareImport.cpp
@@ -344,8 +344,5 @@ ShareObserver::Result ShareImport::containerInto(const QString& resolvedPath,
     if (KeeShare::isContainerType(info, KeeShare::signedContainerFileType())) {
         return signedContainerInto(resolvedPath, reference, targetGroup);
     }
-    if (KeeShare::isContainerType(info, KeeShare::unsignedContainerFileType())) {
-        return unsignedContainerInto(resolvedPath, reference, targetGroup);
-    }
-    return {reference.path, ShareObserver::Result::Error, tr("Unknown share container type")};
+    return unsignedContainerInto(resolvedPath, reference, targetGroup);
 }