Commit Graph

3587 Commits

Author SHA1 Message Date
Benoit Marty 58a2fd8c77 Fix warning 1.5: String.capitalize is now deprecated 2021-05-14 12:45:33 +02:00
Benoit Marty 95714e55b0
Merge pull request #3324 from vector-im/feature/bma/doc_register
Add documentation on LoginWizard and RegistrationWizard (#3303)
2021-05-14 12:29:10 +02:00
Benoit Marty c27b7aec26 Add more doc 2021-05-14 11:44:44 +02:00
Benoit Marty d6e3bb59f4 Minor cleanup on the doc 2021-05-14 11:39:12 +02:00
Benoit Marty 946208a84d Add documentation on LoginWizard and RegistrationWizard (#3303)
ee
2021-05-14 11:39:12 +02:00
Benoit Marty dca4a31fc6 Fix a problem with database migration on nightly builds (#3335) 2021-05-14 11:26:24 +02:00
Benoit Marty 393ef3845e
Merge pull request #3330 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.23
Bump libphonenumber from 8.12.22 to 8.12.23
2021-05-13 11:15:14 +02:00
dependabot[bot] 90f6f9f7c1
Bump libphonenumber from 8.12.22 to 8.12.23
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.22 to 8.12.23.
- [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.22...v8.12.23)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-13 06:30:31 +00:00
dependabot[bot] cd9b8c55f4
Bump realm-gradle-plugin from 10.4.0 to 10.5.0
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.4.0 to 10.5.0.
- [Release notes](https://github.com/realm/realm-java/releases)
- [Changelog](https://github.com/realm/realm-java/blob/v10.5.0/CHANGELOG.md)
- [Commits](https://github.com/realm/realm-java/compare/v10.4.0...v10.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-13 06:27:41 +00:00
dependabot[bot] 58dfe0f924
Bump daggerVersion from 2.35 to 2.35.1
Bumps `daggerVersion` from 2.35 to 2.35.1.

Updates `dagger` from 2.35 to 2.35.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.35...dagger-2.35.1)

Updates `dagger-compiler` from 2.35 to 2.35.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.35...dagger-2.35.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-12 14:50:20 +00: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
Benoit Marty 824a8a5c66 Fix copyright 2021-05-11 14:06:49 +02:00
Benoit Marty 91be2b6f3f Add test and handle system upgrade 2021-05-11 14:06:49 +02:00
Benoit Marty cef4cf09ec Create a BuildVersionSdkIntProvider to be able to inject it and do some test
To merge with BuildVersionSdkIntProvider

To merge with fix add module

To merge with fix buildVersionSdkIntProvider
2021-05-11 13:52:08 +02:00
Benoit Marty f31c44963b Cleanup the existing code 2021-05-11 13:52:08 +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
Benoit Marty 75a4455d15 reorder methods 2021-05-03 21:13:25 +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 2605c6ac9b Properly sort rooms according to events previewed in summary
Change-Id: Id17385a4d17869b0356aa7242407581e2193845e
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 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 4486181669 Sort social logins buttons 2021-04-29 15:57:52 +02:00
Benoit Marty 344a7e5b3d Add facility to get profile info to the login wizard 2021-04-29 15:56:25 +02:00
Benoit Marty 9972ab5d2e Cleanup 2021-04-29 15:56:25 +02: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
Valere 31ffa65fd0 Update add room screen as per design 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 bd0fcce572 Return Job 2021-04-29 11:10:41 +02:00
Benoit Marty a5c0c23bae Inject constructor... 2021-04-29 11:10:41 +02:00
Benoit Marty e5d0a8f3d8 Cleanup 2021-04-29 11:10:41 +02:00
Benoit Marty dc69d5c68a Create a holder 2021-04-29 11:10:41 +02:00
Benoit Marty ecd2d0fb76 Use session scope 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 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
Benoit Marty 7beb483972
Merge pull request #3238 from vector-im/feature/bma/android11
Android 11 fixes an other fixes for attachement
2021-04-28 16:57:51 +02:00
Benoit Marty b86fd37c15
Merge branch 'develop' into feature/bca/spaces_sdk 2021-04-28 16:57:02 +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
Yoan Pintas ba641a6e76
Merge pull request #3178 from vector-im/expose_directUserId
Expose directUserId in RoomSummary
2021-04-28 13:45:21 +02:00
yostyle 506bdd8eb0 directUserId can be null 2021-04-28 12:22:43 +02:00
Valere 32605be6e8 Fix / migration recover room type 2021-04-28 11:42:08 +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 aa74646ddf Fix invited spaced filters rooms out of home + invite not working 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 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 1deb44f91f Better DM filtering + fix space member loading 2021-04-28 11:15:58 +02:00
Valere 7910e84d8e Fix test compilation 2021-04-28 11:15:58 +02:00
Valere 57e9e4474e fix warning 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 79bde6ee91 Private (me and teamates) space support 2021-04-28 11:15:58 +02:00
Valere 02c2fea99e cleaning 2021-04-28 11:15:58 +02:00
Valere 886cc7fb5b Sort summaries by default 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 715bd29c75 Cleanup and add URL 2021-04-28 11:15:58 +02:00
Benoit Marty 66ac298e95 Benoit Review: cleanup 2 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 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 dda45f1c2a Fix public space guest access & history visibility 2021-04-28 11:15:58 +02:00
Valere 201b914304 Fix invite power level for public space 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
Valere 06a84d985a Basic support to browse space directory 2021-04-28 11:15:58 +02:00
Valere 802853d205 Suggested Space support 2021-04-28 11:15:58 +02:00
Valere e364a36ee6 cleaning 2021-04-28 11:15:58 +02:00
Valere 48fef45ce3 Code quality 2021-04-28 11:15:58 +02:00
Valere 0c5ca9f51b Space hierachy SDK updates 2021-04-28 11:15:58 +02:00
Valere ef42591534 Open Space Link initial commit 2021-04-28 11:15:58 +02:00
Valere 7d2d7b411e Space Create Wizard Flow 2021-04-28 11:15:58 +02:00
Valere 6c69a6055d Support retry after M_LIMIT_EXCEEDED 2021-04-28 11:15:58 +02:00
Valere 883f70306f Rebase Fixes 2021-04-28 11:15:58 +02:00
Valere 5aa698768a Support update of order/autojoin of child 2021-04-28 11:15:58 +02:00
Valere c8916ee83c Udpate since msc 1772 2021-04-28 11:15:58 +02:00
Valere 186024b271 MSC 2946 WIP 2021-04-28 11:15:58 +02:00
Valere 57f17620b5 Fix Dendrite sync response support 2021-04-28 11:15:58 +02:00
Valere b7a89f4055 Fix / Syncs breaking on dendrite 2021-04-28 11:15:58 +02:00
Valere 7521a0d3ae Fix / post rebase issues 2021-04-28 11:15:58 +02:00
Valere e2578a29ed Basic space join / use tmp msc id / db model update 2021-04-28 11:15:58 +02:00
Valere ab4f2429c4 Use unstable prefixes 2021-04-28 11:15:58 +02:00
Valere df341d8ea3 Basic peeking preview and join and filter 2021-04-28 11:15:58 +02:00
Valere c5fa0a413f Space first commit 2021-04-28 11:15:58 +02:00
Benoit Marty e3a667cbc6
Merge pull request #3220 from vector-im/dependabot/gradle/daggerVersion-2.35
Bump daggerVersion from 2.34.1 to 2.35
2021-04-26 16:27:39 +02:00
Benoit Marty 0a72cc4c93
Merge branch 'develop' into feature/bma/crashRxSingle 2021-04-26 15:17:32 +02:00
dependabot[bot] 7575959c4a
Bump daggerVersion from 2.34.1 to 2.35
Bumps `daggerVersion` from 2.34.1 to 2.35.

Updates `dagger` from 2.34.1 to 2.35
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.34.1...dagger-2.35)

Updates `dagger-compiler` from 2.34.1 to 2.35
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.34.1...dagger-2.35)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-23 07:05:44 +00:00
Benoit Marty fe9bd38115
Merge pull request #3175 from vector-im/dependabot/gradle/daggerVersion-2.34.1
Bump daggerVersion from 2.34 to 2.34.1
2021-04-20 19:58:48 +02:00
Benoit Marty ff3a916cab Do not invite the current user when creating a room (#3123) 2021-04-20 18:59:49 +02:00
Benoit Marty f4c1de3c30 Fix exception in rxSingle (#3180)
Do not wrap CancellationException to Failure.Cancelled, else RxCancellable will throw.
2021-04-20 18:49:16 +02:00
Benoit Marty f8be814079 RegistrationWizard.createAccount() parameters are now all optional, following Matrix spec (#3205) 2021-04-20 12:32:03 +02:00
Benoit Marty c6a493848e Fix a race condition: Push can be received before the Gateway API returns 2021-04-16 16:13:16 +02:00
SpiritCroc 28c5f036c8 Merge tag 'v1.1.5' into sc
Change-Id: I263852c42cfa21935890bee435f063d7fa43edfa
2021-04-15 12:29:59 +02:00
Benoit Marty 9565e8975e merge hotfix to develop 2021-04-15 11:09:58 +02:00
Benoit Marty 59637c4a6b Revert to Realm 10.3.1 to fix issue with migration
Waiting for https://github.com/realm/realm-java/issues/7402
2021-04-14 21:54:07 +02:00
SpiritCroc 20e185ef48 Restore setting functionality for unimportant unread type and count
Change-Id: Ied403f8fad4a7fa4e9dd1422c9ca08690183c1b1
2021-04-14 13:58:37 +02:00
SpiritCroc 04c0d7c121 Add back chats marked unread to notifications tab
Likely also required for the "mark all as read" feature to work properly
since v1.1.4

Change-Id: I375860e55e3f188526f90cf7ffdccf192871e745
2021-04-14 13:26:35 +02:00
SpiritCroc 811950cb18 Various fixes after merge
- Fix compile
- Fix counting chats marked unread
- Fix counting chats with unread messages

Change-Id: Ibf928c5380a1b7ec25f2c510b97ee4f726fe7c0d
2021-04-14 13:20:50 +02:00
Benoit Marty 699b1429b7 Simplify `LoginFlowResult` model 2021-04-14 12:42:47 +02:00
yostyle e467e2ca08 Expose directUserId in RoomSummary 2021-04-14 11:35:21 +02:00
dependabot[bot] 30b415e77e
Bump daggerVersion from 2.34 to 2.34.1
Bumps `daggerVersion` from 2.34 to 2.34.1.

Updates `dagger` from 2.34 to 2.34.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.34...dagger-2.34.1)

Updates `dagger-compiler` from 2.34 to 2.34.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.34...dagger-2.34.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-14 07:09:19 +00:00
SpiritCroc 0e601aa8f0 Merge tag 'v1.1.4' into sc
Note: this merge needs more work, since upstream changed implementations
affecting following features:
- Mark unread
- Notification count badges
- Overview list filtering / combined overview
- Remember expanded categories
- Read receipt layout

Change-Id: If728bb54dd7c423b57bd3f59d23d86a1a0e5e435

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
	vector/src/main/java/im/vector/app/core/utils/Emoji.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.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/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/RoomListViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryController.kt
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_base_state.xml
2021-04-13 09:28:13 +02:00
Benoit Marty 288aed3252
Merge pull request #3151 from vector-im/feature/bma/cleanup_resources
Store description update
2021-04-12 10:47:18 +02:00
Dominic Fischer 7ee87a0d4b Merge branch 'develop' into suspend_functions_1
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
2021-04-10 16:50:30 +01:00
Benoit Marty 37226a1641 Small cleanup 2021-04-09 16:58:41 +02:00
Benoit Marty 388e4eb112
Merge pull request #3137 from vector-im/dependabot/gradle/daggerVersion-2.34
Bump daggerVersion from 2.33 to 2.34
2021-04-09 16:38:25 +02:00
SpiritCroc 6aa6f3e01b Merge tag 'v1.1.3' into sc
Change-Id: I50f78eeec11fc4d606ddabb68d08a5ff97bbad13

Conflicts:
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
2021-04-09 11:57:11 +02:00
Benoit Marty ee3eb8e1d6 Cleanup 2021-04-08 18:52:53 +02:00
Benoit Marty 2a1e52745f Some cleanup after merge of #3084 2021-04-08 18:50:28 +02:00
Aleks 9d96f90e49 keyword-spacing fix + wildcard-imports fix 2021-04-08 18:50:28 +02:00
Aleks 4451b682b1 merge + register/available endpoint corrections 2021-04-08 18:50:28 +02:00
Aleks 2e9f8ae6ae registration availability endpoint added 2021-04-08 18:50:05 +02:00
Benoit Marty 7b1d313e8e Small cleanup 2021-04-08 12:46:55 +02:00
Benoit Marty 8dead986a5 Always try to retry Http requests in case of 429 (#1300) 2021-04-08 10:59:51 +02:00
Benoit Marty 9b5bc60fa9 Remove unused parameter and use same value than the JS SDK 2021-04-08 09:54:51 +02:00
dependabot[bot] 505b01ad97
Bump daggerVersion from 2.33 to 2.34
Bumps `daggerVersion` from 2.33 to 2.34.

Updates `dagger` from 2.33 to 2.34
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.33...dagger-2.34)

Updates `dagger-compiler` from 2.33 to 2.34
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.33...dagger-2.34)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-08 07:19:20 +00:00
Benoit Marty 3b6234a9a2
Merge pull request #3133 from vector-im/feature/bma/wl_fixes
Weblate fixes
2021-04-07 19:11:16 +02:00
Benoit Marty e7608469ca Import SAS strings 2021-04-07 18:42:52 +02:00
Benoit Marty eef6d92b89
Merge pull request #3129 from vector-im/feature/bma/dn_iteration
Empty room name small iteration
2021-04-07 18:41:08 +02:00
Benoit Marty 7309c1066c Move WifiDetector to the app side
And protect the call to getEvent()
2021-04-07 17:35:46 +02:00
Benoit Marty dead57b9fe Cleanup 2021-04-07 17:35:46 +02:00
Benoit Marty b89a258fdf FastLane: Only is Wifi is detected 2021-04-07 17:35:46 +02:00
Benoit Marty c46f7fed5f Avoid code duplication 2021-04-07 17:35:46 +02:00
Benoit Marty 3a1b8bc33d FastLane: handle push rules 2021-04-07 17:35:46 +02:00
Benoit Marty f0f66cbd0e Add comment 2021-04-07 17:35:46 +02:00
Benoit Marty 4a0a6e9f01 FastLane: Ignore message edition 2021-04-07 17:35:46 +02:00
Benoit Marty 7f7f90f89e ktlint 2021-04-07 17:35:46 +02:00
Benoit Marty 96153fe92a Get Event after a Push for a faster notification display in some conditions 2021-04-07 17:35:46 +02:00
Benoit Marty 923715aeb3 Add method for name fallback when there is only one member 2021-04-07 15:19:33 +02:00
Benoit Marty 15c51cad17 Improve interface, name are not nullable 2021-04-07 15:17:02 +02:00
Benoit Marty 2495fa49f3 Improve code clarity 2021-04-07 12:39:36 +02:00
Benoit Marty c459c4f90c Change snow chat effect message type from "nic.custom.snow" to "io.element.effect.snowfall" 2021-04-07 11:17:46 +02:00
Benoit Marty 3a81521eab Restore previous log when a request fails 2021-04-07 11:17:46 +02:00
Benoit Marty e3cd916105 Fix mandatory parameter in API (#3065) 2021-04-06 16:25:16 +02:00
Benoit Marty 8b15008eba
Merge branch 'develop' into feature/bma/displayname_fallback 2021-04-06 14:31:32 +02:00
Benoit Marty 7d88d038f5
Merge pull request #3102 from vector-im/dependabot/gradle/moshi_version-1.12.0
Bump moshi_version from 1.11.0 to 1.12.0
2021-04-06 14:22:12 +02:00
Benoit Marty c30bcfeba0
Merge pull request #3121 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.21
Bump libphonenumber from 8.12.20 to 8.12.21
2021-04-06 14:20:42 +02:00
Benoit Marty 33c1da5aa1 Fix copyright 2021-04-06 14:15:05 +02:00
Benoit Marty 3109d111a4
Merge pull request #3092 from vector-im/feature/bca/paged_room_list
Room List performance PR (use Live PagedList via Monarchy)
2021-04-06 14:13:47 +02:00
Benoit Marty f42d143679
Merge pull request #3097 from vector-im/feature/bma/retrofit_suspend
Migrate Retrofit interface to coroutine calls
2021-04-06 14:11:07 +02:00
Benoit Marty 5dc28c0564 Fix avatar for DM when other user has left 2021-04-06 09:57:33 +02:00
Benoit Marty 15a463d748 Small rework 2021-04-06 09:57:33 +02:00
Benoit Marty 7e74e6a6f4 Call getFixedRoomMemberContent() when loading room members of a room
It fixes bad names for Empty room
2021-04-06 09:57:33 +02:00
Benoit Marty 2d4866cdc5 Add better support for empty room name fallback 2021-04-06 09:57:33 +02:00
dependabot[bot] 0addb3aeee
Bump libphonenumber from 8.12.20 to 8.12.21
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.20 to 8.12.21.
- [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.20...v8.12.21)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-06 07:20:12 +00:00
Benoit Marty bd14c77ff0 Improve room name for invitation 2021-04-02 12:44:30 +02:00
Dominic Fischer 55e8f519df Convert RoomService to suspend functions
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2021-04-02 11:02:32 +01:00
Valere 4829298255 ktlint 2021-04-02 11:44:10 +02:00
dependabot[bot] fcc635ac8f
Bump moshi_version from 1.11.0 to 1.12.0
Bumps `moshi_version` from 1.11.0 to 1.12.0.

Updates `moshi-adapters` from 1.11.0 to 1.12.0
- [Release notes](https://github.com/square/moshi/releases)
- [Changelog](https://github.com/square/moshi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/moshi/compare/moshi-parent-1.11.0...parent-1.12.0)

Updates `moshi-kotlin-codegen` from 1.11.0 to 1.12.0
- [Release notes](https://github.com/square/moshi/releases)
- [Changelog](https://github.com/square/moshi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/moshi/compare/moshi-parent-1.11.0...parent-1.12.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-02 07:19:53 +00:00
Benoit Marty b9f73c6cc3 BMA's cleanup 2021-04-01 18:34:32 +02:00
Benoit Marty b47ced68b5 Move UpdatableFilterLivePageResult to the correct package 2021-04-01 18:22:09 +02:00
Valere f60e649d76 Fix / newly joined or created are at the bottom of room list 2021-04-01 15:56:03 +02:00
Benoit Marty 0bc864fc37 Better handling on 429 2021-04-01 13:51:16 +02:00
Benoit Marty 1f2d6bea21 Do some renaming 2021-04-01 12:11:49 +02:00
Benoit Marty ba27a601dd Dominaezzz' review: remove Request class, just use executeRequest() 2021-04-01 12:10:29 +02:00
Benoit Marty fe80b7bd6a Dominaezzz' review: remove withContext usage 2021-03-31 23:16:32 +02:00
Benoit Marty f998c2f945 Fix avatar rendering for DMs, after initial sync (#2693)
Also better handling of previous DMs management
2021-03-31 22:55:53 +02:00
Valere c23437d45a Code quality 2021-03-31 18:04:27 +02:00
Valere cf581ecfcf Make pagedList config as part of API 2021-03-31 18:04:27 +02:00
Valere 41176c3e26 Support only notif display mode
+ code quality fixes
2021-03-31 18:04:27 +02:00
Valere 52f98dc405 Remove HomeListDataSource 2021-03-31 18:04:27 +02:00
Valere cf868f885f Room summary paged initial commit 2021-03-31 18:04:27 +02:00
Benoit Marty 6a91c2b355 Migrate Retrofit interface to coroutine calls 2021-03-31 17:59:13 +02:00
Benoit Marty 9bde51a539
Merge pull request #3089 from vector-im/dependabot/gradle/com.facebook.stetho-stetho-okhttp3-1.6.0
Bump stetho-okhttp3 from 1.5.1 to 1.6.0
2021-03-31 17:56:34 +02:00
Benoit Marty 295be5286b
Merge branch 'develop' into feature/bma/cleanup 2021-03-31 17:55:50 +02:00
Benoit Marty 42f6adf2e2 ktlint 2021-03-31 17:55:25 +02:00
Benoit Marty 1868f39223
Merge pull request #3088 from vector-im/feature/fga/timeline_filter
Feature/fga/timeline filter
2021-03-31 17:51:46 +02:00
dependabot[bot] cb96a9059e
Bump stetho-okhttp3 from 1.5.1 to 1.6.0
Bumps [stetho-okhttp3](https://github.com/facebook/stetho) from 1.5.1 to 1.6.0.
- [Release notes](https://github.com/facebook/stetho/releases)
- [Changelog](https://github.com/facebook/stetho/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/stetho/compare/v1.5.1...v1.6.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-31 13:48:01 +00:00
Benoit Marty af9fa44e8c Remove dead code 2021-03-31 11:36:02 +02:00
Benoit Marty 0a0c8cde34 Cleanup the test 2021-03-31 11:26:23 +02:00
Benoit Marty f49df59e10 Convert Room API to suspend (#24499) 2021-03-31 11:26:23 +02:00
Benoit Marty 79bee63515
Merge pull request #3079 from Dominaezzz/suspend_functions_9
Convert SharedSecretStorageService and AccountDataService to suspend functions
2021-03-31 09:28:20 +02:00
Benoit Marty f2f735ace1
Merge pull request #3077 from Dominaezzz/suspend_functions_8
Convert PushersService to suspend functions
2021-03-31 09:21:16 +02:00
ganfra c7c76d1e67 Timeline: clean code and update CHANGES 2021-03-30 20:04:26 +02:00
Benoit Marty 67c2b58f85
Merge pull request #3080 from Dominaezzz/suspend_functions_10
Convert MembershipService to suspend functions
2021-03-30 11:56:51 +02:00
Benoit Marty a1cd36fd13
Merge pull request #3073 from Dominaezzz/suspend_functions_4
Convert WidgetService to suspend functions
2021-03-30 11:36:45 +02:00
Benoit Marty 8c328fe5ef
Merge pull request #3075 from Dominaezzz/suspend_functions_6
Convert ReadService to suspend functions
2021-03-30 09:56:50 +02:00
Benoit Marty a53fecc9ba
Merge pull request #3074 from Dominaezzz/suspend_functions_5
Convert ProfileService to suspend functions
2021-03-30 09:54:29 +02:00
Benoit Marty 842a430d51
Merge pull request #3069 from Dominaezzz/suspend_functions_1
Convert IdentityService to suspend functions
2021-03-30 09:48:03 +02:00
Dominic Fischer 501b870c35 Convert IdentityService to suspend functions
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2021-03-29 20:26:19 +01:00
Dominic Fischer bc68075ae3 Convert MembershipService to suspend functions
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2021-03-29 20:10:41 +01:00
Dominic Fischer e23cba1d20 Convert ProfileService to suspend functions
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2021-03-29 19:39:30 +01:00
Dominic Fischer c548a3d2fa Convert WidgetService to suspend functions
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2021-03-29 19:34:46 +01:00
ganfra d6d4293ea8 Timeline : remove filtering from SDK 2021-03-29 16:50:12 +02:00
Benoit Marty d6446fa95f
Merge pull request #3082 from vector-im/dependabot/gradle/io.realm-realm-gradle-plugin-10.4.0
Bump realm-gradle-plugin from 10.3.1 to 10.4.0
2021-03-29 16:45:42 +02:00
Benoit Marty 1d23f1d9e3 Realm from 10.4.0 and forward are now found on mavenCentral() instead of jcenter(). 2021-03-29 14:06:57 +02:00
Benoit Marty 0e71dfa8e1
Merge pull request #3081 from Dominaezzz/suspend_functions_11
Convert FileService to suspend functions
2021-03-29 14:00:12 +02:00
Benoit Marty c15e2e96b6
Merge pull request #3076 from Dominaezzz/suspend_functions_7
Convert UserService to suspend functions
2021-03-29 13:18:34 +02:00
dependabot[bot] 8f4dbd2aef
Bump realm-gradle-plugin from 10.3.1 to 10.4.0
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.3.1 to 10.4.0.
- [Release notes](https://github.com/realm/realm-java/releases)
- [Changelog](https://github.com/realm/realm-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/realm/realm-java/compare/v10.3.1...v10.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-29 08:30:44 +00:00
Dominic Fischer b6f4be2894 Convert FileService to suspend functions
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2021-03-28 13:52:16 +01:00
Dominic Fischer 7aba3cff66 Convert AccountDataService to suspend functions
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2021-03-28 11:59:44 +01:00
Dominic Fischer b70585016c Convert SharedSecretStorageService to suspend functions
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2021-03-28 11:50:59 +01:00
Dominic Fischer 7fbe485603 Convert PushersService to suspend functions
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2021-03-27 20:44:07 +00:00
Dominic Fischer b9b755e6e1 Convert UserService to suspend functions
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2021-03-27 20:33:57 +00:00