filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,665 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

6087 Commits

Author SHA1 Message Date
Benoit Marty 2709c1e99b
Merge pull request #3321 from vector-im/dependabot/gradle/com.google.firebase-firebase-messaging-22.0.0 
Bump firebase-messaging from 21.1.0 to 22.0.0
 2021-05-12 16:49:27 +02:00
Benoit Marty dfc8860ade Fix avatar sample after PR merge 2021-05-12 16:43:46 +02:00
Benoit Marty 87953e7150
Merge pull request #3310 from vector-im/feature/bma/samples 
Improve layout preview regarding avatars
 2021-05-12 16:36:33 +02:00
SpiritCroc 808e381e09 No need to give spaces feedback to us 
Change-Id: Ie169ddff49368e0871036403ff0fab1ccea74f9a
 2021-05-12 16:29:36 +02:00
SpiritCroc 077e1b6896 Fix compile after merge 
Change-Id: I499115f40f75f07cdd0e42dafa2b17695d27e9b5
 2021-05-12 16:16:20 +02:00
SpiritCroc 5c68ccf67d Automatic SchildiChat string correction 
Change-Id: I5dff99fe89769fe352b2ff8d9f7c6b2814d48862
 2021-05-12 16:01:51 +02:00
SpiritCroc db6cfd3054 Merge tag 'v1.1.7' into sc 
Change-Id: Icefe721894c7cd3d0702d07efbd0452f95775d32

Conflicts:
	.idea/codeStyles/Project.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/values-ca/strings.xml
	vector/src/main/res/values-cs/strings.xml
	vector/src/main/res/values-de/strings.xml
	vector/src/main/res/values-et/strings.xml
	vector/src/main/res/values-fa/strings.xml
	vector/src/main/res/values-fr/strings.xml
	vector/src/main/res/values-it/strings.xml
	vector/src/main/res/values-sq/strings.xml
	vector/src/main/res/values-sv/strings.xml
	vector/src/main/res/values-vi/strings.xml
	vector/src/main/res/values-zh-rTW/strings.xml
	vector/src/main/res/values/strings.xml
	vector/src/main/res/xml/vector_settings_labs.xml
 2021-05-12 16:01:36 +02:00
SpiritCroc 51b4ebdda7 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I8f600d6c60e381d3948645ebe77b35bbc6dc5ae8
 2021-05-12 15:45:49 +02:00
SpiritCroc 2269e0f1ed Merge branch 'spaces' into sc 
Change-Id: Ia2a25202fab4e5be3c4800bb5cb6ab47fc828bac
 2021-05-12 15:44:01 +02:00
Benoit Marty a42a9b5e32 Version++ 2021-05-12 15:15:24 +02:00
Benoit Marty 72e343ad5a Better wording 2021-05-12 14:26:20 +02:00
Benoit Marty 6af9fda7df Fix lint issue 2021-05-12 14:06:59 +02:00
Benoit Marty 5d052cda79 Increase clickable area (no layout rendering change) 2021-05-12 13:55:47 +02:00
Benoit Marty 0d5b66f92b Flatten View hierarchy 2021-05-12 13:53:03 +02:00
Valere 391e952fbd Review + design update 2021-05-12 12:23:14 +02:00
Valere df3d3b63c8 Code review 2021-05-12 11:04:54 +02:00
Valere aefcb4841b Cleaning 2021-05-12 10:47:52 +02:00
Valere eb18b23528 Add option to send beta feedback 2021-05-12 10:47:52 +02:00
Benoit Marty 03f2b516a0 Please the code quality checker 2021-05-12 10:17:33 +02:00
Benoit Marty 56d0699bc7
Merge pull request #3312 from vector-im/feature/bca/spaces_polish 
Spaces various fixes and polish
 2021-05-12 10:09:36 +02:00
