From 38b0702314acf28cbe8a7a07ca8342d2d5e7c616 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Fri, 18 Dec 2020 13:36:39 +0000
Subject: [PATCH] Android: Disable long press on images as it interferes with
 zoom in and out

---
 packages/app-cli/package-lock.json                            | 2 +-
 .../app-mobile/components/NoteBodyViewer/hooks/useSource.ts   | 4 +++-
 packages/lib/joplin-database.js                               | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/app-cli/package-lock.json b/packages/app-cli/package-lock.json
index 72aac8820..2e7c18a64 100644
--- a/packages/app-cli/package-lock.json
+++ b/packages/app-cli/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "joplin",
-  "version": "1.4.7",
+  "version": "1.5.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/app-mobile/components/NoteBodyViewer/hooks/useSource.ts b/packages/app-mobile/components/NoteBodyViewer/hooks/useSource.ts
index 092e1bb9b..3ff08789a 100644
--- a/packages/app-mobile/components/NoteBodyViewer/hooks/useSource.ts
+++ b/packages/app-mobile/components/NoteBodyViewer/hooks/useSource.ts
@@ -82,7 +82,9 @@ export default function useSource(noteBody: string, noteMarkupLanguage: number,
 				resources: noteResources,
 				codeTheme: theme.codeThemeCss,
 				postMessageSyntax: 'window.joplinPostMessage_',
-				enableLongPress: shim.mobilePlatform() === 'android', // On iOS, there's already a built-on open/share menu
+				// Disabled for now as it causes issues when zooming in or out
+				// https://github.com/laurent22/joplin/pull/3939#issuecomment-734260166
+				enableLongPress: false, // shim.mobilePlatform() === 'android', // On iOS, there's already a built-on open/share menu
 			};
 
 			// Whenever a resource state changes, for example when it goes from "not downloaded" to "downloaded", the "noteResources"
diff --git a/packages/lib/joplin-database.js b/packages/lib/joplin-database.js
index 63c34f956..5de19ad6b 100644
--- a/packages/lib/joplin-database.js
+++ b/packages/lib/joplin-database.js
@@ -866,7 +866,7 @@ class JoplinDatabase extends Database {
 					this.logger().warn('Could not upgrade to database v15 or v18 or v33 - FTS feature will not be used', error);
 					saveVersionAgain = true;
 				} else if (targetVersion === 34) {
-					if (!shim.isTestingEnv()) this.logger().warn('Could not upgrade to database v34 - fuzzy search will not be used', error);
+					// if (!shim.isTestingEnv()) this.logger().warn('Could not upgrade to database v34 - fuzzy search will not be used', error);
 					saveVersionAgain = true;
 				} else {
 					throw error;