Version 1.2.18-2

4 files changed, 102 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c2deb611a7d9..8fb6a5a1c71a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = threema-desktop
 	pkgdesc = Threema Desktop (Threema Web in Electron).
 	pkgver = 1.2.18
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/threema-ch/threema-web-electron
 	arch = any
 	license = AGPL
@@ -11,8 +11,12 @@ pkgbase = threema-desktop
 	source = threema-web-electron-v1.2.18.tar.gz::https://github.com/threema-ch/threema-web-electron/archive/refs/tags/1.2.18.tar.gz
 	source = threema-web-v2.4.2.tar.gz::https://github.com/threema-ch/threema-web/archive/refs/tags/v2.4.2.tar.gz
 	source = threema.desktop
+	source = 0001-When-browser-detection-fails-don-t-return-undefined.patch
+	source = 0002-Remove-browser-warning.patch
 	sha256sums = 87938d1329d55159717c87dbdab7e59e615457c8528aef638e313e4233c3b86f
 	sha256sums = 61942d1ea93746580e0219eefa38114e8aa597355c4fd620bbd31dfd1b270b09
 	sha256sums = ccfdae3416e2a1f096cfaf67fd8f8dacb0d8348582fc666ecc8b5b0d08ef5bf2
+	sha256sums = 5079f273e325a9206ae31e1537a63862cadd4e93471b1ec715c1587b808a6c08
+	sha256sums = 75be30059dab96e015a9030477c3a7e55584b408761f9c50a9491d1bed152c78
 
 pkgname = threema-desktop
