diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7d602f0191..e9cc7f9347 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: pull_request: { } push: branches: [ main, develop ] - tags: [tchap_v*] + tags: [ tchap_v* ] # Enrich gradle.properties for CI/CD env: @@ -54,10 +54,10 @@ jobs: fail-fast: false matrix: target: [ GplayBtchapWithoutvoipWithpinning, GplayTchapWithoutvoipWithpinning, FdroidBtchapWithoutvoipWithoutpinning, FdroidTchapWithoutvoipWithoutpinning, GplayBtchapWithvoipWithpinning ] - # Only runs on main, no concurrency. concurrency: - group: ${{ github.ref == 'refs/head/main' && format('build-release-apk-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('build-release-apk-develop-{0}', github.sha) || format('build-debug-{0}', github.ref) }} - cancel-in-progress: ${{ github.ref != 'refs/head/main' }} + # Tchap: custom group + group: ${{ github.ref == 'refs/head/main' && format('build-release-apk-main-{0}-{1}', github.sha, matrix.target) || startsWith(github.ref, 'refs/tags/tchap_v') && format('build-release-apk-tag-{0}-{1}', github.sha, matrix.target) }} + cancel-in-progress: ${{ github.ref != 'refs/head/main' && !startsWith(github.ref, 'refs/tags/tchap_v') }} steps: - uses: actions/checkout@v3 - uses: actions/cache@v3 @@ -80,18 +80,26 @@ jobs: exodus: runs-on: ubuntu-latest needs: release + env: + # Tchap: only generate exodus report for the following target + TARGET_NAME: "GplayTchapWithoutvoipWithpinning" + TARGET_FOLDER: "gplayTchapWithoutvoipWithpinning" steps: - name: Obtain apk from artifact id: download uses: actions/download-artifact@v3 with: - name: vector-gplay-release-unsigned + name: ${{ env.TARGET_NAME }}-release-unsigned - name: Show apks in artifact - run: ls -R ${{steps.download.outputs.download-path}} + id: list-apks + # Tchap: Find apks in artifacts + run: | + ls -R ${{steps.download.outputs.download-path}} | grep ".apk" + echo ::set-output name=FIRST_APK_NAME::$(ls -R ${{steps.download.outputs.download-path}} | grep ".apk" | head -1) - name: Execute exodus-standalone uses: docker://exodusprivacy/exodus-standalone:latest with: - args: /github/workspace/gplay/release/vector-gplay-universal-release-unsigned.apk -j -o /github/workspace/exodus.json + args: /github/workspace/${{ env.TARGET_FOLDER }}/release/${{ steps.list-apks.outputs.FIRST_APK_NAME }} -j -o /github/workspace/exodus.json - name: Upload exodus json report uses: actions/upload-artifact@v3 with: diff --git a/TCHAP_CHANGES.md b/TCHAP_CHANGES.md index ec50fc1d62..5b74bf6f8e 100644 --- a/TCHAP_CHANGES.md +++ b/TCHAP_CHANGES.md @@ -1,3 +1,15 @@ +Changes in Tchap 2.4.3 (2022-09-23) +=================================== + +Bugfixes 🐛 +---------- + - Create DM by selecting an email is not working anymore ([#672](https://github.com/tchapgouv/tchap-android-v2/issues/672)) + +Other changes +------------- + - CI - Fix build APKs script ([#724](https://github.com/tchapgouv/tchap-android-v2/issues/724)) + + Changes in Tchap 2.4.2 (2022-08-29) =================================== diff --git a/towncrier.toml b/towncrier.toml index c8ea516789..207ccd8b57 100644 --- a/towncrier.toml +++ b/towncrier.toml @@ -1,5 +1,5 @@ [tool.towncrier] - version = "2.4.2" + version = "2.4.3" directory = "changelog.d" filename = "TCHAP_CHANGES.md" name = "Changes in Tchap" diff --git a/vector/build.gradle b/vector/build.gradle index 8c3ffaf207..e0b7ad6aca 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -35,7 +35,7 @@ ext.versionMinor = 4 // Note: even values are reserved for regular release, odd values for hotfix release. // When creating a hotfix, you should decrease the value, since the current value // is the value for the next regular release. -ext.versionPatch = 2 +ext.versionPatch = 3 static def getGitTimestamp() { def cmd = 'git show -s --format=%ct' @@ -224,7 +224,8 @@ android { applicationVariants.all { variant -> // assign different version code for each output - def baseVariantVersion = variant.versionCode * 10 + // Tchap : Increase the factor from 10 to 100 due to Neo users integration + def baseVariantVersion = variant.versionCode * 100 variant.outputs.each { output -> def baseAbiVersionCode = project.ext.abiVersionCodes.get(output.getFilter(OutputFile.ABI)) // Known limitation: it does not modify the value in the BuildConfig.java generated file diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt index 10493fee15..ef9d47d7ee 100644 --- a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt @@ -235,6 +235,9 @@ class HomeActivityViewModel @AssistedInject constructor( .onEach { status -> when (status) { is SyncRequestState.Idle -> { + // Tchap edition : Force Identity server definition + updateIdentityServer() + maybeVerifyOrBootstrapCrossSigning() } else -> Unit