Valere 1799dcbd0c Fix lint 2021-05-12 09:20:55 +02:00
Jeanne Lavoie 8e28b31170 Translated using Weblate (French) 
Currently translated at 99.5% (2442 of 2454 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2021-05-12 06:07:14 +00:00
dependabot[bot] 3ddf181224
Bump firebase-messaging from 21.1.0 to 22.0.0 
Bumps firebase-messaging from 21.1.0 to 22.0.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-12 05:58:36 +00:00
Valere 0de56e2993 Code Review 2021-05-11 19:11:15 +02:00
Valere eb9fadaebf user error when no space support on HS 
remove buggy separators on add room; design update
 2021-05-11 17:34:55 +02:00
Valere 91d8ee2a81 Space panel room ordering 2021-05-11 14:45:30 +02:00
SpiritCroc e9e522603d Message footer: handle small width/height pictures 
Change-Id: Ib8554c5057f09277cb9ef2a29a57d3a85cf35417
 2021-05-11 12:21:41 +02:00
Valere f9820cde58 Fixes on unread badges 2021-05-11 11:36:17 +02:00
Valere 14144dc99d Default all in home + lab flag 2021-05-11 10:45:07 +02:00
Valere 24a32f2b7e Subspace more hierarchy depth + fix bad notification count 2021-05-11 10:07:34 +02:00
Weblate d9ffff70a6 Merge branch 'origin/develop' into Weblate. 2021-05-11 07:55:27 +00:00
Hivaa 631d8510ed Translated using Weblate (Persian) 
Currently translated at 100.0% (2438 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2021-05-11 07:53:01 +00:00
Michael Sasser 4e28de2107 Translated using Weblate (German) 
Currently translated at 99.5% (2428 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-05-11 07:52:56 +00:00
Philipp Neumann f7d7362a85
Merge branch 'develop' into feature/conversations 2021-05-11 09:41:04 +02:00
Valere 1ec08bec07 Fix spaces add room via server 2021-05-11 08:18:37 +02:00
Benoit Marty 3a746cf23a Split sample step 3: rooms and spaces 2021-05-10 23:07:08 +02:00
Benoit Marty 2b632a2d52 Split sample step 2: messages 2021-05-10 22:53:51 +02:00
Benoit Marty e34574f658 Split sample step 1 2021-05-10 22:51:07 +02:00
Benoit Marty 1b0b5e4ff0 Make the avatar matches the user 2021-05-10 22:45:08 +02:00
Benoit Marty cf00cc2fda Fix issue with margin change 2021-05-10 22:34:42 +02:00
Benoit Marty 0cd1d57fc0 Avoid using @tools:sample/full_names 
And make preview works for some text
 2021-05-10 22:34:42 +02:00
Benoit Marty 3e66988b6a Use round room and user avatars and rounded corner space avatar 2021-05-10 22:34:42 +02:00
Benoit Marty 5631a4714e Use built in sample 2021-05-10 20:27:23 +02:00
Valere 723f7cc326 VectorEpoxyHolder Form Ext 2021-05-10 20:01:17 +02:00
Valere 80366ee938 Code review 2021-05-10 20:01:17 +02:00
Valere 31b6d9844b Cleaning 2021-05-10 20:01:17 +02:00
Valere f9e608a790 Manage Spaces as Admin 2021-05-10 20:01:17 +02:00
Valere 5be3faf914 Epoxy Form fixes 2021-05-10 19:59:04 +02:00
Benoit Marty e6d4f9a1dc
Merge pull request #3298 from vector-im/feature/ypi/join_rules 
Add joinRules field to RoomSummary
 2021-05-10 19:54:44 +02:00
Benoit Marty 0e0cfababf
Merge pull request #3308 from vector-im/feature/fga/fix_timeline_read_marker 
Fix read marker visibility/position when filtering some events
 2021-05-10 19:54:19 +02:00
Benoit Marty 7ec44a5542
Merge pull request #3290 from vector-im/feature/bca/spaces_various_fixes 
Various fixes on spaces explore
 2021-05-10 19:52:45 +02:00
ganfra 525cd3edd7
Merge branch 'develop' into feature/fga/fix_timeline_read_marker 2021-05-10 17:33:52 +02:00
Valere f1919be197 code review 2021-05-10 17:15:02 +02:00
ganfra 581847e5c1 Fix read marker visibility/position when filtering some events 2021-05-10 16:53:52 +02:00
Onuray Sahin 0f8a641510 Code review fixes. 2021-05-10 17:38:40 +03:00
Onuray Sahin e74f4d570d Lint fix. 2021-05-10 17:22:32 +03:00
Valere a272f4d4c6 Remove dead code 2021-05-10 15:48:06 +02:00
Onuray Sahin 87d35958c6 Allow inviting users even if profile information cannot be retrieved. 2021-05-10 16:34:30 +03:00
Valere 01ec263ff3 Fix deprecation warning 2021-05-10 14:59:38 +02:00
Benoit Marty d760d6c25b Iterate with design team 2021-05-10 14:23:36 +02:00
SpiritCroc 1481a3edd3 Improve handling of DM layout 
Previously, it could happen that DM-layout and non-DM-layout were mixed
in the same chat for following reasons:
- on purpose, when it is a DM, but in the past had messages by a third
  party
- not on purpose, when the room member information wasn't loaded in time
  for some messages, and thus the fallback assumed showing DM layout
  wasn't safe

However, this leads to an inconsistent layout, which looks bad.
Accordingly, this patch changes the behaviour as following:
- always use the DM layout for chats marked as DM
- if it is not clear if the message was sent by the actual DM partner,
  show the name (as opposed to previously: show name and avatar).

While this makes it more difficult to tell apart messages from the DM
partner and a third person, it is still possible, since the third person
has a name shown, and the DM partner's messages start with a bubble with
tail but without name. This is prefered to the previous solution, which
looked rather buggy than anything else.

Change-Id: I7c3e5ca7b04acec6eede345a9abde833ce0714d3
 2021-05-10 10:25:28 +02:00
Valere 5e2c3239ea Code review 2021-05-10 10:21:43 +02:00
LinAGKar d42a4bb5ee Translated using Weblate (Swedish) 
Currently translated at 100.0% (2438 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2021-05-09 19:34:31 +00:00
Marek e951b2097d Translated using Weblate (German) 
Currently translated at 97.4% (2376 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-05-09 19:34:29 +00:00
Philipp Neumann 1db2d05ee4 linter corrections and added line to changes 2021-05-08 14:53:54 +02:00
Philipp Neumann f1ba8b96c9 added import 2021-05-08 14:12:20 +02:00
Benoit Marty 87b12b7e11 Add the public icon on the rooms in the room list (#3292) 2021-05-07 16:41:30 +02:00
SpiritCroc 5a8f637e58 Don't stretch image to sender name 
Change-Id: I805e0359aedce07253cde1b84dc225f079efba1e
 2021-05-07 14:58:00 +02:00
LinAGKar 3d613c003d Translated using Weblate (Swedish) 
Currently translated at 99.3% (2421 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2021-05-07 12:34:29 +00:00
SpiritCroc 0c6e02b76d Properly adjust image view bounds when size not available before loading 
Change-Id: I8283354afebb7cd427b96953fe9f90b1063d23b9
 2021-05-07 09:30:48 +02:00
SpiritCroc 1afce468da Add some padding between message sender/date top line and content 
Change-Id: I9a43c889e4177480252d525e310da0e488f7b2c3
 2021-05-06 18:30:22 +02:00
SpiritCroc 12e7bb64fe Move footer overlay 1dp inside to not cut outline 
Change-Id: I95e2e8e8e5605586a7891b3ef2bf4c002a04873c
 2021-05-06 18:09:20 +02:00
SpiritCroc 42e6068ce2 Outline pictures 
Closes https://github.com/SchildiChat/SchildiChat-android/issues/49

Change-Id: I3119db2d62e1c924870cd57f19bf21e3fa1bb72f
 2021-05-06 17:53:33 +02:00
Benoit Marty fb0205e903 Exchange fun name :) 2021-05-06 14:28:27 +02:00
Quang Trung e2682b6082 Translated using Weblate (Vietnamese) 
Currently translated at 18.7% (456 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
 2021-05-06 11:34:30 +00:00
LinAGKar 728356fdeb Translated using Weblate (Swedish) 
Currently translated at 99.1% (2418 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2021-05-06 11:34:28 +00:00
Valere 19223826fe Various fixes on spaces explore 
+ MxTo bottom sheet Fix regression when using state button
 2021-05-06 11:54:26 +02:00
Benoit Marty 096e95f9da
Merge pull request #3279 from vector-im/feature/bca/space_beta_people 
Spaces | beta Browsing Member Directory In Space
 2021-05-06 10:38:40 +02:00
Benoit Marty 89d71ceedc
Merge pull request #3283 from vector-im/feature/bca/spaces_fix_notif_filter 
Fix unread badges and invite filtering
 2021-05-06 10:36:09 +02:00
dependabot[bot] 711dfe41b7
Bump media from 1.3.0 to 1.3.1 
Bumps media from 1.3.0 to 1.3.1.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-06 07:11:17 +00:00
Benoit Marty 4864137fa1 Properly clean the back stack if the user cancel registration when waiting for email/msisdn validation 2021-05-05 23:13:56 +02:00
Valere efe5176286 rename activeSpaceId to activeSpaceFilter 2021-05-05 22:36:27 +02:00
Valere 506870302e Fix unread badges and invite filtering 2021-05-05 22:12:29 +02:00
Benoit Marty ea93261b83 Fix close icon color in dark theme 2021-05-05 18:51:43 +02:00
Benoit Marty 908e7be2ba Create a GenericIdArgs instead of using unrelated GenericIdArgs - fix crash 2021-05-05 18:36:33 +02:00
Benoit Marty cdb3d7c308 Create a GenericIdArgs instead of using unrelated GenericIdArgs 2021-05-05 18:22:16 +02:00
Benoit Marty ea3abee63a Format 2021-05-05 18:12:45 +02:00
Benoit Marty 961f3bcd19 More cleanup and split into several files 2021-05-05 18:09:29 +02:00
Benoit Marty 2acfb29416 Some cleanup 2021-05-05 17:54:56 +02:00
Valere 99d4471799 space beta people screen 2021-05-05 17:54:56 +02:00
Benoit Marty b09e509db7
Merge pull request #3259 from vector-im/feature/bca/spaces_advertise_beta 
Invite bottom sheet + fixes + beta tag
 2021-05-05 16:26:54 +02:00
Benoit Marty 17e57fe86c Fix small issue 2021-05-05 16:24:47 +02:00
Valere 168633b466 Code review 2021-05-05 14:55:02 +02:00
Valere ecceb0fb03 code review 2021-05-05 11:33:28 +02:00
Valere b9b3832ee3 Invite bottom sheet + fixes + beta tag 2021-05-05 11:33:28 +02:00
LinAGKar 51ea772579 Translated using Weblate (Swedish) 
Currently translated at 99.0% (2416 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2021-05-05 08:34:50 +00:00
Besnik Bleta abd8e987b8 Translated using Weblate (Albanian) 
Currently translated at 99.4% (2425 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
 2021-05-05 08:34:49 +00:00
Andrejs 0d041cbf11 Translated using Weblate (Latvian) 
Currently translated at 84.1% (2051 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
 2021-05-05 08:34:43 +00:00
Vancha 89a08ca2a0 Translated using Weblate (Frisian) 
Currently translated at 23.5% (573 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fy/
 2021-05-05 08:34:42 +00:00
Thibault Martin e4e9707ab7 Translated using Weblate (French) 
Currently translated at 99.9% (2437 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2021-05-05 08:34:32 +00:00
libexus 42b8f74f5e Translated using Weblate (German) 
Currently translated at 97.4% (2375 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-05-05 08:34:28 +00:00
dependabot[bot] 314ace9208
Bump konfetti from 1.2.6 to 1.3.2 
Bumps [konfetti](https://github.com/DanielMartinus/Konfetti) from 1.2.6 to 1.3.2.
- [Release notes](https://github.com/DanielMartinus/Konfetti/releases)
- [Commits](https://github.com/DanielMartinus/Konfetti/compare/v1.2.6...v1.3.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-05 07:12:55 +00:00
Benoit Marty 9e4f1147f4 Fix an issue with the layout dialog_photo_or_video.xml on Dark theme. Light theme does not use .Bridge, so no reason to use it for Dark theme. 
I hope there will be no regression though...
 2021-05-04 23:26:06 +02:00
Benoit Marty fb42b869dd Fix false positive with lint 2021-05-04 17:31:04 +02:00
Benoit Marty edbfc2e2e9 Add details about events with attachment in the bottomsheet 2021-05-04 13:50:49 +02:00
Benoit Marty 12c4f3c6f7 Fix video thumbnail not displayed in when replying and in bottom sheet 
Also create some extensions for future use
 2021-05-03 21:14:06 +02:00
Benoit Marty f7949100a7 Sent video does not contains duration (#3272) 
When using the file picker (and not the media picker).
Now when using the file picker, we detect the mime type and we send the correct event
Also some code duplication
 2021-05-03 21:14:06 +02:00
Benoit Marty d9ffce7e0d Add option to record a video from the camera 
Replace #2411
 2021-05-03 21:13:47 +02:00
Benoit Marty 30a54cfdbc User can now select video when selecting Gallery to send attachments to a room 2021-05-03 21:13:47 +02:00
Benoit Marty 570cffd3ed Fix small copy paste error 2021-05-03 21:13:47 +02:00
Benoit Marty e510de1ccc Display video/image compression progress 2021-05-03 21:13:47 +02:00
Benoit Marty d6b6768f41 Cleanup 2021-05-03 21:13:47 +02:00
Benoit Marty e108534a2a Improve file too big error detection and rendering (#3245) 2021-05-03 21:13:47 +02:00
Benoit Marty 4a23d31271 Fix regression on sending error indicator color 2021-05-03 21:13:47 +02:00
Benoit Marty 8ff65b3816 Add a video indicator on the miniature (videos are now previewable) 2021-05-03 21:13:47 +02:00
Benoit Marty 5e1c503d2e Compress video before sending (#442) 2021-05-03 21:13:47 +02:00
Hakim Oubouali d3316a1ce8 Translated using Weblate (Central Atlas Tamazight) 
Currently translated at 4.1% (100 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/tzm/
 2021-05-03 08:04:34 +00:00
Sven Grewe accea83fb0 Translated using Weblate (German) 
Currently translated at 97.3% (2374 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-05-03 08:04:32 +00:00
Zet d744d1c6e8 Translated using Weblate (Arabic) 
Currently translated at 37.6% (917 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
 2021-05-03 08:04:31 +00:00
Auri B. P 318fbcd4f6 Translated using Weblate (Catalan) 
Currently translated at 97.2% (2371 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
 2021-05-03 08:04:31 +00:00
Vancha a77bcb5492 Translated using Weblate (Frisian) 
Currently translated at 17.6% (430 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fy/
 2021-05-03 08:04:29 +00:00
Priit Jõerüüt 9d81252e7b Translated using Weblate (Estonian) 
Currently translated at 100.0% (2438 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2021-05-03 08:04:00 +00:00
zeritti ba1c50e2ee Translated using Weblate (Czech) 
Currently translated at 100.0% (2438 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2021-05-03 08:03:54 +00:00
LinAGKar 81213b07bb Translated using Weblate (Swedish) 
Currently translated at 98.4% (2399 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2021-05-03 08:03:46 +00:00
Thibault Martin 6bc7ee0d96 Translated using Weblate (French) 
Currently translated at 97.8% (2386 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2021-05-03 08:03:42 +00:00
Jeff Huang 9e1a24eaf9 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2438 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2021-05-03 08:03:39 +00:00
random 01d857bbce Translated using Weblate (Italian) 
Currently translated at 100.0% (2438 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2021-05-03 08:03:31 +00:00
SpiritCroc a66d6c42b5 Checkbox: use accent color instead of hardcoded element color 
Change-Id: Ie618e37577e9e3aa101c627ca5dd10a3b77332e4
 2021-05-02 12:40:38 +02:00
SpiritCroc 39bc0829ad Automatic SchildiChat string correction 
Change-Id: I4896c92d638952c21079bea153d72c4792405b41
 2021-05-02 12:13:18 +02:00
SpiritCroc fb2c41cb21 Automatic color correction 
Change-Id: I3c041cc23e768ed2479143ec573e9d9243228f42
 2021-05-02 12:13:16 +02:00
SpiritCroc 39359f7d24 Merge remote-tracking branch 'upstream/develop' into spaces 
Change-Id: I10235a7a808ae66f5b00ad2e58c2aedf395e8e25

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt
	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/room/summary/RoomSummaryDataSource.kt
	vector/build.gradle
	vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt
	vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.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/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
 2021-05-02 12:12:52 +02:00
SpiritCroc a70d94c81e Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I47b13444500e027ab4f6f560c9c529549e9f355b
 2021-05-02 10:13:16 +02:00
SpiritCroc ca21a3fc43 Increment version 
Change-Id: I046fe728801113e31b8590f7b18422d0f9f85fba
 2021-05-02 10:03:17 +02:00
SpiritCroc e3204c32a1 Fix updating read marker automatically 
Co-authored-by: Benoit Marty <benoitm@matrix.org>
 2021-05-01 13:33:53 +02:00
SpiritCroc 35a9c8a12f Fix updating read marker automatically 
Change-Id: I84a51127dc7b434622ecdcab350c788ee3d623be
 2021-05-01 11:56:03 +02:00
SpiritCroc 3ee98f3c94 Fix missing sender information after edits 
Fixes https://github.com/vector-im/element-android/issues/3184

Change-Id: I27de01c29b31fbd49c8d2b0d4dacf13ba932d5b9
 2021-05-01 11:56:03 +02:00
SpiritCroc 47aa787ecb Fix missing sender information after edits 
Fixes https://github.com/vector-im/element-android/issues/3184
 2021-05-01 10:11:15 +02:00
Benoit Marty c4a4a5d41c
Merge pull request #3258 from vector-im/feature/bma/fix_3250 
Delete and react to stickers (#3250)
 2021-04-30 18:11:55 +02:00
Benoit Marty 589be8b15f
Update vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt 2021-04-30 11:56:45 +02:00
Benoit Marty 6180076512 Delete and react to stickers (#3250) 2021-04-30 11:14:36 +02:00
dependabot[bot] 5a53838194
Bump PhotoView from 2.1.4 to 2.3.0 
Bumps [PhotoView](https://github.com/Baseflow/PhotoView) from 2.1.4 to 2.3.0.
- [Release notes](https://github.com/Baseflow/PhotoView/releases)
- [Commits](https://github.com/Baseflow/PhotoView/compare/2.1.4...2.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-30 07:06:20 +00:00
Toby Murray 33337bd772 Allow cleartext to some LAN domains 
This functionality exists in the desktop client, so hoping to mirror that as much as Android allows

This addresses a number of the use cases touched on in #1793. Enabling clear text to various official and standard LAN-only domains means it's easier to develop the Android application, as a Matrix server can be deployed locally without much fuss anywhere on the developer's LAN. This can reduce the reliance on a DNS or SSL certificates when neither are really relevant to the functionality of the client/server. In particular, managing SSL certs without a public domain is a pain in the butt.

At the same time, this does not significantly diminish the security of Element Android, as at the current time these domains are either explicitly not valid TLDs or conventionally not TLDs (so would be an unexpected change if they were to become so). In the event e.g. `.home` becomes a TLD, it would be appropriate to remove it from this list.
 2021-04-30 00:47:57 -04:00
Benoit Marty 38e83e1f35
Merge pull request #3249 from vector-im/feature/bma/fixwl 
Feature/bma/fixwl
 2021-04-29 20:55:22 +02:00
Benoit Marty 5d9d984c73
Merge pull request #3235 from vector-im/feature/bca/spaces_justme_beta 
Just me spaces support
 2021-04-29 17:47:19 +02:00
Benoit Marty 90f4a9490d Fix lint issues 2021-04-29 17:33:14 +02:00
Benoit Marty d28c6039c0 Fix issue in string template 2021-04-29 17:06:46 +02:00
Benoit Marty bea9abd9a6
Merge pull request #3248 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-04-29 17:05:00 +02:00
Benoit Marty b3ac1a1e8b Using /register/available also fixes #1410 
(See https://github.com/matrix-org/synapse/pull/7625)
 2021-04-29 17:02:14 +02:00
Benoit Marty c09f7e0d7d Fix compilation issue after rebase 2021-04-29 16:10:52 +02:00
Benoit Marty 258a378f39 Add back link to learn more on EMS 2021-04-29 15:57:52 +02:00
Benoit Marty 63a59dbc0c Defensive code against invalid userId 2021-04-29 15:57:52 +02:00
Benoit Marty ef55ddd683 Do not repeat password fields for account creation or reset password 2021-04-29 15:57:52 +02:00
Benoit Marty d235d1be15 More improvements 2021-04-29 15:57:52 +02:00
Benoit Marty 6e9c16a889 Naming convention 2021-04-29 15:57:52 +02:00
Benoit Marty 5d65a290d2 Bugfix 2021-04-29 15:57:52 +02:00
Benoit Marty af3893cdc9 Bugfix 2021-04-29 15:57:52 +02:00
Benoit Marty 4486181669 Sort social logins buttons 2021-04-29 15:57:52 +02:00
Benoit Marty 7117427686 Bugfix 2021-04-29 15:57:52 +02:00
Benoit Marty f0433fd27d Fix issue after rebase 2021-04-29 15:57:52 +02:00
Benoit Marty d812ed72d0 Improve layout and add a fake date 2021-04-29 15:57:52 +02:00
Benoit Marty 2d7bface27 Better solution 2021-04-29 15:57:52 +02:00
Benoit Marty faef2fba9a Enable login v2 by default, but keep the possibility to use v1 2021-04-29 15:57:52 +02:00
Benoit Marty adae66aa43 Login UX flow: UI iso 2021-04-29 15:57:22 +02:00
Benoit Marty 51a39909dc Login UX flow: warning if no profile can ba found 2021-04-29 15:57:22 +02:00
Benoit Marty c141b26212 Login UX flow: set avatar and display name after account creation 2021-04-29 15:57:22 +02:00
Benoit Marty 408a0fc010 Login UX flow v2 2021-04-29 15:57:22 +02:00
Benoit Marty 01b0c7a036 Use the navigator to open the LoginActivity 2021-04-29 15:56:25 +02:00
Benoit Marty ab68903d7f Fix wording issue (#3242) 2021-04-29 15:47:31 +02:00
Weblate 79f125cccd Merge branch 'origin/develop' into Weblate. 2021-04-29 13:38:14 +00:00
Benoit Marty 98177da6b1
Merge pull request #3197 from vector-im/feature/bma/crashfix 
WIP - introduce sessionScope
 2021-04-29 15:34:42 +02:00
Benoit Marty 55f1f56fec `master` branch has been renamed to `main` 
Also in project vector-im/jitsi_libre_maven
 2021-04-29 12:29:52 +02:00
Valere 30d7c73b2d code review 2021-04-29 11:56:57 +02:00
Valere f89a7496aa Add action to create new room 2021-04-29 11:51:07 +02:00
Valere 31ffa65fd0 Update add room screen as per design 2021-04-29 11:51:07 +02:00
Valere 7465ac2ef6 Add just me space flow Initial commit 2021-04-29 11:51:07 +02:00
Benoit Marty 264eb3b0a2
Merge pull request #3246 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.22 
Bump libphonenumber from 8.12.21 to 8.12.22
 2021-04-29 11:12:29 +02:00
Benoit Marty e073563a67 Cleanup 2021-04-29 11:10:41 +02:00
ganfra 80b155e042 Refact coroutine session scope 2021-04-29 11:10:41 +02:00
Benoit Marty e5d0a8f3d8 Cleanup 2021-04-29 11:10:41 +02:00
Benoit Marty ecd2d0fb76 Use session scope 2021-04-29 11:10:41 +02:00
Benoit Marty c33da38ddb GlobalScope -> sessionScope 2021-04-29 11:10:41 +02:00
Benoit Marty 0e563596dd Remove useless call to parent method 2021-04-29 11:10:41 +02:00
Benoit Marty 8afa697591 GlobalScope -> sessionScope 2021-04-29 11:10:41 +02:00
Benoit Marty 82ee2567b7 Provide a session scope, to launch coroutines without using the ViewModelScope 
It could be used elsewhere, will change other location in another commit.
 2021-04-29 11:10:41 +02:00
Benoit Marty 95639927a7 Catch Throwable on not only Exception 2021-04-29 11:10:41 +02:00
Benoit Marty 4acc308864
Merge pull request #3190 from vector-im/feature/bma/fix_troubleshoot 
Fix a race condition
 2021-04-29 11:08:00 +02:00
Benoit Marty 751efb57fc
Merge pull request #2840 from vector-im/feature/bca/spaces_sdk 
Spaces support - beta
 2021-04-29 10:18:31 +02:00
dependabot[bot] 7593c3f03d
Bump libphonenumber from 8.12.21 to 8.12.22 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.21 to 8.12.22.
- [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.21...v8.12.22)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-29 07:18:14 +00:00
Vivek K J cacc83bf17 Translated using Weblate (Malayalam) 
Currently translated at 38.7% (915 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ml/
 2021-04-28 16:34:44 +00:00
Line c043e6e958 Translated using Weblate (Latvian) 
Currently translated at 86.8% (2052 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
 2021-04-28 16:34:33 +00:00
Benoit Marty 4d3a02f71f Translated using Weblate (French) 
Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2021-04-28 16:34:26 +00:00
Juhana Uuttu ea645d147d Translated using Weblate (Finnish) 
Currently translated at 79.3% (1875 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fi/
 2021-04-28 16:34:25 +00:00
Benoit Marty b2e6b3f0db Latest cleanup before merging to develop 2021-04-28 16:55:09 +02:00
Benoit Marty c40476aa94 Add ability to install APK from directly from Element (#2381) 
And cleanup `data class OpenFile`
 2021-04-28 15:55:21 +02:00
Benoit Marty 195bc8e914 Fix issue when opening encrypted files (#3186) 
Also always open the file after a successful download
 2021-04-28 15:11:48 +02:00
Benoit Marty 9cb19c0581 Fix issues on Android 11 (#3067) 
Add <queries> tag in manifest to be able to open file using external app and to use full feature of CustomTab
 2021-04-28 14:04:27 +02:00
Valere 8c1afbaa66 Fix / empty space pannel on new accounts 2021-04-28 12:54:19 +02:00
Valere 70476b912f Fix / placeholder in dark time 2021-04-28 11:15:58 +02:00
Valere 7d3d080603 Code review 2021-04-28 11:15:58 +02:00
Valere 872c45d5a3 Fix / kebab menu not always visible in space item 
Bug due to cell reuse not showing back menu
 2021-04-28 11:15:58 +02:00
Valere 3378e23cc2 Add lab flag to use restricted access rule 
Fixes #3226
 2021-04-28 11:15:58 +02:00
Valere 46834d2178 Fix / dm filtering not working when going back to home 2021-04-28 11:15:58 +02:00
Valere 45200572a2 Cleaning 2021-04-28 11:15:58 +02:00
Valere dba6784487 Remove space lab flags 2021-04-28 11:15:58 +02:00
Valere d186b73c90 Fix / last selected space-group not restored after restart 2021-04-28 11:15:58 +02:00
Valere 1ce7085ca9 Merge Space and Communities initial commit 2021-04-28 11:15:58 +02:00
Valere 733d4185c4 Fix / Add unread count in hamburger menu 2021-04-28 11:15:58 +02:00
Valere d42761f98a Fix / Room list empty state flickering 2021-04-28 11:15:58 +02:00
Valere b45585f7c0 Fix / Suggested room section won't collapse 2021-04-28 11:15:58 +02:00
Valere aa74646ddf Fix invited spaced filters rooms out of home + invite not working 2021-04-28 11:15:58 +02:00
Valere 19bb4c6162 Update lab flag label 2021-04-28 11:15:58 +02:00
Valere d30ba9c749 Spaces quick fixes and updates 
Make drawer menu more obvious + fix notification count
 2021-04-28 11:15:58 +02:00
Valere 5e75a3a80b Add placehoders for paged room list 2021-04-28 11:15:58 +02:00
Valere 7921a81b8e better management of collapsing for room controllers 2021-04-28 11:15:58 +02:00
Valere 4d7aeff54a Code review 2021-04-28 11:15:58 +02:00
Valere 8146d8ab1e Add Rooms to space 2021-04-28 11:15:58 +02:00
Valere 5a84456f1f Set guest access in developer mode 2021-04-28 11:15:58 +02:00
Valere 14103b1e7c Radio settings bottomsheet 2021-04-28 11:15:58 +02:00
Valere 1deb44f91f Better DM filtering + fix space member loading 2021-04-28 11:15:58 +02:00
Valere e735aee724 Fix / group switch + refactoring 2021-04-28 11:15:58 +02:00
Valere 6aaf6bdf9b Fix rebase 2021-04-28 11:15:58 +02:00
Valere 49381db2e3 cleaning 2021-04-28 11:15:58 +02:00
Valere 643e7ad3cb Fix initial navigation 2021-04-28 11:15:58 +02:00
Valere 79bde6ee91 Private (me and teamates) space support 2021-04-28 11:15:58 +02:00
Valere bfbd37074e Better tab notification count -incomplete- 2021-04-28 11:15:58 +02:00
Valere a3b9d187ce Fix dm filtering 2021-04-28 11:15:58 +02:00
Valere b635663ae3 Fix suggested rooms 2021-04-28 11:15:58 +02:00
Valere 0d3c2b4bef Fix space filtering 2021-04-28 11:15:58 +02:00
Valere 8a35a786b4 Post rebase fixes 2021-04-28 11:15:58 +02:00
Benoit Marty 0dbd856ac5 UI polishing 
And cleanup
 2021-04-28 11:15:58 +02:00
Benoit Marty 386e06d675 XML standart 2021-04-28 11:15:58 +02:00
Benoit Marty dfae42c912 Cleanup layout 2021-04-28 11:15:58 +02:00
Benoit Marty 4fb248cd9f rename parameter 2021-04-28 11:15:58 +02:00
Benoit Marty a211cc1780 Explode into several files 2021-04-28 11:15:58 +02:00
Benoit Marty fa489c459a Move SharedPreferenceLiveData to another package 2021-04-28 11:15:58 +02:00
Benoit Marty 3c64f78159 Fix issue in layout 2021-04-28 11:15:58 +02:00
Benoit Marty 7c348959cf Cleanup and fix bugs 2021-04-28 11:15:58 +02:00
Benoit Marty 7aa4066a25 Avoid code duplication. Move ItemStyle to its own file. 2021-04-28 11:15:58 +02:00
Benoit Marty eac8938186 Cleanup 2021-04-28 11:15:58 +02:00
Benoit Marty 2cccbb3fce Benoit Review: avoid duplicate (again) class PowerLevelsContent 2021-04-28 11:15:58 +02:00
Benoit Marty 46290f1ed4 Benoit Review: cleanup 2021-04-28 11:15:58 +02:00
Valere b380fa0653 fix copy 2021-04-28 11:15:58 +02:00
Valere 815cae4d84 remove enum from rest model 2021-04-28 11:15:58 +02:00
Valere 6b8b03e162 Show people you may no in space bottomsheet 2021-04-28 11:15:58 +02:00
Valere 4c4f68f654 Fix home icon dark mode 2021-04-28 11:15:58 +02:00
Valere a5af1a6ebd Fix invite icons 2021-04-28 11:15:58 +02:00
Valere 8754f7772b Invite Space/Room chooser 2021-04-28 11:15:58 +02:00
Valere 55745655db cleaning 2021-04-28 11:15:58 +02:00
Valere 55083a5602 Design review changes 2021-04-28 11:15:58 +02:00
Valere ea5e48b940 1 depth hierarchy support in space panel 2021-04-28 11:15:58 +02:00