mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-25 10:28:33 +03:00
Code Issues Projects Releases Packages Wiki Activity
12560 commits 7 branches 124 tags 230 MiB
Commit graph

8030 commits

Author SHA1 Message Date
SpiritCroc
2d63dbbf12 Use BetterLinearLayoutManager for room detail view 
Epoxy wants this to be an androidx LinearLayoutManager, or it will crash
on scroll with:

E AndroidRuntime: java.lang.ClassCastException: im.vector.app.features.home.room.detail.RoomDetailFragment$setupRecyclerView$1 cannot be cast to androidx.recyclerview.widget.LinearLayoutManager
E AndroidRuntime: 	at com.airbnb.epoxy.preload.EpoxyPreloader.onScrolled(EpoxyPreloader.kt:107)
E AndroidRuntime: 	at androidx.recyclerview.widget.RecyclerView.dispatchOnScrolled(RecyclerView.java:5347)
E AndroidRuntime: 	at androidx.recyclerview.widget.RecyclerView.scrollByInternal(RecyclerView.java:2102)
E AndroidRuntime: 	at androidx.recyclerview.widget.RecyclerView.onTouchEvent(RecyclerView.java:3531)
E AndroidRuntime: 	at android.view.View.dispatchTouchEvent(View.java:14309)
[...]

Change-Id: Iaf75f07d4309eb5bf0e58eecd6797ef33522acdd
 2021-10-27 17:29:10 +02:00
SpiritCroc
a321d6a79a Import androidx LinearLayoutManager as BetterLinearLayoutManager 
At version 1.2.1:
From https://android.googlesource.com/platform/frameworks/support
revision aaeb4835903077a52ade9c4b561ff34efa96a155

With changed package name, and modified to build outside of the androidx
package.

Change-Id: Id055880b3513305637f170df350611d20783931d
 2021-10-27 17:21:04 +02:00
Benoit Marty
6691edb59d Remove shortcut as soon as a PIN code is set 2021-10-27 16:17:53 +02:00
ganfra
b93e67ed11 Flow migration: clean up 2021-10-27 16:12:01 +02:00
ganfra
635ca8e276 Merge branch 'develop' into feature/fga/rx_flow_migration 2021-10-27 16:05:43 +02:00
Benoit Marty
3a48e33c81 Cache immutable value 2021-10-27 15:26:31 +02:00
SpiritCroc
e7264de893 Automatic SchildiChat string correction 
Change-Id: I2fa4463aca9be72be6f1c393892be9147020a19d
 2021-10-27 15:25:09 +02:00
SpiritCroc
72a7e0677e Merge tag 'v1.3.6' into sc 
Change-Id: I6fb1ef7b45ef67915a8d5bd17bf36cab90e9bf02
 2021-10-27 15:25:05 +02:00
SpiritCroc
961adadbc8 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I07fb96aea925e57f95d16ea92fc92dc1c672c079
 2021-10-27 15:24:57 +02:00
Benoit Marty
6f577d8232 Do not show shortcuts if a PIN code is set 2021-10-27 15:24:24 +02:00
Benoit Marty
3a81c10062 Remove (disable) shortcut if a room is left 2021-10-27 15:13:07 +02:00
Benoit Marty
f166348a68 Ensure ShortcutsHandler get all the joined rooms #4168 2021-10-27 15:00:14 +02:00
Benoit Marty
9b75da5d4d Clean code 2021-10-27 15:00:14 +02:00
Adam Brown
4ae04fc297 adding normalised room display name field and making use of it when filtering rooms by name 
- fixes non latin-1 character set room names from being ignored when searching with inexact casing
 2021-10-27 13:09:53 +01:00
