Commit Graph

3371 Commits

Author SHA1 Message Date
SpiritCroc d6b05925a9 Fix counting unread chats in spaces
Change-Id: Ibd39e18e92b28105d6b4289eb5ecaf7caeca7574
2021-05-16 10:39:37 +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
Valere f9820cde58 Fixes on unread badges 2021-05-11 11:36:17 +02:00
Valere 1ec08bec07 Fix spaces add room via server 2021-05-11 08:18:37 +02:00
Valere 80366ee938 Code review 2021-05-10 20:01:17 +02:00
Valere f9e608a790 Manage Spaces as Admin 2021-05-10 20:01:17 +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 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 bea67bd7fd Join rules: fix migration 2021-05-10 19:03:34 +02:00
Benoit Marty 711ee24c4f
Merge pull request #3307 from vector-im/feature/ons/fix_user_profile_search
Allow inviting users even if profile information cannot be retrieved
2021-05-10 17:26:54 +02:00
Onuray Sahin 0f8a641510 Code review fixes. 2021-05-10 17:38:40 +03:00
Onuray Sahin 87d35958c6 Allow inviting users even if profile information cannot be retrieved. 2021-05-10 16:34:30 +03:00
Valere 981626a0f7 cleaning 2021-05-10 13:53:43 +02:00
Benoit Marty 20f86a30e8 Upgrade Realm to version 10.4.0
Migration with isEmbedded tested OK
2021-05-10 13:31:38 +02:00
Valere 5e2c3239ea Code review 2021-05-10 10:21:43 +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
Benoit Marty bbabfdabd0 Handle database migration 2021-05-07 13:22:55 +02:00
Benoit Marty e969d663a5 Code review 2021-05-07 12:33:01 +02:00
yostyle 64f1834913 Add joinRules to RoomSummary 2021-05-06 18:41:26 +02: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 f704539c89
Merge pull request #3284 from vector-im/feature/bca/spaces_stable_prefixes
stable prefix for msc1772
2021-05-06 11:09:21 +02:00
Valere efe5176286 rename activeSpaceId to activeSpaceFilter 2021-05-05 22:36:27 +02:00
Valere 3cbdf4ad5c stable prefix for msc1772 2021-05-05 22:30:38 +02:00
Valere 4abfc1fd2b Fix space test + room history visibility bug 2021-05-05 17:46:58 +02:00
Benoit Marty 64a37c251d
Merge pull request #3264 from vector-im/feature/bma/fix_3245
Compress video and improve file too big error detection
2021-05-05 15:50:21 +02:00
Benoit Marty 080bdf1495 Fix long line 2021-05-05 15:48:11 +02:00
SpiritCroc 2f4e9e3017 Ensure proper grouping for notifications tab query
Change-Id: I58e8a85fd5e2c938d55189825daf7820f826da1e
2021-05-05 12:31:20 +02:00
Benoit Marty e28556dd1b Create TemporaryFileCreator to avoid code duplication 2021-05-05 11:26:36 +02:00
Benoit Marty 590d8fc849 Also test the effect of completeExceptionally() 2021-05-05 11:12:06 +02:00
Benoit Marty 62207f02f0 Properly handle the compression cancellation
It should never occur though
2021-05-05 10:53:52 +02:00
Benoit Marty 8d52829918 Fix issue in logs 2021-05-05 10:49:57 +02:00
Benoit Marty 2a411ccf6c Handle properly the case where the video compression is not necessary 2021-05-04 23:14:18 +02:00
Benoit Marty efc08b376b Transcoder.transcode() already operated on a background thread 2021-05-04 22:50:42 +02:00
Benoit Marty dd325c4e91
Merge pull request #3270 from vector-im/feature/bma/remove_jcenter
https://github.com/Piasy/BigImageViewer is now hosted on mavenCentral()
2021-05-04 17:32:23 +02:00
Benoit Marty 61380bf48a Use Junit import 2021-05-04 15:28:52 +02:00
Benoit Marty c502e971a1 Use Long for size like for the other models (FileInfo, AudioInfo, VideoInfo) 2021-05-04 13:35:03 +02:00
Benoit Marty bcf6dcbf70 Compute new video dimension after compression 2021-05-04 12:47:21 +02:00
Benoit Marty 6347564365 Change the library to compress video for licensing reason 2021-05-04 12:17:43 +02:00
Benoit Marty ee7518bf51 Dependabot missed this one (?) 2021-05-04 10:51:07 +02:00
Benoit Marty 4189db0f89 Use Junit import 2021-05-04 10:50:31 +02:00
Benoit Marty 9d225b7826 Fixed! 2021-05-03 21:14:06 +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 d7cbae7c47 Fix a regression with video size 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 765380ab95 Fix potential issue with video message conten 2021-05-03 21:13:47 +02:00
Benoit Marty d6b6768f41 Cleanup 2021-05-03 21:13:47 +02:00
Benoit Marty 5213309587 Send the Thumbnail after the main content, for the case the main content fails if too large. 2021-05-03 21:13:47 +02:00
Benoit Marty e1e4b03532 Do not serialize "soft_logout" 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 5e1c503d2e Compress video before sending (#442) 2021-05-03 21:13:47 +02:00