From 1235363465b824d26129d4aa74a4445f362c1a73 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Sat, 25 Apr 2020 03:47:44 +0300
Subject: [PATCH] Fix Wekan not load at all in Firefox v.68 for Android.

Thanks to xet7 !

Closes #3021
---
 Dockerfile                       | 2 ++
 rebuild-wekan.bat                | 3 +++
 rebuild-wekan.sh                 | 2 ++
 releases/rebuild-release.sh      | 2 ++
 snapcraft.yaml                   | 2 ++
 stacksmith/user-scripts/build.sh | 2 ++
 6 files changed, 13 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index b656c8005..8b95dc844 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -271,6 +271,8 @@ RUN \
     cd /home/wekan/app_build/bundle/programs/server/ && \
     gosu wekan:wekan npm install && \
     #gosu wekan:wekan npm install bcrypt && \
+    # Remove legacy webbroser bundle, so that Wekan works also at Android Firefox, iOS Safari, etc.
+		rm -rf /home/wekan/app_build/bundle/programs/web.browser.legacy && \
     mv /home/wekan/app_build/bundle /build && \
     \
     # Put back the original tar
diff --git a/rebuild-wekan.bat b/rebuild-wekan.bat
index 232629cef..1c38293f6 100644
--- a/rebuild-wekan.bat
+++ b/rebuild-wekan.bat
@@ -53,6 +53,9 @@ call meteor npm install
 REM del /S /F /Q .build
 call meteor build .build --directory
 copy fix-download-unicode\cfs_access-point.txt .build\bundle\programs\server\packages\cfs_access-point.js
+REM ## Remove legacy webbroser bundle, so that Wekan works also at Android Firefox, iOS Safari, etc.
+del /S /F /Q rm .build/bundle/programs/web.browser.legacy
+REM ## Install some NPM packages
 cd .build\bundle\programs\server
 call meteor npm install
 REM cd C:\repos\wekan\.meteor\local\build\programs\server
diff --git a/rebuild-wekan.sh b/rebuild-wekan.sh
index 61c19928e..5b9215744 100755
--- a/rebuild-wekan.sh
+++ b/rebuild-wekan.sh
@@ -148,6 +148,8 @@ do
 		rm -rf .build
 		meteor build .build --directory
 		cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js
+    # Remove legacy webbroser bundle, so that Wekan works also at Android Firefox, iOS Safari, etc.
+		rm -rf .build/bundle/programs/web.browser.legacy
 		#Removed binary version of bcrypt because of security vulnerability that is not fixed yet.
 		#https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac
 		#https://github.com/wekan/wekan/commit/7eeabf14be3c63fae2226e561ef8a0c1390c8d3c
diff --git a/releases/rebuild-release.sh b/releases/rebuild-release.sh
index f39648852..02b862d0e 100755
--- a/releases/rebuild-release.sh
+++ b/releases/rebuild-release.sh
@@ -11,6 +11,8 @@ meteor npm install
 rm -rf .build
 METEOR_PROFILE=100 meteor build .build --directory
 cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js
+# Remove legacy webbroser bundle, so that Wekan works also at Android Firefox, iOS Safari, etc.
+rm -rf .build/bundle/programs/web.browser.legacy
 cd .build/bundle/programs/server
 rm -rf node_modules
 meteor npm install
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 940bb378c..689d150ce 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -216,6 +216,8 @@ parts:
             #meteor npm install --save bcrypt
             # Change from npm-bcrypt directory back to .build/bundle/programs/server directory.
             #cd ../../../../
+            # Remove legacy webbroser bundle, so that Wekan works also at Android Firefox, iOS Safari, etc.
+            rm -rf .build/bundle/programs/web.browser.legacy
             # Change to directory .build/bundle/programs/server
             cd .build/bundle/programs/server
             npm install
diff --git a/stacksmith/user-scripts/build.sh b/stacksmith/user-scripts/build.sh
index 22b88dc98..16befc435 100755
--- a/stacksmith/user-scripts/build.sh
+++ b/stacksmith/user-scripts/build.sh
@@ -75,6 +75,8 @@ sudo -u wekan ${meteor} build --directory /home/wekan/app_build
 sudo cp /home/wekan/app/fix-download-unicode/cfs_access-point.txt /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js
 sudo chown wekan:wekan /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js
 sudo rm /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs
+# Remove legacy webbroser bundle, so that Wekan works also at Android Firefox, iOS Safari, etc.
+rm -rf /home/wekan/app_build/bundle/programs/web.browser.legacy
 cd /home/wekan/app_build/bundle/programs/server/
 sudo npm install
 sudo chown -R wekan:wekan ./node_modules