Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase/element android 1.4.32 #713

Merged
merged 229 commits into from
Aug 26, 2022
Merged

Conversation

Florian14
Copy link
Contributor

Rebase against Element-Android v1.4.32 (changelog)

dependabot bot and others added 30 commits July 12, 2022 23:06
Bumps dokka-gradle-plugin from 1.7.0 to 1.7.10.

---
updated-dependencies:
- dependency-name: org.jetbrains.dokka:dokka-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps io.gitlab.arturbosch.detekt from 1.20.0 to 1.21.0.

---
updated-dependencies:
- dependency-name: io.gitlab.arturbosch.detekt
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
…itching-unit-tests

# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
Dinh Quang Tuyen and others added 16 commits August 6, 2022 15:32
Currently translated at 88.6% (2062 of 2327 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
Currently translated at 99.0% (2306 of 2327 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
Fixes crash when entering non ascii username during account creation
Try to fix issues and simplify flow.
…locked

Fix lockscreen's 'device locked' crash on Android 12 and 12L devices
…d-element-app

Translations update from Weblate
@Florian14 Florian14 force-pushed the rebase/element-android-1.4.32 branch 3 times, most recently from 7bb09c9 to f93b489 Compare August 23, 2022 13:59
Copy link
Contributor

@giomfo giomfo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just one question - approved


buildConfigField "im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy", "outboundSessionKeySharingStrategy", "im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy.WhenTyping"

buildConfigField "Long", "VOICE_MESSAGE_DURATION_LIMIT_MS", "120_000L"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Florian14 do you know where these build config went?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is from Element, the BuildConfig fields are now defined in Config.kt. here is the related PR

Florian Renaud added 6 commits August 26, 2022 10:20
Conflicts:
	.github/workflows/build.yml
	.github/workflows/quality.yml
	.github/workflows/tests.yml
	vector-config/src/main/java/im/vector/app/config/Config.kt
	vector/build.gradle
	vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
@Florian14 Florian14 force-pushed the rebase/element-android-1.4.32 branch from cda5563 to edf775d Compare August 26, 2022 08:21
@Florian14 Florian14 merged commit a75ff0a into element-rebase Aug 26, 2022
@Florian14 Florian14 deleted the rebase/element-android-1.4.32 branch August 26, 2022 12:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.