Commit Graph

12303 Commits

Author SHA1 Message Date
ariskotsomitopoulos dca5bea744 Merge branch 'feature/aris/fix_immutable_model_crash' into feature/aris/threads 2021-12-16 20:56:10 +02:00
ariskotsomitopoulos f769d84443 Merge branch 'develop' into feature/aris/threads 2021-12-16 20:55:52 +02:00
ariskotsomitopoulos cabf12289b Add changelog 2021-12-16 20:39:21 +02:00
Adam Brown 049cad7d2c adding changelog entry 2021-12-16 18:37:03 +00:00
Adam Brown ae6be3fdc4 adding missing binding options emote content
- fixes android 12+ crash when certain emojis are used within the emote content
2021-12-16 18:34:00 +00:00
ariskotsomitopoulos 2275bdd4fa Fix crash ImmutableModelException 2021-12-16 20:14:21 +02:00
ariskotsomitopoulos 638d56c707 Fix update from develop/prod to threads 2021-12-16 17:10:29 +02:00
Benoit Marty 3b35be510f
Merge pull request #4729 from vector-im/feature/adm/avoid-leaking-window-when-showing-loading
Avoid leaking Activity Window when showing loading dialog
2021-12-16 11:07:23 +01:00
Benoit Marty addeec0ff8
Merge pull request #4731 from vector-im/feature/bma/center
Call banner: center text vertically
2021-12-16 10:51:37 +01:00
Benoit Marty 9adc946b7e
Merge pull request #4732 from vector-im/gradlew-update-7.3.2
Update Gradle Wrapper from 7.3.1 to 7.3.2
2021-12-16 09:55:37 +01:00
gradle-update-robot db1e0af4e5 Update Gradle Wrapper from 7.3.1 to 7.3.2.
Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
2021-12-16 00:13:21 +00:00
Benoit Marty 818a8898b3 Call banner: center text vertically 2021-12-15 22:19:23 +01:00
Benoit Marty 63660ab496
Merge pull request #4728 from vector-im/feature/adm/proxity-sensor-not-releasing
Proximity sensor not releasing
2021-12-15 21:23:12 +01:00
Adam Brown eb9c46b9a2 adding changelog entry 2021-12-15 18:17:04 +00:00
Adam Brown 4c238e81cf dismisses any potential loading dialogs when the linked fragment is destroyed
- fixes leaking the activity window when the fragment is destroyed
2021-12-15 18:16:10 +00:00
Adam Brown 8c913d29cb adding changelog entry 2021-12-15 17:35:27 +00:00
Adam Brown 8b96d8cd8d only acquire a wake lock if a lock is not already held 2021-12-15 17:32:39 +00:00
ariskotsomitopoulos bc6e89b503 Disable user typing from thread timeline 2021-12-15 18:49:22 +02:00
ariskotsomitopoulos 3acdccb339 Disable polls from within threads but allow users to vote if the poll is a root thread message 2021-12-15 16:31:58 +02:00
ariskotsomitopoulos 20357ce5c4 - Fix remaining conflicts with develop
- Disable thread awareness when threads are enabled
2021-12-15 14:38:08 +02:00
ariskotsomitopoulos cd95fc41e4 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	library/ui-styles/src/main/res/values/dimens.xml
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
#	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
#	vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewEvents.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
#	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
#	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
#	vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
#	vector/src/main/res/layout/fragment_room_detail.xml
2021-12-14 20:18:54 +02:00
ariskotsomitopoulos 6a33c41091 Fix stickers in unencrypted rooms 2021-12-14 17:45:07 +02:00
Benoit Marty 4949a06343 Use stable build tools for the release. 2021-12-14 16:37:52 +01:00
ariskotsomitopoulos 2aa24f0a0d Fix threads sort order, newest first 2021-12-14 16:30:59 +02:00
Benoit Marty fa65cc59fe Version++ 2021-12-14 14:46:08 +01:00
ariskotsomitopoulos 5ceed4096e Fix threads sort order, newest first 2021-12-14 15:44:38 +02:00
Benoit Marty 973b42be4c Merge branch 'release/1.3.10' into main 2021-12-14 14:41:08 +01:00
Benoit Marty 7bdecafe54 Merge branch 'release/1.3.10' into develop 2021-12-14 14:41:07 +01:00
Benoit Marty ce558a06eb fastlane 2021-12-14 14:40:49 +01:00
Benoit Marty 5dfe24ca45 Towncrier 2021-12-14 14:39:39 +01:00
Benoit Marty 73dba2b692 Fix another crash 2021-12-14 14:37:01 +01:00
Benoit Marty 32820f7893 Comment out some part of the test to make it pass. Tested manually for this time. 2021-12-14 13:27:33 +01:00
Benoit Marty 1961309458 Fix a crash on reactions bottom sheet 2021-12-14 13:26:03 +01:00
ariskotsomitopoulos d56281dca7 - Enhance local notification to work with read receipt & the latest chunk
- Local notification mentioning system
- Fix/Improve thread list filtering
2021-12-14 13:35:08 +02:00
Benoit Marty 0411291515
Merge pull request #4708 from vector-im/feature/bma/analytics_before_release
Disable automatic opt-in screen display
2021-12-14 12:07:12 +01:00
Benoit Marty 7a17061270
Merge pull request #4706 from RiotTranslateBot/weblate-element-android-element-app
Translations update from Weblate
2021-12-14 11:45:17 +01:00
Benoit Marty 6d2163bdf4 Add changelog 2021-12-14 11:34:15 +01:00
Benoit Marty 08def813cc Disable automatic opt-in screen display.
We want to wait for translations to be available in the project before showing this screen to every users.
2021-12-14 11:34:06 +01:00
Adam Brown 74594d8fc3 porting the LoginActivty2 to a dynamic FTUE activity
- supports switching between a copied legacy flow (DefaultFTUE) and the WIP variant
- this will allow us to make iterative changes to the default ftue flow without affecting the legacy flow/forks
2021-12-14 09:06:15 +00:00
Weblate 1e40b5cd34 Merge branch 'origin/develop' into Weblate. 2021-12-14 08:58:12 +00:00
Adam Brown fd0e1e44c4 renaming login version to variants to better describe the different flows 2021-12-14 08:50:57 +00:00
Adam Brown dae2e9988f moving the sso redirect parameter to the sso redirect activity for sharing 2021-12-14 08:50:57 +00:00
Adam Brown 01d4a48b8b adding ability to lazily create viewmodels
- helpful when multiple view models are injected but not all are needed
2021-12-14 08:50:57 +00:00
Adam Brown a3ad8c5e2e removing non accessible softlogout2 activity
- there's no manifest entry
- the implementation looks like it delegates back to login 1, will look to add back as part of the FTUE changes
2021-12-14 08:50:56 +00:00
Benoit Marty f4cfb5d6d3
Merge pull request #4559 from vector-im/feature/bma/posthog
Analytics
2021-12-14 09:31:55 +01:00
Benoit Marty be33a53e56 code quality 2021-12-14 09:06:43 +01:00
Benoit Marty aad19e4bce code qual 2021-12-14 09:06:36 +01:00
Jozef Gaal 7b7fb8ef60 Translated using Weblate (Slovak)
Currently translated at 28.2% (11 of 39 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sk/
2021-12-14 02:26:04 +00:00
Denys Nykula cb4690a3e6 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (2693 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
2021-12-14 02:26:03 +00:00
Jozef Gaal d3d5d79b7d Translated using Weblate (Slovak)
Currently translated at 52.6% (1417 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
2021-12-14 02:25:58 +00:00