From 10eebff8a643050cb337bd59198d4e739a4c2e61 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Tue, 14 Jun 2022 12:45:52 +0100 Subject: [PATCH 1/5] updating generated fastlane readme --- fastlane/README.md | 53 +++++++++++++++++----------------------------- 1 file changed, 19 insertions(+), 34 deletions(-) diff --git a/fastlane/README.md b/fastlane/README.md index 7fea7afdd5..dc33f422d6 100644 --- a/fastlane/README.md +++ b/fastlane/README.md @@ -1,64 +1,49 @@ fastlane documentation ----- - +================ # Installation Make sure you have the latest version of the Xcode command line tools installed: -```sh +``` xcode-select --install ``` -For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane) +Install _fastlane_ using +``` +[sudo] gem install fastlane -NV +``` +or alternatively using `brew install fastlane` # Available Actions - ## Android - ### android test - -```sh -[bundle exec] fastlane android test ``` - +fastlane android test +``` Runs all the tests - ### android beta - -```sh -[bundle exec] fastlane android beta ``` - +fastlane android beta +``` Submit a new Beta Build to Crashlytics Beta - ### android deploy - -```sh -[bundle exec] fastlane android deploy ``` - +fastlane android deploy +``` Deploy a new version to the Google Play - ### android deployMeta - -```sh -[bundle exec] fastlane android deployMeta ``` - +fastlane android deployMeta +``` Deploy Google Play metadata - ### android getVersionCode - -```sh -[bundle exec] fastlane android getVersionCode ``` - +fastlane android getVersionCode +``` Get version code ---- This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run. - -More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools). - -The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools). +More information about fastlane can be found on [fastlane.tools](https://fastlane.tools). +The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools). From 2eeba285e89bc8dd200e19da8ab42ad15fd30324 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Tue, 14 Jun 2022 13:50:42 +0100 Subject: [PATCH 2/5] only hide the connect to server option when the new FTUE journey is enabled --- .../features/onboarding/ftueauth/FtueAuthUseCaseFragment.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthUseCaseFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthUseCaseFragment.kt index bd5793f195..289aa811d6 100644 --- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthUseCaseFragment.kt +++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthUseCaseFragment.kt @@ -28,13 +28,14 @@ import androidx.annotation.ColorRes import androidx.annotation.DrawableRes import androidx.annotation.StringRes import androidx.core.content.ContextCompat -import androidx.core.view.isVisible +import androidx.core.view.isGone import im.vector.app.R import im.vector.app.core.extensions.getResTintedDrawable import im.vector.app.core.extensions.getTintedDrawable import im.vector.app.core.extensions.setLeftDrawable import im.vector.app.core.extensions.setTextWithColoredPart import im.vector.app.databinding.FragmentFtueAuthUseCaseBinding +import im.vector.app.features.VectorFeatures import im.vector.app.features.login.ServerType import im.vector.app.features.onboarding.FtueUseCase import im.vector.app.features.onboarding.OnboardingAction @@ -46,6 +47,7 @@ private const val LIGHT_MODE_ICON_BACKGROUND_ALPHA = 0.15f class FtueAuthUseCaseFragment @Inject constructor( private val themeProvider: ThemeProvider, + private val vectorFeatures: VectorFeatures, ) : AbstractFtueAuthFragment() { override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueAuthUseCaseBinding { @@ -59,7 +61,7 @@ class FtueAuthUseCaseFragment @Inject constructor( private fun setupViews() { // Connect to server relies on https://github.com/vector-im/element-android/issues/5782 - views.useCaseConnectToServerGroup.isVisible = false + views.useCaseConnectToServerGroup.isGone = vectorFeatures.isOnboardingCombinedRegisterEnabled() views.useCaseOptionOne.renderUseCase( useCase = FtueUseCase.FRIENDS_FAMILY, From 8cee066ba32bb40ee2aee9c726424a2b9187a813 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Tue, 14 Jun 2022 13:56:29 +0100 Subject: [PATCH 3/5] generating 1.4.22 changelog --- CHANGES.md | 40 +++++++++++++++++++ changelog.d/5285.wip | 1 - changelog.d/5528.bugfix | 1 - changelog.d/5970.feature | 1 - changelog.d/6017.misc | 1 - changelog.d/6029.sdk | 5 --- changelog.d/6087.misc | 1 - changelog.d/6093.sdk | 1 - changelog.d/6126.misc | 1 - changelog.d/6146.feature | 1 - changelog.d/6169.sdk | 1 - changelog.d/6209.bugfix | 1 - changelog.d/6222.bugfix | 1 - changelog.d/6232.bugfix | 1 - changelog.d/6244.feature | 1 - changelog.d/6247.bugfix | 1 - changelog.d/6264.bugfix | 1 - changelog.d/6280.feature | 1 - .../android/en-US/changelogs/40104220.txt | 2 + 19 files changed, 42 insertions(+), 21 deletions(-) delete mode 100644 changelog.d/5285.wip delete mode 100644 changelog.d/5528.bugfix delete mode 100644 changelog.d/5970.feature delete mode 100644 changelog.d/6017.misc delete mode 100644 changelog.d/6029.sdk delete mode 100644 changelog.d/6087.misc delete mode 100644 changelog.d/6093.sdk delete mode 100644 changelog.d/6126.misc delete mode 100644 changelog.d/6146.feature delete mode 100644 changelog.d/6169.sdk delete mode 100644 changelog.d/6209.bugfix delete mode 100644 changelog.d/6222.bugfix delete mode 100644 changelog.d/6232.bugfix delete mode 100644 changelog.d/6244.feature delete mode 100644 changelog.d/6247.bugfix delete mode 100644 changelog.d/6264.bugfix delete mode 100644 changelog.d/6280.feature create mode 100644 fastlane/metadata/android/en-US/changelogs/40104220.txt diff --git a/CHANGES.md b/CHANGES.md index 60497402e9..e2991a122b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,43 @@ +Changes in Element v1.4.22 (2022-06-14) +======================================= + +Features ✨ +---------- + - Make read receipt avatar list more compact ([#5970](https://github.com/vector-im/element-android/issues/5970)) + - Allow .well-known configuration to override key sharing mode ([#6147](https://github.com/vector-im/element-android/issues/6147)) + - Re-organize location settings flags ([#6244](https://github.com/vector-im/element-android/issues/6244)) + - Add report action for live location messages ([#6280](https://github.com/vector-im/element-android/issues/6280)) + +Bugfixes 🐛 +---------- + - Fix cases of missing, swapped, or duplicated messages ([#5528](https://github.com/vector-im/element-android/issues/5528)) + - Fix wrong status of live location sharing in timeline ([#6209](https://github.com/vector-im/element-android/issues/6209)) + - Fix StackOverflowError while recording voice message ([#6222](https://github.com/vector-im/element-android/issues/6222)) + - Text cropped: "Secure backup" ([#6232](https://github.com/vector-im/element-android/issues/6232)) + - Fix copyright attributions of map views ([#6247](https://github.com/vector-im/element-android/issues/6247)) + - Fix flickering bottom bar of live location item ([#6264](https://github.com/vector-im/element-android/issues/6264)) + +In development 🚧 +---------------- + - FTUE - Adds Sign Up tracking ([#5285](https://github.com/vector-im/element-android/issues/5285)) + +SDK API changes ⚠️ +------------------ + - Some methods from `Session` have been moved to a new `SyncService`, that you can retrieve from a `Session`. + - `SyncStatusService` method has been moved to the new `SyncService` + - `InitSyncStep` have been moved and renamed to `InitialSyncStep` + - `SyncStatusService.Status` has been renamed to `SyncRequestState` + - The existing `SyncService` has been renamed to `SyncAndroidService` because of name clash with the new SDK Service ([#6029](https://github.com/vector-im/element-android/issues/6029)) + - Allows `AuthenticationService.getLoginFlow` to fail without resetting state from previously successful calls ([#6093](https://github.com/vector-im/element-android/issues/6093)) + - Allows new passwords to be passed at the point of confirmation when resetting a password ([#6169](https://github.com/vector-im/element-android/issues/6169)) + +Other changes +------------- + - Adds support for parsing homeserver versions without a patch number ([#6017](https://github.com/vector-im/element-android/issues/6017)) + - Updating exit onboarding dialog copy formatting to match iOS ([#6087](https://github.com/vector-im/element-android/issues/6087)) + - Disables when arrow alignment in code style ([#6126](https://github.com/vector-im/element-android/issues/6126)) + + Changes in Element 1.4.20 (2022-06-13) ====================================== diff --git a/changelog.d/5285.wip b/changelog.d/5285.wip deleted file mode 100644 index 1dd68597be..0000000000 --- a/changelog.d/5285.wip +++ /dev/null @@ -1 +0,0 @@ -FTUE - Adds Sign Up tracking diff --git a/changelog.d/5528.bugfix b/changelog.d/5528.bugfix deleted file mode 100644 index b0dc759ab0..0000000000 --- a/changelog.d/5528.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix cases of missing, swapped, or duplicated messages diff --git a/changelog.d/5970.feature b/changelog.d/5970.feature deleted file mode 100644 index b65decdd2d..0000000000 --- a/changelog.d/5970.feature +++ /dev/null @@ -1 +0,0 @@ -Make read receipt avatar list more compact diff --git a/changelog.d/6017.misc b/changelog.d/6017.misc deleted file mode 100644 index 2597f2d796..0000000000 --- a/changelog.d/6017.misc +++ /dev/null @@ -1 +0,0 @@ -Adds support for parsing homeserver versions without a patch number diff --git a/changelog.d/6029.sdk b/changelog.d/6029.sdk deleted file mode 100644 index b39d1a6359..0000000000 --- a/changelog.d/6029.sdk +++ /dev/null @@ -1,5 +0,0 @@ -Some methods from `Session` have been moved to a new `SyncService`, that you can retrieve from a `Session`. -- `SyncStatusService` method has been moved to the new `SyncService` -- `InitSyncStep` have been moved and renamed to `InitialSyncStep` -- `SyncStatusService.Status` has been renamed to `SyncRequestState` -- The existing `SyncService` has been renamed to `SyncAndroidService` because of name clash with the new SDK Service diff --git a/changelog.d/6087.misc b/changelog.d/6087.misc deleted file mode 100644 index 0af705230c..0000000000 --- a/changelog.d/6087.misc +++ /dev/null @@ -1 +0,0 @@ -Updating exit onboarding dialog copy formatting to match iOS diff --git a/changelog.d/6093.sdk b/changelog.d/6093.sdk deleted file mode 100644 index 8ac5e41b61..0000000000 --- a/changelog.d/6093.sdk +++ /dev/null @@ -1 +0,0 @@ -Allowing AuthenticationService.getLoginFlow to fail without resetting state from previously successful calls diff --git a/changelog.d/6126.misc b/changelog.d/6126.misc deleted file mode 100644 index e1c9bc2c3d..0000000000 --- a/changelog.d/6126.misc +++ /dev/null @@ -1 +0,0 @@ -Disables when arrow alignment in code style diff --git a/changelog.d/6146.feature b/changelog.d/6146.feature deleted file mode 100644 index 9d1e117ddb..0000000000 --- a/changelog.d/6146.feature +++ /dev/null @@ -1 +0,0 @@ -Allow .well-known configuration to override key sharing mode diff --git a/changelog.d/6169.sdk b/changelog.d/6169.sdk deleted file mode 100644 index dfee158c3f..0000000000 --- a/changelog.d/6169.sdk +++ /dev/null @@ -1 +0,0 @@ -Allows new passwords to be passed at the point of confirmation when resetting a password diff --git a/changelog.d/6209.bugfix b/changelog.d/6209.bugfix deleted file mode 100644 index 3eac2c9df6..0000000000 --- a/changelog.d/6209.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix wrong status of live location sharing in timeline diff --git a/changelog.d/6222.bugfix b/changelog.d/6222.bugfix deleted file mode 100644 index ef430ee024..0000000000 --- a/changelog.d/6222.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix StackOverflowError while recording voice message diff --git a/changelog.d/6232.bugfix b/changelog.d/6232.bugfix deleted file mode 100644 index df04655701..0000000000 --- a/changelog.d/6232.bugfix +++ /dev/null @@ -1 +0,0 @@ -Text cropped: "Secure backup" diff --git a/changelog.d/6244.feature b/changelog.d/6244.feature deleted file mode 100644 index 9b02187112..0000000000 --- a/changelog.d/6244.feature +++ /dev/null @@ -1 +0,0 @@ -Re-organize location settings flags diff --git a/changelog.d/6247.bugfix b/changelog.d/6247.bugfix deleted file mode 100644 index 260c059212..0000000000 --- a/changelog.d/6247.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix copyright attributions of map views diff --git a/changelog.d/6264.bugfix b/changelog.d/6264.bugfix deleted file mode 100644 index 1b14f0aa6e..0000000000 --- a/changelog.d/6264.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix flickering bottom bar of live location item diff --git a/changelog.d/6280.feature b/changelog.d/6280.feature deleted file mode 100644 index dab8c0dc7b..0000000000 --- a/changelog.d/6280.feature +++ /dev/null @@ -1 +0,0 @@ -Add report action for live location messages diff --git a/fastlane/metadata/android/en-US/changelogs/40104220.txt b/fastlane/metadata/android/en-US/changelogs/40104220.txt new file mode 100644 index 0000000000..61db61727a --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/40104220.txt @@ -0,0 +1,2 @@ +Main changes in this version: Various bug fixes and stability improvements. +Full changelog: https://github.com/vector-im/element-android/releases From ded7b1e0d08103d9acbcedfe501164f1bfe4eca8 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Tue, 14 Jun 2022 15:16:56 +0100 Subject: [PATCH 4/5] updating current version --- matrix-sdk-android/build.gradle | 2 +- vector/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle index 45e411533b..034b549d85 100644 --- a/matrix-sdk-android/build.gradle +++ b/matrix-sdk-android/build.gradle @@ -56,7 +56,7 @@ android { // that the app's state is completely cleared between tests. testInstrumentationRunnerArguments clearPackageData: 'true' - buildConfigField "String", "SDK_VERSION", "\"1.4.22\"" + buildConfigField "String", "SDK_VERSION", "\"1.4.24\"" buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\"" buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\"" diff --git a/vector/build.gradle b/vector/build.gradle index 14fd55c3cd..ae909bf513 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -31,7 +31,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 = 22 +ext.versionPatch = 24 static def getGitTimestamp() { def cmd = 'git show -s --format=%ct' From 063f082faccc43c0bd8e2ff8634b4109c4ece77d Mon Sep 17 00:00:00 2001 From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com> Date: Tue, 14 Jun 2022 16:01:38 +0100 Subject: [PATCH 5/5] Run exodus on all PR branches. Build the release APK for each PR commit, run exodus against that APK. --- .github/workflows/build.yml | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9517a4f3a7..b767da14d7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,8 +46,9 @@ jobs: release: name: Build unsigned GPlay APKs runs-on: ubuntu-latest - if: github.ref == 'refs/heads/main' - # 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' }} steps: - uses: actions/checkout@v3 - uses: actions/cache@v3 @@ -67,4 +68,26 @@ jobs: path: | vector/build/outputs/apk/*/release/*.apk -# TODO add exodus checks + exodus: + runs-on: ubuntu-latest + needs: release + steps: + - name: Obtain apk from artifact + id: download + uses: actions/download-artifact@v3 + with: + name: vector-gplay-release-unsigned + - name: Show apks in artifact + run: ls -R ${{steps.download.outputs.download-path}} + - 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 + - name: Upload exodus json report + uses: actions/upload-artifact@v3 + with: + name: exodus.json + path: | + exodus.json + - name: Check for trackers + run: "jq -e '.trackers == []' exodus.json > /dev/null || { echo '::error static analysis identified user tracking library' ; exit 1; }"