Merge tag 'v1.6.8' into develop

tag

CHANGES.md

@@ -1,3 +1,21 @@
+Changes in Element v1.6.8 (2023-11-28)
+======================================
+
+Bugfixes 🐛
+----------
+ - Stop incoming call ringing if the call is cancelled or answered on another session. ([#4066](https://github.com/vector-im/element-android/issues/4066))
+ - Ensure the incoming call will not ring forever, in case the call is not ended by another way. ([#8178](https://github.com/vector-im/element-android/issues/8178))
+ - Unified Push: Ignore the potential SSL error when the custom gateway is testing locally ([#8683](https://github.com/vector-im/element-android/issues/8683))
+ - Fix issue with timeline message view reuse while rich text editor is enabled ([#8688](https://github.com/vector-im/element-android/issues/8688))
+
+Other changes
+-------------
+ - Remove unused WebRTC dependency ([#8658](https://github.com/vector-im/element-android/issues/8658))
+ - Take into account boolean "io.element.disable_network_constraint" from the .well-known file. ([#8662](https://github.com/vector-im/element-android/issues/8662))
+ - Update regex for email address to be aligned on RFC 5322 ([#8671](https://github.com/vector-im/element-android/issues/8671))
+ - Bump crypto sdk bindings to v0.3.16 ([#8679](https://github.com/vector-im/element-android/issues/8679))
+
+
 Changes in Element v1.6.6 (2023-10-05)
 ======================================
 

changelog.d/4066.bugfix

@@ -1 +0,0 @@
-Stop incoming call ringing if the call is cancelled or answered on another session.

changelog.d/8178.bugfix

@@ -1 +0,0 @@
-Ensure the incoming call will not ring forever, in case the call is not ended by another way.

changelog.d/8658.misc

@@ -1 +0,0 @@
-Remove unused WebRTC dependency

changelog.d/8662.misc

@@ -1 +0,0 @@
-Take into account boolean "io.element.disable_network_constraint" from the .well-known file.

changelog.d/8671.misc

@@ -1 +0,0 @@
-Update regex for email address to be aligned on RFC 5322

changelog.d/8679.misc

@@ -1 +0,0 @@
-Bump crypto sdk bindings to v0.3.16

changelog.d/8683.bugfix

@@ -1 +0,0 @@
-Unified Push: Ignore the potential SSL error when the custom gateway is testing locally

changelog.d/8688.bugfix

@@ -1 +0,0 @@
-Fix issue with timeline message view reuse while rich text editor is enabled

fastlane/metadata/android/en-US/changelogs/40106080.txt

@@ -0,0 +1,2 @@
+Main changes in this version: Bugfixes.
+Full changelog: https://github.com/vector-im/element-android/releases

tools/release/releaseScript.sh

@@ -160,11 +160,11 @@ adb -e uninstall im.vector.app.debug.test
 
 printf "\n================================================================================\n"
 printf "Running the integration test UiAllScreensSanityTest.allScreensTest()...\n"
-./gradlew connectedGplayRustCryptoDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=im.vector.app.ui.UiAllScreensSanityTest
+./gradlew connectedGplayDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=im.vector.app.ui.UiAllScreensSanityTest
 
 printf "\n================================================================================\n"
 printf "Building the app...\n"
-./gradlew assembleGplayRustCryptoDebug
+./gradlew assembleGplayDebug
 
 printf "\n================================================================================\n"
 printf "Uninstalling previous debug app if any...\n"
@@ -172,7 +172,7 @@ adb -e uninstall im.vector.app.debug
 
 printf "\n================================================================================\n"
 printf "Installing the app...\n"
-adb -e install ./vector-app/build/outputs/apk/gplayRustCrypto/debug/vector-gplay-rustCrypto-arm64-v8a-debug.apk
+adb -e install ./vector-app/build/outputs/apk/gplay/debug/vector-gplay-arm64-v8a-debug.apk
 
 printf "\n================================================================================\n"
 printf "Running the app...\n"
@@ -293,67 +293,67 @@ printf "Unzipping the artifact...\n"
 unzip ${targetPath}/vector-gplay-release-unsigned.zip -d ${targetPath}
 
 # Flatten folder hierarchy
-mv ${targetPath}/gplayRustCrypto/release/* ${targetPath}
+mv ${targetPath}/gplay/release/* ${targetPath}
 rm -rf ${targetPath}/gplay
 
 printf "\n================================================================================\n"
 printf "Signing the APKs...\n"
 
-cp ${targetPath}/vector-gplay-rustCrypto-arm64-v8a-release-unsigned.apk \
-   ${targetPath}/vector-gplay-rustCrypto-arm64-v8a-release-signed.apk
+cp ${targetPath}/vector-gplay-arm64-v8a-release-unsigned.apk \
+   ${targetPath}/vector-gplay-arm64-v8a-release-signed.apk
 ./tools/release/sign_apk_unsafe.sh \
     ${keyStorePath} \
-    ${targetPath}/vector-gplay-rustCrypto-arm64-v8a-release-signed.apk \
+    ${targetPath}/vector-gplay-arm64-v8a-release-signed.apk \
     ${keyStorePassword} \
     ${keyPassword}
 
-cp ${targetPath}/vector-gplay-rustCrypto-armeabi-v7a-release-unsigned.apk \
-   ${targetPath}/vector-gplay-rustCrypto-armeabi-v7a-release-signed.apk
+cp ${targetPath}/vector-gplay-armeabi-v7a-release-unsigned.apk \
+   ${targetPath}/vector-gplay-armeabi-v7a-release-signed.apk
 ./tools/release/sign_apk_unsafe.sh \
     ${keyStorePath} \
-    ${targetPath}/vector-gplay-rustCrypto-armeabi-v7a-release-signed.apk \
+    ${targetPath}/vector-gplay-armeabi-v7a-release-signed.apk \
     ${keyStorePassword} \
     ${keyPassword}
 
-cp ${targetPath}/vector-gplay-rustCrypto-x86-release-unsigned.apk \
-   ${targetPath}/vector-gplay-rustCrypto-x86-release-signed.apk
+cp ${targetPath}/vector-gplay-x86-release-unsigned.apk \
+   ${targetPath}/vector-gplay-x86-release-signed.apk
 ./tools/release/sign_apk_unsafe.sh \
     ${keyStorePath} \
-    ${targetPath}/vector-gplay-rustCrypto-x86-release-signed.apk \
+    ${targetPath}/vector-gplay-x86-release-signed.apk \
     ${keyStorePassword} \
     ${keyPassword}
 
-cp ${targetPath}/vector-gplay-rustCrypto-x86_64-release-unsigned.apk \
-   ${targetPath}/vector-gplay-rustCrypto-x86_64-release-signed.apk
+cp ${targetPath}/vector-gplay-x86_64-release-unsigned.apk \
+   ${targetPath}/vector-gplay-x86_64-release-signed.apk
 ./tools/release/sign_apk_unsafe.sh \
     ${keyStorePath} \
-    ${targetPath}/vector-gplay-rustCrypto-x86_64-release-signed.apk \
+    ${targetPath}/vector-gplay-x86_64-release-signed.apk \
     ${keyStorePassword} \
     ${keyPassword}
 
 # Ref: https://docs.fastlane.tools/getting-started/android/beta-deployment/#uploading-your-app
-# set SUPPLY_APK_PATHS="${targetPath}/vector-gplay-rustCrypto-arm64-v8a-release-unsigned.apk,${targetPath}/vector-gplay-rustCrypto-armeabi-v7a-release-unsigned.apk,${targetPath}/vector-gplay-rustCrypto-x86-release-unsigned.apk,${targetPath}/vector-gplay-rustCrypto-x86_64-release-unsigned.apk"
+# set SUPPLY_APK_PATHS="${targetPath}/vector-gplay-arm64-v8a-release-unsigned.apk,${targetPath}/vector-gplay-armeabi-v7a-release-unsigned.apk,${targetPath}/vector-gplay-x86-release-unsigned.apk,${targetPath}/vector-gplay-x86_64-release-unsigned.apk"
 #
 # ./fastlane beta
 
 printf "\n================================================================================\n"
 printf "Please check the information below:\n"
 
-printf "File vector-gplay-rustCrypto-arm64-v8a-release-signed.apk:\n"
-${buildToolsPath}/aapt dump badging ${targetPath}/vector-gplay-rustCrypto-arm64-v8a-release-signed.apk | grep package
-printf "File vector-gplay-rustCrypto-armeabi-v7a-release-signed.apk:\n"
-${buildToolsPath}/aapt dump badging ${targetPath}/vector-gplay-rustCrypto-armeabi-v7a-release-signed.apk | grep package
-printf "File vector-gplay-rustCrypto-x86-release-signed.apk:\n"
-${buildToolsPath}/aapt dump badging ${targetPath}/vector-gplay-rustCrypto-x86-release-signed.apk | grep package
-printf "File vector-gplay-rustCrypto-x86_64-release-signed.apk:\n"
-${buildToolsPath}/aapt dump badging ${targetPath}/vector-gplay-rustCrypto-x86_64-release-signed.apk | grep package
+printf "File vector-gplay-arm64-v8a-release-signed.apk:\n"
+${buildToolsPath}/aapt dump badging ${targetPath}/vector-gplay-arm64-v8a-release-signed.apk | grep package
+printf "File vector-gplay-armeabi-v7a-release-signed.apk:\n"
+${buildToolsPath}/aapt dump badging ${targetPath}/vector-gplay-armeabi-v7a-release-signed.apk | grep package
+printf "File vector-gplay-x86-release-signed.apk:\n"
+${buildToolsPath}/aapt dump badging ${targetPath}/vector-gplay-x86-release-signed.apk | grep package
+printf "File vector-gplay-x86_64-release-signed.apk:\n"
+${buildToolsPath}/aapt dump badging ${targetPath}/vector-gplay-x86_64-release-signed.apk | grep package
 
 printf "\n"
 read -p "Does it look correct? Press enter when it's done."
 
 printf "\n================================================================================\n"
 read -p "Installing apk on a real device, press enter when a real device is connected. "
-apkPath="${targetPath}/vector-gplay-rustCrypto-arm64-v8a-release-signed.apk"
+apkPath="${targetPath}/vector-gplay-arm64-v8a-release-signed.apk"
 adb -d install ${apkPath}
 
 read -p "Please run the APK on your phone to check that the upgrade went well (no init sync, etc.). Press enter when it's done."