From cfca47d547185dcb9d89d5341dd6d2b4d148322f Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Tue, 29 Aug 2023 12:07:22 +0300 Subject: [PATCH 1/4] Prepare for new sprint From efa28887d5212cd8e114c90bd7a4b80a0b72f786 Mon Sep 17 00:00:00 2001 From: Valere Date: Fri, 8 Sep 2023 11:40:51 +0200 Subject: [PATCH 2/4] Fix passing padded base64 instead of unpadded --- .../Transactions/QRCode/MXQRCodeTransactionV2.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MatrixSDK/Crypto/Verification/Transactions/QRCode/MXQRCodeTransactionV2.swift b/MatrixSDK/Crypto/Verification/Transactions/QRCode/MXQRCodeTransactionV2.swift index 5974c4435..183c75504 100644 --- a/MatrixSDK/Crypto/Verification/Transactions/QRCode/MXQRCodeTransactionV2.swift +++ b/MatrixSDK/Crypto/Verification/Transactions/QRCode/MXQRCodeTransactionV2.swift @@ -103,7 +103,7 @@ class MXQRCodeTransactionV2: NSObject, MXQRCodeTransaction { log.debug("->") let data = MXQRCodeDataCoder().encode(otherQRCodeData) - let string = MXBase64Tools.base64(from: data) + let string = MXBase64Tools.unpaddedBase64(from: data) guard let result = request.scanQrCode(data: string) else { log.failure("Failed scanning QR code") return From 96f7bc348ec3f4f7a3b5e229fde7be51f29d0567 Mon Sep 17 00:00:00 2001 From: valere Date: Fri, 8 Sep 2023 11:46:24 +0200 Subject: [PATCH 3/4] update changelog --- changelog.d/1816.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/1816.bugfix diff --git a/changelog.d/1816.bugfix b/changelog.d/1816.bugfix new file mode 100644 index 000000000..ffab1b7a0 --- /dev/null +++ b/changelog.d/1816.bugfix @@ -0,0 +1 @@ +Fix | QR code verification failing due to incorrect encoding padding \ No newline at end of file From f3047aed9abb5fab6f295f7deab56ed127d950a3 Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Tue, 12 Sep 2023 09:15:37 +0300 Subject: [PATCH 4/4] version++ --- CHANGES.md | 7 +++++++ MatrixSDK.podspec | 2 +- MatrixSDK/MatrixSDKVersion.m | 2 +- changelog.d/1816.bugfix | 1 - 4 files changed, 9 insertions(+), 3 deletions(-) delete mode 100644 changelog.d/1816.bugfix diff --git a/CHANGES.md b/CHANGES.md index dd1dd9adc..7d361382e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,10 @@ +## Changes in 0.27.2 (2023-09-12) + +🐛 Bugfixes + +- Fix | QR code verification failing due to incorrect encoding padding ([#1816](https://github.com/vector-im/element-ios/issues/1816)) + + ## Changes in 0.27.1 (2023-08-29) ✨ Features diff --git a/MatrixSDK.podspec b/MatrixSDK.podspec index ba946ca0b..971a267ec 100644 --- a/MatrixSDK.podspec +++ b/MatrixSDK.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "MatrixSDK" - s.version = "0.27.1" + s.version = "0.27.2" s.summary = "The iOS SDK to build apps compatible with Matrix (https://www.matrix.org)" s.description = <<-DESC diff --git a/MatrixSDK/MatrixSDKVersion.m b/MatrixSDK/MatrixSDKVersion.m index d9c7e3a76..56bbdf50e 100644 --- a/MatrixSDK/MatrixSDKVersion.m +++ b/MatrixSDK/MatrixSDKVersion.m @@ -16,4 +16,4 @@ #import -NSString *const MatrixSDKVersion = @"0.27.1"; +NSString *const MatrixSDKVersion = @"0.27.2"; diff --git a/changelog.d/1816.bugfix b/changelog.d/1816.bugfix deleted file mode 100644 index ffab1b7a0..000000000 --- a/changelog.d/1816.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix | QR code verification failing due to incorrect encoding padding \ No newline at end of file