ganfra
34cb99e8ae Flow migration: remove Rx completely (rxbinding) 2021-10-27 12:13:49 +02:00
Onuray Sahin
6cee266a95 Create poll UI implementation. 2021-10-27 13:10:01 +03:00
Danial Behzadi
ede8933059 Translated using Weblate (Persian) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2021-10-26 23:25:49 +00:00
Ihor Hordiichuk
5c4ac897c1 Translated using Weblate (Ukrainian) 
Currently translated at 91.6% (2448 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-10-26 23:25:49 +00:00
random
188e0dbec7 Translated using Weblate (Italian) 
Currently translated at 99.8% (2669 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2021-10-26 23:25:45 +00:00
libexus
93ed2dcbbf Translated using Weblate (German) 
Currently translated at 97.8% (2615 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-10-26 23:25:44 +00:00
DUCKCHI
66198805ca Translated using Weblate (Korean) 
Currently translated at 49.6% (1326 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ko/
 2021-10-26 23:25:43 +00:00
dependabot[bot]
82b3d17db6
Bump libphonenumber from 8.12.35 to 8.12.36 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.35 to 8.12.36.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.35...v8.12.36)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-26 23:08:52 +00:00
Adam Brown
6d9877d79c filtering out redacted simple message events, we handle them by updating the notifications 2021-10-26 20:03:10 +01:00
Adam Brown
a5fe6f7212 removing redacted events from the room notification message list 2021-10-26 20:03:10 +01:00
Adam Brown
b146501f29 avoiding multiple list iterations via mapNotNull 2021-10-26 20:03:10 +01:00
Benoit Marty
be67836a3e Tiny formatting 2021-10-26 20:03:10 +01:00
Benoit Marty
2bd2cbf84e Compact code 2021-10-26 20:03:10 +01:00
Benoit Marty
c56101d227 Do not use the room member avatar as a room avatar 2021-10-26 20:03:10 +01:00
Adam Brown
743a71c78d renaming event lists to give more context and remove the list suffix/inconsistencies 2021-10-26 20:03:10 +01:00
Adam Brown
d1f6db4236 using dedicated ProcessedEvent data class instead of type alias for passing around the process notificatiable events 
- also includes @JvmName on all conflicting extensions for consistency
 2021-10-26 20:03:10 +01:00
Adam Brown
63090ef681 updating tests with shortcut placement changes 2021-10-26 20:03:10 +01:00
Adam Brown
6fb7faa360 removing unused imports 2021-10-26 20:03:10 +01:00
Adam Brown
a6e47d8b85 replacing notification utils usage with the displayer and removing unused method 2021-10-26 20:03:10 +01:00
Adam Brown
c16e3e09e6 adding missing parameter from rebase and removing no longer needed singleton annotation 2021-10-26 20:03:10 +01:00
Adam Brown
4748a385ea inlining single use extension functions 2021-10-26 20:03:10 +01:00
Adam Brown
86ce6a404e adding missing fixture parameter from rebase 2021-10-26 20:03:10 +01:00
Adam Brown
9fa09def96 fixing line lengths 2021-10-26 20:03:10 +01:00
Adam Brown
4bbb637ace adding documentation around the two notifiable event lists which act as our notification source of truth 2021-10-26 20:03:10 +01:00
Adam Brown
c67b9ee81e ensuring that we remove read messages when they come through by respecting the processed type when creating the notifications 2021-10-26 20:03:10 +01:00
Adam Brown
0bdc65b47f diffing the notification events against the currently rendered events allow us to dismiss notifications from removed events 2021-10-26 20:03:10 +01:00
Adam Brown
b27fb264fc using a process state of keep/removed rather than mapping to an ignored event id 
- this state will be used to diff the currently rendered events against the new ones
 2021-10-26 20:03:10 +01:00
Adam Brown
b7b4c01bde splitting the event processing from the rendering 
- this allows us to only synchronise of the event list modifications rather than the entire notification creation/rendering which should in turn reduce some of our ANRs https://github.com/vector-im/element-android/issues/4214
 2021-10-26 20:03:10 +01:00
Adam Brown
587466e009 relying on the notification refreshing to cancel/update the notifications 2021-10-26 20:03:10 +01:00
Adam Brown
03fe45da60 ensuring that we removing the summary group before removing individual notifications 
- adds some comments to explain the positioning
 2021-10-26 20:03:10 +01:00
Adam Brown
a94a1a0523 formatting 2021-10-26 20:03:10 +01:00
Adam Brown
8fb6bef503 removing this usages for project convention 2021-10-26 20:03:10 +01:00
Adam Brown
0d316e69de handling creating the summary when notification events are filtered to empty due to only containing removals 2021-10-26 20:03:10 +01:00
Adam Brown
3d567d0dcd removing no longer needed hasBeenDisplayed state, the eventList is our source of truth 
- when events have finished being displayed they should be removed from the eventList via notification delete actions
 2021-10-26 20:03:10 +01:00
Adam Brown
c85afa96d3 lifting settings change to cancel all notifications out of the renderer 
- the renderer's responsibility it handling events
 2021-10-26 20:03:10 +01:00
Adam Brown
3023cb4d39 chaining the event process, notification creation and display logic into a NotificationRender 
- extract the displaying into its own class to avoid leaking the entire notificationutils
- cancel/display notification actions are completely driven by the event or abscense of event from the eventList
- attempts to avoid redundant render passes by checking if the eventList has changed since the last render
 2021-10-26 20:03:10 +01:00
Adam Brown
0f4ec65b7a creating the notifications separate to where they're displayed 
- also handles when the event diff means the notifications should be removed
 2021-10-26 20:03:10 +01:00
Adam Brown
7b0c483134 creating dedicated class for the processing the serialized events 
- updates the logic to track when events are removed as a way for the notifications to remove themselves, null events mean they've been removed
 2021-10-26 20:03:10 +01:00
Adam Brown
4459aab558 making the event body non null and immutable to allow less cases to be handled - 
also puts in the basis for a separate notification refreshing implementation
 2021-10-26 20:03:10 +01:00
Adam Brown
beff5ab821 including the room name in the invitation event if the room sumary is available 2021-10-26 20:03:10 +01:00
Adam Brown
56e2b79774 formatting 2021-10-26 20:03:10 +01:00
Adam Brown
86b500445f updating the push gateway property to reflect that it mean the event can be replaced 
- makes the property immutable as only the creation of the event knows if it can be replace eg it came from a push or the /sync event stream
 2021-10-26 20:03:10 +01:00
Adam Brown
b44a382893 separating the mutable vars from the immutable ones, they'll be removed or made immutable by the notification redesign 2021-10-26 20:03:10 +01:00
Adam Brown
db5d4ead38 making the noisy property immutable 2021-10-26 20:03:10 +01:00
Adam Brown
c99dd4a615 making the isRedacted event property immutable 
- also makes the notifiable events sealed interfaces so that we can copy the data classes with new redacted values when it changes
 2021-10-26 20:03:10 +01:00
Adam Brown
89d643a4be removing unused property (written to but never read) 2021-10-26 20:03:10 +01:00
Adam Brown
81da185d8b making non overriden properties immutable by passing the values intro the constructor 2021-10-26 20:03:10 +01:00
Adam Brown
51f7dee952 removing non common properties form the base event 2021-10-26 20:03:10 +01:00
Adam Brown
67211605aa removing unused commented code 2021-10-26 20:03:10 +01:00
Adam Brown
0c809b5ed1 now that we ignore duplicated invite joined events at the source we can avoid eager notification cancels and rely on the main notification refresh flow 2021-10-26 20:03:10 +01:00
Benoit Marty
a19999a717
Merge pull request #4345 from vector-im/feature/adm/unable-to-join-by-name 
Unable to join room by name
 2021-10-26 19:35:44 +02:00
Benoit Marty
1d8a4a923a
Merge pull request #4344 from vector-im/feature/bma/device_id_param 
Add optional deviceId to the login API
 2021-10-26 19:24:09 +02:00
Adam Brown
272baa52ec adding remaining activity missing hilt injection annotations 2021-10-26 17:56:22 +01:00
Benoit Marty
042e91ee1c Set version to 1.3.6 2021-10-26 18:28:47 +02:00
Adam Brown
881157a725 applying the room navigation interceptor to only the room activity navigation, not the bottomsheets 
- the bottomsheets require the activity to stay around as they host the sheet instance, fixes missing join sheets
 2021-10-26 17:15:19 +01:00
Adam Brown
49c969601d adding missing bottomsheet handling for displaying the join room sheet when linking from the public rooms 
- the activity is still finished causing the popup to not actually display
 2021-10-26 17:14:24 +01:00
ganfra
a9d192fa39 Flow migration: add back some test 2021-10-26 18:09:07 +02:00
Benoit Marty
01a29f67d0 Version++ 2021-10-26 17:33:23 +02:00
Benoit Marty
6c485d5f6e Merge hotfix 1.3.6 2021-10-26 17:23:33 +02:00
Adam Brown
792444d1ac adding missing hilt annotation for injectable activity 2021-10-26 16:23:32 +01:00
Benoit Marty
f2330903ae Add named parameter for boolean 2021-10-26 16:49:38 +02:00
Benoit Marty
9f1efab18d Correctly handle url of type https://mobile.element.io/?hs_url=…&is_url=… 
Skip the choose server screen when such URL are open when Element
 2021-10-26 16:49:21 +02:00
Benoit Marty
dc5739c11d Format 2021-10-26 16:46:20 +02:00
ganfra
8cf5b727e1 Flow: restore read receipts 2021-10-26 15:57:18 +02:00
ganfra
9479342a64 Flow: remove more rx 2021-10-26 15:16:10 +02:00
Benoit Marty
0236396c59 Add optional deviceId to the login API 2021-10-26 15:10:04 +02:00
ganfra
c936954119 Flow migration: start replacing Rx by Flow 2021-10-26 14:24:23 +02:00
Adam Brown
10df75bd57 allowing the re-emission of identical search terms, fixes the finish setup/give consent steps from not properly updating the UI 
- also captures the fragmet resumed event in order to handle returning from the settings page and applying a identity server
 2021-10-26 12:25:17 +01:00
Adam Brown
c90dbf2f38 allowing null users in the email search, fixes missing indentity server helpers when inviting by email 2021-10-26 11:55:52 +01:00
SpiritCroc
9cb746d509 Open room at bottom action if open at unread 
Change-Id: Ia933c5a9f31c4025a34912a82f699e5c5abe8dd3
 2021-10-25 20:17:49 +02:00
SpiritCroc
61140f3698 Merge remote-tracking branch 'weblate/sc' into sc 
Change-Id: I1de6baa5fb75862ad0a9a62ec5ac20612c8750b8
 2021-10-25 19:30:25 +02:00
SpiritCroc
2426cdfb06 Automatic SchildiChat string correction 
Change-Id: Ife8129a743dff016e37df51a8a560a043f2bf58a
 2021-10-25 19:30:05 +02:00
SpiritCroc
65bc997acc Merge tag 'v1.3.5' into sc 
Change-Id: I3e9f85a6228649c1d8a2e886a2b234c59331c619
 2021-10-25 19:29:59 +02:00
SpiritCroc
c2f524b7b3 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I3c9e368fe3c46cca14ed47d7ae19bee206aa20ba
 2021-10-25 19:29:50 +02:00
Onuray Sahin
cb1d5e888d Create poll fragment with a title. 2021-10-25 20:14:10 +03:00
Onuray Sahin
4af42902a0 Create poll screen components implemented. 2021-10-25 16:41:37 +03:00
Onuray Sahin
3e03db200c Add poll icon to attachment type selector. 2021-10-25 14:47:57 +03:00
Benoit Marty
3354cd1760
Merge pull request #4312 from vector-im/feature/fga/hilt_app_migration 
Migrate App DI framework to Hilt
 2021-10-25 12:41:02 +02:00
Benoit Marty
79d56319b7 Version++ 2021-10-25 12:40:24 +02:00
Benoit Marty
8b6e0187d6
Merge pull request #4320 from vector-im/feature/adm/malformed-group-link 
Fixing grouped notification causing malformed url
 2021-10-25 12:20:04 +02:00
Adam Brown
325e78106e
fixing strange ide extract 2021-10-25 10:51:40 +01:00
waclaw66
fa01e7257e Translated using Weblate (Czech) 
Currently translated at 100.0% (117 of 117 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
 2021-10-23 12:06:31 +02:00
Adam Brown
06b3cc3f4b filters the unique notification uris from the link handling 
- fixes malformed url errors appearing for uri we only create to force uniqueness in the notifications
 2021-10-22 18:29:53 +01:00
ganfra
e1f4e4f934 Hilt: fix test 2021-10-22 18:38:48 +02:00
ganfra
c87d276f8a Hilt: fix fdroid 2021-10-22 18:09:14 +02:00
SpiritCroc
5182c2760e Merge remote-tracking branch 'upstream/develop' into sc 
Change-Id: Ie246642fb6346f4a8838878a18135add6786a9b5
 2021-10-22 16:18:34 +02:00
ganfra
a82a5c9b32 Fix unread marker not showing #4313 2021-10-22 15:19:39 +02:00
ganfra
e6e8c7f7d1 Hilt: clean code and add changelog 2021-10-22 12:41:06 +02:00
ganfra
e9b58844b3 Merge branch 'develop' into feature/fga/hilt_app_migration 2021-10-22 11:30:49 +02:00
ganfra
b6501ce7b2 Hilt: continue cleaning up 2021-10-22 11:30:09 +02:00
SpiritCroc
8171a85657 Merge remote-tracking branch 'upstream/develop' into sc 
Change-Id: Ia092f493aa3e3ad509eb7876e19fc773b40cc233
 2021-10-22 11:16:40 +02:00
waclaw66
afdbb6f438 Translated using Weblate (Czech) 
Currently translated at 100.0% (115 of 115 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
 2021-10-22 11:10:27 +02:00
Nikita Epifanov
b07542e653 Translated using Weblate (Russian) 
Currently translated at 100.0% (113 of 113 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/ru/
 2021-10-22 11:10:27 +02:00
twann
3628a5cd9e Translated using Weblate (French) 
Currently translated at 82.3% (93 of 113 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/fr/
 2021-10-22 11:10:27 +02:00
Linerly
c081218671 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (113 of 113 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/id/
 2021-10-22 11:10:26 +02:00
Linerly
67bf92c984 Added translation using Weblate (Indonesian) 2021-10-22 11:10:26 +02:00
SpiritCroc
923c80125e Add setting to put DM in spaces based on user memberships 
Change-Id: If202f640b2061423167cc8fc205781ab48ea4793
 2021-10-22 11:09:06 +02:00
SpiritCroc
a6f809c613 Refactor SC SDK preferences 
- Fix message preview setting
- Fixes some issue with chats being marked as unread
- Prepare for more SDK preferences

Change-Id: I7522624175c00ddf32c1bbec2a985ff34eb8d317
 2021-10-22 10:50:20 +02:00
Weblate
f75de0b2b7 Merge branch 'origin/develop' into Weblate. 2021-10-22 08:00:00 +00:00
Jeff Huang
dcda43fc93 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2021-10-22 07:59:54 +00:00
sr093906
de320e671e Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2021-10-22 07:59:54 +00:00
LinAGKar
5a3d1fb7ec Translated using Weblate (Swedish) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2021-10-22 07:59:54 +00:00
lvre
2ddedf49d4 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2021-10-22 07:59:54 +00:00
Linerly
df5c05fc1f Translated using Weblate (Indonesian) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2021-10-22 07:59:53 +00:00
Szimszon
2b0933139a Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2021-10-22 07:59:53 +00:00
Glandos
3993a45825 Translated using Weblate (French) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2021-10-22 07:59:53 +00:00
Priit Jõerüüt
b83566c1c0 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2021-10-22 07:59:53 +00:00
waclaw66
bc137af0e2 Translated using Weblate (Czech) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2021-10-22 07:59:52 +00:00
SpiritCroc
c8d9e69c40 Fix presence theming 
Change-Id: Ief37c2a6c3d1ed7270ec0a69da122b56614a2adf
 2021-10-22 09:18:59 +02:00
ganfra
d724504662 Hilt: finish migration of latest view models 2021-10-21 20:17:49 +02:00
ariskotsomitopoulos
9d5f84b86a Linter fixes 2021-10-21 20:02:21 +03:00
ariskotsomitopoulos
d6d46d1c21 Avoid using setRawInputType 2021-10-21 19:41:35 +03:00
SpiritCroc
675dfda7bc Keep screen on during voice recording 
Fixes https://github.com/SchildiChat/SchildiChat-android/issues/91

Change-Id: I95b6e7dd4cc55a50f7fdb2fead33afcc57b86628
 2021-10-21 18:12:15 +02:00
SpiritCroc
be4ba1aabc Make "jump to bottom on send" a setting 
Closes https://github.com/SchildiChat/SchildiChat-android/issues/94

Change-Id: I785dd13f4b40f495ae6ac1cea4d3f8af33ffe883
 2021-10-21 17:59:45 +02:00
SpiritCroc
5526485814 Automatic SchildiChat string correction 
Change-Id: I8c717f3a37806553bc01ce7ed7d38171c9cf999e
 2021-10-21 17:42:31 +02:00
SpiritCroc
978056e01f Merge tag 'v1.3.4' into sc 
Conflicts:
	dependencies.gradle
	gradle.properties
	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/session/sync/parsing/RoomSyncAccountDataHandler.kt
	vector/build.gradle
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/timeline/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt

Parts of conflict resolution taken from

    commit 3302ab563ea549684f1e7d7604da01d6856c8d8d
    Merge: 06f52832b 1f74bc986
    Author: S1m <git@sgougeon.fr>
    Date:   Fri Oct 15 09:36:46 2021 +0200

        Merge remote-tracking branch 'upstream/develop' into unifiedpush

Change-Id: I25ad98c59df8b8057147260d790eb2a86d6a6e9b
 2021-10-21 17:31:11 +02:00
Benoit Marty
a7d5c6a437
Merge pull request #4281 from vector-im/feature/aris/broken_edittext_4276 
Fix Broken EditText when using FromEditTextItem
 2021-10-21 17:28:41 +02:00
Benoit Marty
eb54eef595
Merge pull request #4296 from vector-im/feature/fga/fix_jsonviewer 
Fix crash when clicking on ViewEvent source actions
 2021-10-21 17:24:21 +02:00
ariskotsomitopoulos
beab9ab8f1 Refactored for clarity 2021-10-21 17:43:01 +03:00
ganfra
d41ff50097 Fix crash when clicking on ViewEvent source actions #4279 2021-10-21 16:34:20 +02:00
SpiritCroc
a3d1e3abcd Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ia154ec0db3fd14eb89cae6e75c5dbe652278c8b1
 2021-10-21 16:27:33 +02:00
ariskotsomitopoulos
dc230f1c30 Refactor to handle more cases 2021-10-21 14:31:50 +03:00
ganfra
d33daaf799 Fix voice message record button wrong visibility #4283 2021-10-21 11:35:08 +02:00
ganfra
ac1e4e9e9c Hilt: remove usage of ScreenComponent 2021-10-21 10:10:59 +02:00
ariskotsomitopoulos
3ea7b37df3 Improve imeOptions 2021-10-21 01:54:45 +03:00
ariskotsomitopoulos
b3f6b5e142 Fix Broken EditText when using FromEditTextItem 2021-10-21 01:46:05 +03:00
ganfra
188b4887ba Hilt: continue migrating activities 2021-10-20 18:06:57 +02:00
Benoit Marty
7c9c4ecf5f Version++ 2021-10-20 10:49:40 +02:00
Benoit Marty
367795ee24 Fix crash reported by the PlayStore, for release 1.3.4 
I did not find a way to reproduce, but this change should add some safety
 2021-10-20 09:29:15 +02:00
Benoit Marty
628ccdc328 Add English - GB to the list of languages 2021-10-20 09:16:56 +02:00
Weblate
cf5fca082d Merge branch 'origin/develop' into Weblate. 2021-10-20 06:28:17 +00:00
Kiel
c7fa40fd46 Translated using Weblate (English (United Kingdom)) 
Currently translated at 0.7% (21 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/en_GB/
 2021-10-20 06:28:08 +00:00
DUCKCHI
d764bb659f Translated using Weblate (Korean) 
Currently translated at 48.3% (1292 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ko/
 2021-10-20 06:28:06 +00:00
Benoit Marty
85983562fa No need to add explicit dependencies on stdlib, this is added by the gradle plugin since 1.4 
https://kotlinlang.org/docs/whatsnew14.html#dependency-on-the-standard-library-added-by-default
 2021-10-19 19:06:27 +02:00
ganfra
92cd79c550 Hilt: migrate activities 2021-10-19 18:53:17 +02:00
ganfra
bb68e735f7 Hilt: continue migration VM 2021-10-19 17:31:56 +02:00
Jeff Huang
497d053c5d Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2021-10-19 15:25:39 +00:00
LinAGKar
803d145892 Translated using Weblate (Swedish) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2021-10-19 15:25:39 +00:00
Viacheslav Raskulin
bda95fcc5e Translated using Weblate (Russian) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
 2021-10-19 15:25:39 +00:00
random
5cb55cb0d3 Translated using Weblate (Italian) 
Currently translated at 99.8% (2669 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2021-10-19 15:25:38 +00:00
Linerly
61c64a872d Translated using Weblate (Indonesian) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2021-10-19 15:25:38 +00:00
Benoit Marty
4626199761 Slash commands: popDraft() only in case of success, and display a loading dialog during processing 2021-10-19 13:56:38 +02:00
Benoit Marty
364654b685 Fix crash on slash commands Exceptions 2021-10-19 12:33:47 +02:00
Benoit Marty
fe2ba28441 Implement /part command, with or without parameter 2021-10-19 11:55:09 +02:00
Benoit Marty
f5eaf2f05f Align wording with Element Web 2021-10-19 11:35:49 +02:00
ganfra
1d73077184 Hilt: continue migration VM 2021-10-18 18:54:30 +02:00
Benoit Marty
2a47acc68a
Merge pull request #4236 from vector-im/feature/adm/fixing-home-menu-options 
Fixing developer sync options always displaying
 2021-10-18 18:19:20 +02:00
sr093906
be874d9927 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2021-10-18 01:25:44 +00:00
LinAGKar
68591f3ddd Translated using Weblate (Swedish) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2021-10-18 01:25:43 +00:00
joshua
b83a96e1c1 Translated using Weblate (Swedish) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2021-10-18 01:25:43 +00:00
Besnik Bleta
41167cdc23 Translated using Weblate (Albanian) 
Currently translated at 99.3% (2655 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
 2021-10-18 01:25:41 +00:00
Nikita Epifanov
9b1b35084c Translated using Weblate (Russian) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
 2021-10-18 01:25:41 +00:00
lvre
e425532953 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2021-10-18 01:25:40 +00:00
Linerly
1787a8a358 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2021-10-18 01:25:40 +00:00
Szimszon
ab5b907b7d Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2021-10-18 01:25:40 +00:00
Danial Behzadi
0c80f6b8a5 Translated using Weblate (Persian) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2021-10-18 01:25:39 +00:00
Priit Jõerüüt
ee301bc355 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2021-10-18 01:25:39 +00:00
zeritti
8425358634 Translated using Weblate (Czech) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2021-10-18 01:25:38 +00:00
Zet
bdbe1dd606 Translated using Weblate (Arabic) 
Currently translated at 38.9% (1040 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
 2021-10-18 01:25:38 +00:00
ganfra
968c2e70d2 Hilt: continue migration VM 2021-10-15 19:06:18 +02:00
Benoit Marty
293b255f58
Merge pull request #4256 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-10-15 17:39:07 +02:00
Weblate
d23bd411b3 Merge branch 'origin/develop' into Weblate. 2021-10-15 15:01:09 +00:00
LinAGKar
ec81920e0a Translated using Weblate (Swedish) 
Currently translated at 99.2% (2648 of 2669 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2021-10-15 15:00:58 +00:00
Michael Mihai
3d63140f48 Translated using Weblate (Romanian) 
Currently translated at 12.6% (337 of 2669 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
 2021-10-15 15:00:57 +00:00
tanmatsu
dcc3d9846b Translated using Weblate (Romanian) 
Currently translated at 12.6% (337 of 2669 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
 2021-10-15 15:00:53 +00:00
Viorel-Cătălin Răpițeanu
745d34c722 Translated using Weblate (Romanian) 
Currently translated at 12.6% (337 of 2669 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
 2021-10-15 15:00:53 +00:00
Glandos
d1b9710fa5 Translated using Weblate (French) 
Currently translated at 100.0% (2669 of 2669 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2021-10-15 15:00:52 +00:00
ganfra
9dd7017131 Hilt: continue migration 2021-10-15 12:49:29 +02:00
ganfra
f8d208fb4f Hilt: introduce MavericksComponent and try on RoomList 2021-10-15 10:27:45 +02:00
ganfra
ff53cf4db9 Hilt: replace the VectorComponent 2021-10-14 18:47:28 +02:00
thomcatdotrocks
32658f6651
Re-enable Android Auto 
Commit to complete #4247 after #4222 has been merged.
 2021-10-14 10:45:59 -05:00
Benoit Marty
1f74bc986d
Merge pull request #4249 from vector-im/feature/adm/constant-notification-sounds 
Constant triggering of notification sounds
 2021-10-14 17:06:53 +02:00
Benoit Marty
a208732499
Merge pull request #4238 from vector-im/feature/adm/delayed-sync-duplicated-notification 
Reappearing notifications on slow homeservers
 2021-10-14 17:01:20 +02:00
Adam Brown
fc793c442b reverting back to using an array for the circular cache, makes preloading and setting the value simpler 
- adds unit tests to show it working
 2021-10-14 14:02:23 +01:00
Adam Brown
0f07629547 moving comment position to be above the if and cleaning up log copy 2021-10-14 14:02:16 +01:00
Adam Brown
eb70a81afd moving builder call to avoid misaligning the comment 2021-10-14 13:14:36 +01:00
Adam Brown
00beb27b56 updating class doc to mention its not thread safe 2021-10-14 12:25:13 +01:00
Adam Brown
84b44f6093 using generic list for the circular cache instead of a fixed string array 2021-10-14 12:24:06 +01:00
SpiritCroc
4271e4c4ab Fix possible NPE in HomeActivity.onPrepareOptionsMenu 
Closes https://github.com/SchildiChat/SchildiChat-android-rageshakes/issues/133

Change-Id: Id2d18881a7bb2ad492a47cb74973ec2c712936bf
 2021-10-14 11:23:00 +02:00
Benoit Marty
7ec0872b78
Merge pull request #4222 from abaker/fix_outgoing_conversation_notifications 
Dont set person on sent message notification
 2021-10-14 10:45:26 +02:00
dependabot[bot]
0a9c6673af
Bump media from 1.4.2 to 1.4.3 
Bumps media from 1.4.2 to 1.4.3.

---
updated-dependencies:
- dependency-name: androidx.media:media
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-13 23:05:53 +00:00
LinAGKar
49262a19fe Translated using Weblate (Swedish) 
Currently translated at 99.1% (2645 of 2669 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2021-10-13 21:26:21 +00:00
Ihor Hordiichuk
b06e400291 Translated using Weblate (Ukrainian) 
Currently translated at 91.3% (2438 of 2669 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-10-13 21:26:16 +00:00
waclaw66
17ddcdd250 Translated using Weblate (Czech) 
Currently translated at 100.0% (2669 of 2669 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2021-10-13 21:26:16 +00:00
Jiri Grönroos
58447e9966 Translated using Weblate (Finnish) 
Currently translated at 85.1% (2272 of 2669 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fi/
 2021-10-13 21:26:15 +00:00
Jeff Huang
af1f1e379f Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2669 of 2669 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2021-10-13 21:25:44 +00:00
tanmatsu
256f90ae17 Translated using Weblate (Romanian) 
Currently translated at 10.9% (293 of 2669 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
 2021-10-13 21:25:43 +00:00
Viorel-Cătălin Răpițeanu
e0c059fcba Translated using Weblate (Romanian) 
Currently translated at 10.9% (293 of 2669 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
 2021-10-13 21:25:42 +00:00
Michael Mihai
961124e7f0 Translated using Weblate (Romanian) 
Currently translated at 10.9% (293 of 2669 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ro/
 2021-10-13 21:25:42 +00:00
random
9d90a897fc Translated using Weblate (Italian) 
Currently translated at 99.8% (2666 of 2669 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2021-10-13 21:25:40 +00:00
Leonidas Shear
8dcc65dc0a Translated using Weblate (Russian) 
Currently translated at 100.0% (2669 of 2669 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
 2021-10-13 21:25:37 +00:00
Didek
450c8e629e Translated using Weblate (Polish) 
Currently translated at 77.5% (2070 of 2669 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2021-10-13 21:25:35 +00:00
Adam Brown
64c532e54b allowing the first notification for each child of the group to vibrate/make a sound 
- by having the group and child notifications alert once we can safetly always update the group and get consistent alertOnce behaviour
 2021-10-13 18:42:02 +01:00
Adam Brown
b041876fa6 matching the other notifications and only alerting the group notifiation once 
- fixes notification sounds coming through for every message despite only vibrating for the first
 2021-10-13 18:00:35 +01:00
Adam Brown
f2da047720 keeping an inmemory cache of the seen ids, fixes delayed sync responses causing already dismissed notifications from being shown again 
- uses a simple circular buffer to limit the memory usage
 2021-10-13 15:40:42 +01:00
Adam Brown
64dce0638f only updating the visibility of the menu option the home details fragment adds instead of changing all the parent options 
- fixes the debug sync options being forced to visible
 2021-10-13 13:39:57 +01:00
Benoit Marty
4f51dbdcf9
Merge pull request #3313 from AquaWolf/feature/conversations 
Feature/conversations
 2021-10-13 11:24:04 +02:00
Benoit Marty
085da6c99a
Merge pull request #4090 from vector-im/feature/aris/presence 
Feature/aris/presence
 2021-10-13 09:58:22 +02:00
dependabot[bot]
7be7d50575
Bump libphonenumber from 8.12.34 to 8.12.35 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.34 to 8.12.35.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.34...v8.12.35)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-12 23:10:59 +00:00
Benoit Marty
37dbaadbcc
Merge pull request #4201 from koh6uawi/scroll_select_font_size 
Make the font size selection dialog scrollable
 2021-10-12 18:33:11 +02:00
Benoit Marty
13ec4db8a2
Merge pull request #4215 from vector-im/feature/ons/fix_voice_message_resend 
Voice message - Do not delete file to be able to resend
 2021-10-12 18:30:03 +02:00
Onuray Sahin
39d92d8559 To be able to resend, stop all voice actions without deleting. 2021-10-12 17:53:56 +03:00
Benoit Marty
6c915ea4d1 Cleanup the PR about presence 2021-10-12 16:45:41 +02:00
Benoit Marty
923bc00dcd
Merge branch 'develop' into feature/aris/presence 2021-10-12 15:22:40 +02:00
koh6uawi
c9f69b3fc5 Move XML namespaces to root element 2021-10-12 15:12:26 +02:00
koh6uawi
da28ddfabd Use "wrap_content" instead of "match_parent" 
Fix a linter error
 2021-10-12 15:10:33 +02:00
Benoit Marty
efc1e9b87c
Merge pull request #4217 from vector-im/sync-emojis 
Sync Emojis
 2021-10-12 14:54:36 +02:00
Benoit Marty
36d2f8e46b
Merge pull request #4228 from vector-im/feature/adm/suspending_add_pusher 
Improved /settings/notifications push toggle error handling
 2021-10-12 14:50:01 +02:00
Benoit Marty
b6c483fff0
Merge pull request #4225 from vector-im/feature/adm/delaying-first-sync-until-foreground 
Fixing unexpected sync occurring in background
 2021-10-12 14:31:57 +02:00
Benoit Marty
e3034e5d11
Merge pull request #4190 from vector-im/feature/fga/mavericks_2 
Feature/fga/mavericks 2
 2021-10-12 14:11:00 +02:00
Adam Brown
786dec5dc0 observing both the email pushers and email pids so that displayed email pushers are always in sync 2021-10-12 12:49:39 +01:00
ganfra
a24a9b43fa Mavericks 2: make the UT happy. Let SDK exposes MatrixCoroutineDispatchers. 2021-10-12 13:47:32 +02:00
Adam Brown
bd51eae741 refreshing the threePids when entering the preference screen, afterwards we're monitoring for changes 2021-10-12 11:44:30 +01:00
Adam Brown
1c1424eafc using verb prefix for http pusher creation function 2021-10-12 11:39:14 +01:00
Adam Brown
e24329e139 reusing the transactional logic for the current session notifications toggle 
- uses the synchronous token registering which also means we get error handling
 2021-10-12 11:39:14 +01:00
Adam Brown
6c9fcc0d93 extracting the add pusher logic for the worker and delegating to the task from the worker 2021-10-12 11:39:14 +01:00
Adam Brown
b7a54ead68 delaying the first sync until the first process onStart event 
- fixes push notifications starting the polling sync thread when the application is created due to push
 2021-10-12 09:47:17 +01:00
Alex Baker
42cbdf0a6c Dont set person on sent message notification 
Signed-off-by: Alex Baker <alex@beeper.com>
 2021-10-11 14:42:22 -05:00
ganfra
a26e43e90c Mavericks 2: clean after PR review 2021-10-11 17:31:27 +02:00
ariskotsomitopoulos
ccc4a43737 Sync Emojis 2021-10-11 14:13:18 +00:00
Onuray Sahin
13aee7d162 Do not delete voice message file to be able to resend. 2021-10-11 16:49:15 +03:00
Benoit Marty
6520729343 ktlint 2021-10-11 14:41:40 +02:00
Benoit Marty
f89a32da1f Add opt-in for kotlinx.coroutines annotations 2021-10-11 14:27:55 +02:00
Benoit Marty
6721669d1d Fixes false positive "This is an internal Mavericks API. It is not intended for external use." 
of MvRx `by viewModel()` calls. Maybe due to the inlining of code... This is a temporary fix...
 2021-10-11 14:27:45 +02:00
SpiritCroc
57a9ea4617 Merge tag 'v1.3.3' into sc 
Change-Id: Ie2c7157dba2c23916e99669ee5c3705c2f6cea30
 2021-10-11 12:42:06 +02:00
Benoit Marty
737a290841
Merge pull request #4210 from vector-im/feature/aris/issue_908_user_completion_picket 
Feature/aris/issue 908 user completion picket
 2021-10-11 12:31:30 +02:00
Benoit Marty
343783f807 Version++ 2021-10-11 12:06:51 +02:00
Benoit Marty
2c8e171911
Merge pull request #4208 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-10-11 11:29:27 +02:00
ariskotsomitopoulos
a2c790b4a1 Update to support the whole typing name 2021-10-11 12:29:00 +03:00
ariskotsomitopoulos
506dfe5fea Adding trailing space " " or ": " if the user started a sentence by mentioning someone, 2021-10-11 11:46:37 +03:00
SpiritCroc
9d43b3cb8b Automatic SchildiChat string correction 
Change-Id: Id7fefdb679b8ea85958c514395b68aea1ca9b969
 2021-10-11 10:39:17 +02:00
discapacidad5
db0e47b133 Translated using Weblate (Spanish) 
Currently translated at 100.0% (2669 of 2669 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es/
 2021-10-11 08:39:01 +00:00
SpiritCroc
ba2ed623c2 [merge-fixup] Fix our send button behaviour 
Change-Id: I119132f0423bf4884e37e4b9f9e5cd204949b269
 2021-10-11 10:38:40 +02:00
Benoit Marty
d309c71d83 Disable Android Auto supports see https://github.com/vector-im/element-android/issues/4205 2021-10-11 10:21:42 +02:00
SpiritCroc
dffc0c1d65 Merge tag 'v1.3.2' into sc 
Change-Id: I7faf88b02994b10027bbbd00b7ac565a94381cc5

Conflicts:
	.gitignore
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
	vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.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/RoomDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.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/filtered/FilteredRoomFooterItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
 2021-10-11 09:55:26 +02:00
koh6uawi
1069e990e5
Merge branch 'vector-im:develop' into scroll_select_font_size 2021-10-11 00:19:46 +02:00
Linerly
06e1cfd631 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (2669 of 2669 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2021-10-10 14:36:58 +00:00
sr093906
4ffb30ec4f Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (2669 of 2669 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2021-10-10 13:25:51 +00:00
Ihor Hordiichuk
fbec4c305e Translated using Weblate (Ukrainian) 
Currently translated at 91.3% (2438 of 2669 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-10-10 13:25:49 +00:00
Besnik Bleta
820eedc7a3 Translated using Weblate (Albanian) 
Currently translated at 99.4% (2653 of 2669 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
 2021-10-10 13:25:49 +00:00
lvre
30cc056b61 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2669 of 2669 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2021-10-10 13:25:48 +00:00
Szimszon
16068d8214 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2669 of 2669 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2021-10-10 13:25:47 +00:00
Danial Behzadi
51c83f8bf4 Translated using Weblate (Persian) 
Currently translated at 100.0% (2669 of 2669 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2021-10-10 13:25:46 +00:00
Priit Jõerüüt
fe4475c430 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2669 of 2669 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2021-10-10 13:25:44 +00:00
discapacidad5
fdc3da979e Translated using Weblate (Spanish) 
Currently translated at 98.6% (2632 of 2669 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es/
 2021-10-10 13:25:43 +00:00
SpiritCroc
fb34e6fd94 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: If0508074a99f00adef86d0d5d2b1cd827ffeb7ed
 2021-10-08 18:50:23 +02:00
ganfra
2a29243298 Mavericks 2: clean code, but have warnings 2021-10-08 16:45:29 +02:00
Benoit Marty
3a387c5e32 version++ 2021-10-08 16:36:48 +02:00
Benoit Marty
612f0c77ea Wait a bit more 2021-10-08 16:26:36 +02:00
Benoit Marty
0a0dd4ee1b Fix crash when opening Identity Server detail from preference 2021-10-08 16:16:35 +02:00
Benoit Marty
66d4a48930 Remove unused strings 2021-10-08 15:07:52 +02:00
Benoit Marty
090273da14 Fix lint error 2021-10-08 14:55:50 +02:00
Weblate
5c5fc767a4 Merge branch 'origin/develop' into Weblate. 2021-10-08 12:27:26 +00:00
Slimane Selyan AMIRI
5a5832dab7 Translated using Weblate (Kabyle) 
Currently translated at 81.0% (2154 of 2658 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/kab/
 2021-10-08 12:27:19 +00:00
Ihor Hordiichuk
bf219856a5 Translated using Weblate (Ukrainian) 
Currently translated at 91.7% (2440 of 2658 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-10-08 12:27:18 +00:00
LinAGKar
999a08c0f5 Translated using Weblate (Swedish) 
Currently translated at 98.4% (2617 of 2658 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2021-10-08 12:27:13 +00:00
ganfra
c66d6aab5c Timeline: dispatch update on a background thread 2021-10-08 12:55:37 +02:00
ganfra
3bdf264a53 Merge develop into feature/fga/mavericks_2 2021-10-08 10:49:43 +02:00
SpiritCroc
2eec10a0c9 Increment version 
Change-Id: I59493d232f89b6d61d442993b6a260c4d5e578b3
 2021-10-08 08:49:37 +02:00
koh6uawi
56b0b28d5e Make "Select text size" dialog scrollable 
Wrap the LinearLayout inside a ScrollView.
 2021-10-08 01:59:13 +02:00
Benoit Marty
d6af355335
Merge pull request #4184 from vector-im/feature/adm/is-policy 
Always display identity server policies
 2021-10-07 20:53:03 +02:00
Adam Brown
5365e87777 reducing the discovery policy url text size by using caption style 2021-10-07 17:56:54 +01:00
Adam Brown
cb7260954a renaming xml view to avoid clashing with other file 2021-10-07 17:46:33 +01:00
Adam Brown
259b6d56d7 using singular for the policy copy name to match content 2021-10-07 17:45:30 +01:00
Adam Brown
d00858f83b handling empty policy list by showing empty copy 2021-10-07 17:44:54 +01:00
Adam Brown
cccda9b699 using single action for the updating the policy expanded toggling/state setting 2021-10-07 17:29:50 +01:00
ganfra
79ec0591d2 Mavericks 2: continue removing rx 2021-10-07 15:32:57 +02:00
Adam Brown
496a531072 reverting uneedeed text item changes 2021-10-07 13:57:56 +01:00
Adam Brown
791c92c991 launching the discovery page with policy expanded when tapping the policy link from the consent dialog 2021-10-07 13:54:36 +01:00
Adam Brown
7b5972e3cf expanding the discovery polices on recieving a custom payload 
- also meant updating the general link to discovery in order to manually pass the default arguments
 2021-10-07 13:50:43 +01:00
Adam Brown
728f34f53c converting the settings activity payload to a sealed class, this allows us to have custom arguments for the sub settings pages 2021-10-07 13:07:30 +01:00
Adam Brown
05166944d8 navigating to the settings discovery page on policy link clicked from non discovery screens 2021-10-07 12:45:59 +01:00
Adam Brown
c0fd266fc4 using consistent naming for the policy and opening a chrome tab when policy is tapped 2021-10-07 12:39:48 +01:00
ganfra
acf3b84781 Mavericks 2: migrate UserListViewModel 2021-10-07 12:24:08 +02:00
Erik Huizinga
64fb94691b Translated using Weblate (Dutch) 
Currently translated at 65.1% (1732 of 2658 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
 2021-10-07 09:25:39 +00:00
Adam Brown
2f732affa5 updating policy title to include show/hide 2021-10-07 10:15:37 +01:00
ganfra
362ebcbe42 Revert "Mavericks 2: remove matrix-sdk-android-flow as it will be easier when entirely migrating to flow" 
This reverts commit d9b02a20d8.
 2021-10-07 11:11:44 +02:00
Adam Brown
7e8ca29ca7 creating dedicated discovery policy items and displaying within an expandable form item 2021-10-07 10:09:03 +01:00
Benoit Marty
f5cda678b2
Merge pull request #4177 from vector-im/feature/fga/temporary_dial_pad_fix 
Fix SIP user to native user mapping is wrong
 2021-10-07 10:10:48 +02:00
dependabot[bot]
c55598a099
Bump libphonenumber from 8.12.33 to 8.12.34 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.33 to 8.12.34.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.33...v8.12.34)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-06 23:07:32 +00:00
ganfra
0125c7675d Fix SIP user to native user mapping is wrong #4176 (also clear dialpad entry when call is started) 2021-10-06 19:34:04 +02:00
Adam Brown
3111d0b46d updating discovery consent dialog to include policy link which expands the policy urls view 2021-10-06 17:34:02 +01:00
Adam Brown
5a4f320bf9 binding the expanded state as part of the view, allows us to manually control the expansion 2021-10-06 17:20:20 +01:00
Adam Brown
7ce811c227 binding the indentity server policy urls to the discovery page 2021-10-06 17:20:06 +01:00
ariskotsomitopoulos
e4c3457f37 Add public room indicator to RoomDetailFragment & RoomProfileFragment 2021-10-06 19:08:27 +03:00
Adam Brown
04d844b1a9 allowing the expandable scrollbar to be hidden 2021-10-06 16:10:17 +01:00