From fc69f3b8f3a538e5b8d89c197081a28f6e501b4f Mon Sep 17 00:00:00 2001
From: Sylvain Pasche <sylvain.pasche@gmail.com>
Date: Sun, 18 Sep 2022 18:14:25 +0200
Subject: [PATCH 1/2] let import continue when malformed URLs are encountered

In case of malformed URLs in imported HTML, keep original URL instead
of having the import get stuck.
---
 src/services/import/zip.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/services/import/zip.js b/src/services/import/zip.js
index 09639c3b1..e182126c1 100644
--- a/src/services/import/zip.js
+++ b/src/services/import/zip.js
@@ -292,7 +292,12 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
             content = content.replace(/<\/body>.*<\/html>/gis, "");
 
             content = content.replace(/src="([^"]*)"/g, (match, url) => {
-                url = decodeURIComponent(url);
+                try {
+                    url = decodeURIComponent(url);
+                } catch (e) {
+                    log.error(`Cannot parse image URL '${url}', keeping original (${e}).`);
+                    return `src="${url}"`;
+                }
 
                 if (isUrlAbsolute(url) || url.startsWith("/")) {
                     return match;
@@ -304,7 +309,12 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
             });
 
             content = content.replace(/href="([^"]*)"/g, (match, url) => {
-                url = decodeURIComponent(url);
+                try {
+                    url = decodeURIComponent(url);
+                } catch (e) {
+                    log.error(`Cannot parse link URL '${url}', keeping original (${e}).`);
+                    return `href="${url}"`;
+                }
 
                 if (isUrlAbsolute(url)) {
                     return match;

From 1f61c1b3b674d1bc7fbded462bd4432c18bcdbfa Mon Sep 17 00:00:00 2001
From: Charles Dagenais <dagenais.charles@gmail.com>
Date: Sun, 18 Sep 2022 12:40:00 -0400
Subject: [PATCH 2/2] add file properties info in mobile view

---
 src/public/app/layouts/mobile_layout.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/public/app/layouts/mobile_layout.js b/src/public/app/layouts/mobile_layout.js
index 4ef2a8d83..a6199e286 100644
--- a/src/public/app/layouts/mobile_layout.js
+++ b/src/public/app/layouts/mobile_layout.js
@@ -10,6 +10,7 @@ import ScreenContainer from "../widgets/mobile_widgets/screen_container.js";
 import ScrollingContainer from "../widgets/containers/scrolling_container.js";
 import ProtectedSessionPasswordDialog from "../widgets/dialogs/protected_session_password.js";
 import ConfirmDialog from "../widgets/dialogs/confirm.js";
+import FilePropertiesWidget from "../widgets/ribbon_widgets/file_properties.js";
 
 const MOBILE_CSS = `
 <style>
@@ -128,7 +129,7 @@ export default class MobileLayout {
                         .child(
                             new NoteDetailWidget()
                                 .css('padding', '5px 20px 10px 0')
-                        )
+                        ).child(new FilePropertiesWidget().css('font-size','smaller'))
                 )
             )
             .child(new ProtectedSessionPasswordDialog())