diff --git a/0001-When-browser-detection-fails-don-t-return-undefined.patch b/0001-When-browser-detection-fails-don-t-return-undefined.patch
new file mode 100644
index 000000000000..d7f97439ccca
--- /dev/null
+++ b/0001-When-browser-detection-fails-don-t-return-undefined.patch
@@ -0,0 +1,29 @@
+From 7793ff845953ba9b9051961b9a28ae1b2e64166e Mon Sep 17 00:00:00 2001
+From: Danilo Bargen <danilo.bargen@threema.ch>
+Date: Thu, 4 Aug 2022 09:50:13 +0200
+Subject: [PATCH] When browser detection fails, don't return undefined
+
+---
+ src/services/browser.ts | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/services/browser.ts b/src/services/browser.ts
+index c405e0d4..c65b1541 100644
+--- a/src/services/browser.ts
++++ b/src/services/browser.ts
+@@ -124,6 +124,12 @@ export class BrowserService {
+             if (browser.opera) {
+                 this.browser = new BrowserInfo(uagent, BrowserName.Opera, version);
+             }
++
++            // Detection failed
++            if (this.browser === undefined) {
++                this.log.warn(`Browser could not be recognized. User agent: ${uagent}`);
++                this.browser = new BrowserInfo(uagent, null, null);
++            }
+         }
+ 
+         return this.browser;
+-- 
+2.37.1
+
diff --git a/0002-Remove-browser-warning.patch b/0002-Remove-browser-warning.patch
new file mode 100644
index 000000000000..1e3c86a3092e
--- /dev/null
+++ b/0002-Remove-browser-warning.patch
@@ -0,0 +1,57 @@
+From b57759918627e0b26b3cdac367c3046bceef0406 Mon Sep 17 00:00:00 2001
+From: Danilo Bargen <danilo.bargen@threema.ch>
+Date: Thu, 4 Aug 2022 10:22:20 +0200
+Subject: [PATCH] Remove browser warning
+
+---
+ src/partials/welcome.ts | 34 ----------------------------------
+ 1 file changed, 34 deletions(-)
+
+diff --git a/src/partials/welcome.ts b/src/partials/welcome.ts
+index 03a58b31..1d68efd6 100644
+--- a/src/partials/welcome.ts
++++ b/src/partials/welcome.ts
+@@ -143,40 +143,6 @@ class WelcomeController {
+         this.log.info('Detected browser:', this.browser.description());
+         if (!this.browser.wasDetermined()) {
+             this.log.warn('Could not determine browser version');
+-            this.showBrowserWarning();
+-        } else if (this.browser.name === threema.BrowserName.Chrome) {
+-            if (version < minVersions.CHROME) {
+-                this.log.warn('Chrome is too old (' + version + ' < ' + minVersions.CHROME + ')');
+-                this.showBrowserWarning();
+-            }
+-        } else if (this.browser.name === threema.BrowserName.Firefox) {
+-            if (version < minVersions.FF) {
+-                this.log.warn('Firefox is too old (' + version + ' < ' + minVersions.FF + ')');
+-                this.showBrowserWarning();
+-            }
+-        } else if (this.browser.name === threema.BrowserName.FirefoxIos) {
+-            if (version < minVersions.FF_IOS) {
+-                this.log.warn('Firefox on iOS is too old (WebKit ' + version + ' < ' + minVersions.FF_IOS + ')');
+-                this.showBrowserWarning();
+-            }
+-        } else if (this.browser.name === threema.BrowserName.Opera) {
+-            if (version < minVersions.OPERA) {
+-                this.log.warn('Opera is too old (' + version + ' < ' + minVersions.OPERA + ')');
+-                this.showBrowserWarning();
+-            }
+-        } else if (this.browser.name === threema.BrowserName.Safari) {
+-            if (version < minVersions.SAFARI) {
+-                this.log.warn('Safari is too old (' + version + ' < ' + minVersions.SAFARI + ')');
+-                this.showBrowserWarning();
+-            }
+-        } else if (this.browser.name === threema.BrowserName.Edge) {
+-            if (version < minVersions.EDGE) {
+-                this.log.warn('Edge is too old (' + version + ' < ' + minVersions.EDGE + ')');
+-                this.showBrowserWarning();
+-            }
+-        } else {
+-            this.log.warn('Non-supported browser, please use Chrome, Firefox, Edge or Opera');
+-            this.showBrowserWarning();
+         }
+ 
+         // Determine whether local storage is available
+-- 
+2.37.1
+
diff --git a/PKGBUILD b/PKGBUILD
index fd00b4480037..d8a1e3c59629 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ _variant=consumer
 _appname="Threema"
 pkgdesc="Threema Desktop (Threema Web in Electron)."
 pkgver=1.2.18
-pkgrel=1
+pkgrel=2
 _threema_web_ver=2.4.2 # Keep in sync with version used by threema-desktop
 arch=('any')
 url="https://github.com/threema-ch/threema-web-electron"
@@ -16,13 +16,23 @@ source=(
   "threema-web-electron-v${pkgver}.tar.gz::https://github.com/threema-ch/threema-web-electron/archive/refs/tags/${pkgver}.tar.gz"
   "threema-web-v${_threema_web_ver}.tar.gz::https://github.com/threema-ch/threema-web/archive/refs/tags/v${_threema_web_ver}.tar.gz"
   "threema.desktop"
+  "0001-When-browser-detection-fails-don-t-return-undefined.patch"
+  "0002-Remove-browser-warning.patch"
 )
 sha256sums=(
   '87938d1329d55159717c87dbdab7e59e615457c8528aef638e313e4233c3b86f'
   '61942d1ea93746580e0219eefa38114e8aa597355c4fd620bbd31dfd1b270b09'
   'ccfdae3416e2a1f096cfaf67fd8f8dacb0d8348582fc666ecc8b5b0d08ef5bf2'
+  '5079f273e325a9206ae31e1537a63862cadd4e93471b1ec715c1587b808a6c08'
+  '75be30059dab96e015a9030477c3a7e55584b408761f9c50a9491d1bed152c78'
 )
 
+prepare() {
+  cd "${srcdir}/threema-web-${_threema_web_ver}"
+  patch --forward --strip=1 --input="${srcdir}/0001-When-browser-detection-fails-don-t-return-undefined.patch"
+  patch --forward --strip=1 --input="${srcdir}/0002-Remove-browser-warning.patch"
+}
+
 build() {
   cd "${srcdir}/threema-web-electron-${pkgver}/"