mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-26 19:36:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent

Browse source
This commit is contained in:
ericdecanini 2022-06-15 14:22:24 +02:00
commit d5c5c5734f
24 changed files with 93 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
.github/workflows/build.yml vendored
View file

@ -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; }"

40
CHANGES.md
View file

@ -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)
======================================

1
changelog.d/5285.wip
View file

@ -1 +0,0 @@
FTUE - Adds Sign Up tracking

1
changelog.d/5528.bugfix
View file

@ -1 +0,0 @@
Fix cases of missing, swapped, or duplicated messages

1
changelog.d/5970.feature
View file

@ -1 +0,0 @@
Make read receipt avatar list more compact

1
changelog.d/6017.misc
View file

@ -1 +0,0 @@
Adds support for parsing homeserver versions without a patch number

5
changelog.d/6029.sdk
View file

@ -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

1
changelog.d/6087.misc
View file

@ -1 +0,0 @@
Updating exit onboarding dialog copy formatting to match iOS

1
changelog.d/6093.sdk
View file

@ -1 +0,0 @@
Allowing AuthenticationService.getLoginFlow to fail without resetting state from previously successful calls

1
changelog.d/6126.misc
View file

@ -1 +0,0 @@
Disables when arrow alignment in code style

1
changelog.d/6146.feature
View file

@ -1 +0,0 @@
Allow .well-known configuration to override key sharing mode

1
changelog.d/6169.sdk
View file

@ -1 +0,0 @@
Allows new passwords to be passed at the point of confirmation when resetting a password

1
changelog.d/6209.bugfix
View file

@ -1 +0,0 @@
Fix wrong status of live location sharing in timeline

1
changelog.d/6222.bugfix
View file

@ -1 +0,0 @@
Fix StackOverflowError while recording voice message

1
changelog.d/6232.bugfix
View file

@ -1 +0,0 @@
Text cropped: "Secure backup"

1
changelog.d/6244.feature
View file

@ -1 +0,0 @@
Re-organize location settings flags

1
changelog.d/6247.bugfix
View file

@ -1 +0,0 @@
Fix copyright attributions of map views

1
changelog.d/6264.bugfix
View file

@ -1 +0,0 @@
Fix flickering bottom bar of live location item

1
changelog.d/6280.feature
View file

@ -1 +0,0 @@
Add report action for live location messages

53
fastlane/README.md
View file

@ -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).

2
fastlane/metadata/android/en-US/changelogs/40104220.txt Normal file
View file

@ -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

2
matrix-sdk-android/build.gradle
View file

@ -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()}\""

2
vector/build.gradle
View file

@ -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'

6
vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthUseCaseFragment.kt
View file

@ -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<FragmentFtueAuthUseCaseBinding>() {
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,