Version 1.2.21-1

4 files changed, 14 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8fb6a5a1c71a..99c3ab40573b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,20 @@
 pkgbase = threema-desktop
 	pkgdesc = Threema Desktop (Threema Web in Electron).
-	pkgver = 1.2.18
-	pkgrel = 2
+	pkgver = 1.2.21
+	pkgrel = 1
 	url = https://github.com/threema-ch/threema-web-electron
 	arch = any
 	license = AGPL
 	makedepends = npm
 	makedepends = git
 	depends = electron18
-	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-web-electron-v1.2.21.tar.gz::https://github.com/threema-ch/threema-web-electron/archive/refs/tags/1.2.21.tar.gz
+	source = threema-web-v2.4.4.tar.gz::https://github.com/threema-ch/threema-web/archive/refs/tags/v2.4.4.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
+	source = 0001-Remove-browser-warning.patch
+	sha256sums = 9ff6aec5cd4802af8f3951fe9172115b49102003204cd0bd86d01aec98ab2fca
+	sha256sums = 82b4bc5ac2cfde8c3f6ee79f3d90ebb6a395c1db7969756493ab18b321f89783
 	sha256sums = ccfdae3416e2a1f096cfaf67fd8f8dacb0d8348582fc666ecc8b5b0d08ef5bf2
-	sha256sums = 5079f273e325a9206ae31e1537a63862cadd4e93471b1ec715c1587b808a6c08
 	sha256sums = 75be30059dab96e015a9030477c3a7e55584b408761f9c50a9491d1bed152c78
 
 pkgname = threema-desktop
diff --git a/0002-Remove-browser-warning.patch b/0001-Remove-browser-warning.patch
index 1e3c86a3092e..1e3c86a3092e 100644
--- a/0002-Remove-browser-warning.patch
+++ b/0001-Remove-browser-warning.patch
diff --git a/0001-When-browser-detection-fails-don-t-return-undefined.patch b/0001-When-browser-detection-fails-don-t-return-undefined.patch
deleted file mode 100644
index d7f97439ccca..000000000000
--- a/0001-When-browser-detection-fails-don-t-return-undefined.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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/PKGBUILD b/PKGBUILD
index d8a1e3c59629..3336ecbae353 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,9 @@ _binname=threema
 _variant=consumer
 _appname="Threema"
 pkgdesc="Threema Desktop (Threema Web in Electron)."
-pkgver=1.2.18
-pkgrel=2
-_threema_web_ver=2.4.2 # Keep in sync with version used by threema-desktop
+pkgver=1.2.21
+pkgrel=1
+_threema_web_ver=2.4.4 # Keep in sync with version used by threema-desktop
 arch=('any')
 url="https://github.com/threema-ch/threema-web-electron"
 license=('AGPL')
@@ -16,21 +16,18 @@ 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"
+  "0001-Remove-browser-warning.patch"
 )
 sha256sums=(
-  '87938d1329d55159717c87dbdab7e59e615457c8528aef638e313e4233c3b86f'
-  '61942d1ea93746580e0219eefa38114e8aa597355c4fd620bbd31dfd1b270b09'
+  '9ff6aec5cd4802af8f3951fe9172115b49102003204cd0bd86d01aec98ab2fca'
+  '82b4bc5ac2cfde8c3f6ee79f3d90ebb6a395c1db7969756493ab18b321f89783'
   '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"
+  patch --forward --strip=1 --input="${srcdir}/0001-Remove-browser-warning.patch"
 }
 
 build() {