Skip to content

Commit 552b143

Browse files
committed
Merge branch 'release/1.6.8' into main
2 parents 4fa634a + f46a9d6 commit 552b143

File tree

234 files changed

+906
-24004
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

234 files changed

+906
-24004
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
with:
3434
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
3535
- name: Assemble ${{ matrix.target }} debug apk
36-
run: ./gradlew assemble${{ matrix.target }}RustCryptoDebug $CI_GRADLE_ARG_PROPERTIES
36+
run: ./gradlew assemble${{ matrix.target }}Debug $CI_GRADLE_ARG_PROPERTIES
3737
- name: Upload ${{ matrix.target }} debug APKs
3838
uses: actions/upload-artifact@v3
3939
with:
@@ -57,7 +57,7 @@ jobs:
5757
with:
5858
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
5959
- name: Assemble GPlay unsigned apk
60-
run: ./gradlew clean assembleGplayRustCryptoRelease $CI_GRADLE_ARG_PROPERTIES
60+
run: ./gradlew clean assembleGplayRelease $CI_GRADLE_ARG_PROPERTIES
6161
- name: Upload Gplay unsigned APKs
6262
uses: actions/upload-artifact@v3
6363
with:
@@ -79,7 +79,7 @@ jobs:
7979
- name: Execute exodus-standalone
8080
uses: docker://exodusprivacy/exodus-standalone:latest
8181
with:
82-
args: /github/workspace/gplayRustCrypto/release/vector-gplay-rustCrypto-universal-release-unsigned.apk -j -o /github/workspace/exodus.json
82+
args: /github/workspace/gplay/release/vector-gplay-universal-release-unsigned.apk -j -o /github/workspace/exodus.json
8383
- name: Upload exodus json report
8484
uses: actions/upload-artifact@v3
8585
with:

.github/workflows/elementr.yml

Lines changed: 0 additions & 37 deletions
This file was deleted.

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
yes n | towncrier build --version nightly
3636
- name: Build and upload Gplay Nightly APK
3737
run: |
38-
./gradlew assembleGplayRustCryptoNightly appDistributionUploadGplayRustCryptoNightly $CI_GRADLE_ARG_PROPERTIES
38+
./gradlew assembleGplayNightly appDistributionUploadGplayNightly $CI_GRADLE_ARG_PROPERTIES
3939
env:
4040
ELEMENT_ANDROID_NIGHTLY_KEYID: ${{ secrets.ELEMENT_ANDROID_NIGHTLY_KEYID }}
4141
ELEMENT_ANDROID_NIGHTLY_KEYPASSWORD: ${{ secrets.ELEMENT_ANDROID_NIGHTLY_KEYPASSWORD }}

.github/workflows/nightly_er.yml

Lines changed: 0 additions & 46 deletions
This file was deleted.

.github/workflows/quality.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,8 @@ jobs:
4949
- name: Run lint
5050
# Not always, if ktlint or detekt fail, avoid running the long lint check.
5151
run: |
52-
./gradlew vector-app:lintGplayKotlinCryptoRelease $CI_GRADLE_ARG_PROPERTIES
53-
./gradlew vector-app:lintFdroidKotlinCryptoRelease $CI_GRADLE_ARG_PROPERTIES
54-
./gradlew vector-app:lintGplayRustCryptoRelease $CI_GRADLE_ARG_PROPERTIES
55-
./gradlew vector-app:lintFdroidRustCryptoRelease $CI_GRADLE_ARG_PROPERTIES
52+
./gradlew vector-app:lintGplayRelease $CI_GRADLE_ARG_PROPERTIES
53+
./gradlew vector-app:lintFdroidRelease $CI_GRADLE_ARG_PROPERTIES
5654
- name: Upload reports
5755
if: always()
5856
uses: actions/upload-artifact@v3

.github/workflows/tests-rust.yml

Lines changed: 0 additions & 102 deletions
This file was deleted.

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
disable-animations: true
7474
# emulator-build: 7425822
7575
script: |
76-
./gradlew gatherGplayKotlinCryptoDebugStringTemplates $CI_GRADLE_ARG_PROPERTIES
76+
./gradlew gatherGplayDebugStringTemplates $CI_GRADLE_ARG_PROPERTIES
7777
./gradlew unitTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
7878
./gradlew instrumentationTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
7979
./gradlew generateCoverageReport $CI_GRADLE_ARG_PROPERTIES

CHANGES.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
Changes in Element v1.6.8 (2023-11-28)
2+
======================================
3+
4+
Bugfixes 🐛
5+
----------
6+
- Stop incoming call ringing if the call is cancelled or answered on another session. ([#4066](https://github.com/vector-im/element-android/issues/4066))
7+
- 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))
8+
- Unified Push: Ignore the potential SSL error when the custom gateway is testing locally ([#8683](https://github.com/vector-im/element-android/issues/8683))
9+
- Fix issue with timeline message view reuse while rich text editor is enabled ([#8688](https://github.com/vector-im/element-android/issues/8688))
10+
11+
Other changes
12+
-------------
13+
- Remove unused WebRTC dependency ([#8658](https://github.com/vector-im/element-android/issues/8658))
14+
- Take into account boolean "io.element.disable_network_constraint" from the .well-known file. ([#8662](https://github.com/vector-im/element-android/issues/8662))
15+
- Update regex for email address to be aligned on RFC 5322 ([#8671](https://github.com/vector-im/element-android/issues/8671))
16+
- Bump crypto sdk bindings to v0.3.16 ([#8679](https://github.com/vector-im/element-android/issues/8679))
17+
18+
119
Changes in Element v1.6.6 (2023-10-05)
220
======================================
321

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ tasks.register("recordScreenshots", GradleBuild) {
312312

313313
tasks.register("verifyScreenshots", GradleBuild) {
314314
startParameter.projectProperties.screenshot = ""
315-
tasks = [':vector:verifyPaparazziRustCryptoDebug']
315+
tasks = [':vector:verifyPaparazziDebug']
316316
}
317317

318318
ext.initScreenshotTests = { project ->

coverage.gradle

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,5 @@ task unitTestsWithCoverage(type: GradleBuild) {
8787
task instrumentationTestsWithCoverage(type: GradleBuild) {
8888
startParameter.projectProperties.coverage = "true"
8989
startParameter.projectProperties['android.testInstrumentationRunnerArguments.notPackage'] = 'im.vector.app.ui'
90-
tasks = [':vector-app:connectedGplayKotlinCryptoDebugAndroidTest', ':vector:connectedKotlinCryptoDebugAndroidTest', 'matrix-sdk-android:connectedKotlinCryptoDebugAndroidTest']
91-
}
92-
93-
task instrumentationTestsRustWithCoverage(type: GradleBuild) {
94-
startParameter.projectProperties.coverage = "true"
95-
startParameter.projectProperties['android.testInstrumentationRunnerArguments.notPackage'] = 'im.vector.app.ui'
96-
tasks = [':vector-app:connectedGplayRustCryptoDebugAndroidTest', ':vector:connectedRustCryptoDebugAndroidTest', 'matrix-sdk-android:connectedRustCryptoDebugAndroidTest']
90+
tasks = [':vector-app:connectedGplayDebugAndroidTest', ':vector:connectedDebugAndroidTest', 'matrix-sdk-android:connectedDebugAndroidTest']
9791
}

0 commit comments

Comments
 (0)