Commit graph

3868 commits

Author SHA1 Message Date
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
Dominic Fischer
f8718e397c Convert ReadService to suspend functions
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2021-03-27 20:20:19 +00:00
Dominic Fischer
8f67511b22 Convert VerificationService to suspend functions
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2021-03-27 19:20:16 +00:00
Benoit Marty
94220a24d1 cleanup 2021-03-26 13:58:34 +01:00
Benoit Marty
297fff1394 Cleanup some Enums 2021-03-26 13:41:10 +01:00
Benoit Marty
2e23fec82b Sadly fields cannot be private 2021-03-26 12:36:33 +01:00
Benoit Marty
ee265f71e6 Be more robust when parsing some enums - RoomJoinRules 2021-03-26 12:22:11 +01:00
Benoit Marty
5364d7fd03 Be more robust when parsing some enums - Guest Access 2021-03-26 12:18:36 +01:00
Benoit Marty
a7539d0f95 Be more robust when parsing some enums 2021-03-26 12:15:06 +01:00
Benoit Marty
5cd86c685d Copyright 2021-03-22 18:29:06 +01:00
Benoit Marty
f106176752 Add missing synchronized 2021-03-22 18:26:29 +01:00
Benoit Marty
d85d44bf4b Add ApiInterceptor.removeListener() 2021-03-22 18:09:42 +01:00
Benoit Marty
f6e43a5305 Add Android test on ApiInterceptor 2021-03-22 17:13:16 +01:00
Benoit Marty
21cff9a749 Update after Ganfra's review, and kotlinification 2021-03-22 16:36:44 +01:00
Onuray Sahin
9e7d4c901e Api interceptor implementation to allow app developers to peek responses. 2021-03-22 16:18:51 +01:00
Benoit Marty
43fd9910e3
Merge pull request #3031 from vector-im/feature/bma/other_fixies
Some fixies
2021-03-19 17:06:54 +01:00
Benoit Marty
1214abdd44
Merge branch 'develop' into feature/bma/split_key_request 2021-03-19 15:57:55 +01:00
Benoit Marty
c43479420a Reorder signature for clarity 2021-03-19 15:42:42 +01:00
Benoit Marty
7e2a5e55f7 Simplify signature, userId is a member of the class 2021-03-19 15:38:14 +01:00
Benoit Marty
485c44454b Handle encrypted reactions (#2509) 2021-03-19 15:27:56 +01:00
Benoit Marty
2d75c67aa3
ktlint 2021-03-19 10:24:40 +01:00
Valere
35635c859d Send several NO_OLM in one request 2021-03-18 15:08:56 +01:00
Benoit Marty
c1254ed5b1
Merge pull request #3012 from vector-im/dependabot/gradle/io.mockk-mockk-1.11.0
Bump mockk from 1.10.6 to 1.11.0
2021-03-18 13:12:10 +01:00
Benoit Marty
d51f632404
Merge pull request #3011 from vector-im/dependabot/gradle/io.mockk-mockk-android-1.11.0
Bump mockk-android from 1.10.6 to 1.11.0
2021-03-18 13:11:59 +01:00
Benoit Marty
2f2bc758d7
Merge pull request #3022 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.20
Bump libphonenumber from 8.12.19 to 8.12.20
2021-03-18 13:11:41 +01:00
Benoit Marty
dbff5015df Keep is simple if there is no need to chunk 2021-03-18 11:56:19 +01:00
Benoit Marty
96b37a8206 Fix typo 2021-03-18 10:57:28 +01:00
Benoit Marty
f6032da788 Add more test 2021-03-18 10:44:15 +01:00
Benoit Marty
da9f0c6667 Fix an issue discovered by unit test 2021-03-18 10:44:15 +01:00
Benoit Marty
103ba463c3 Create getBetsChunkSize to avoid code duplication 2021-03-18 10:44:15 +01:00
Benoit Marty
9946ba8aa4 Split network request /keys/query into smaller requests (250 users max) (#2925) 2021-03-18 10:41:52 +01:00
dependabot[bot]
8e85d5515d
Bump libphonenumber from 8.12.19 to 8.12.20
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.19 to 8.12.20.
- [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.19...v8.12.20)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-18 07:18:33 +00:00
Benoit Marty
192fc6fd94 Use minimum delay accepted by the Work library. The current value is 10_000 and smaller value will be ignored.
It will remove the warning "W/WM-WorkSpec: Backoff delay duration less than minimum value"
2021-03-17 14:54:15 +01:00
Benoit Marty
a4f6fe0cd2 Cleanup 2021-03-17 12:43:05 +01:00
Benoit Marty
616d3c1988 Fix IllegalStateException in UpdateTrustWorker
Also split into 2 methods
2021-03-17 12:42:28 +01:00
Benoit Marty
e89e0724a0 limit log 2021-03-17 11:04:17 +01:00
Benoit Marty
1d1f78a020 Timber.d instead of Timber.v 2021-03-17 10:39:25 +01:00
dependabot[bot]
118ea4b0b2
Bump mockk from 1.10.6 to 1.11.0
Bumps [mockk](https://github.com/mockk/mockk) from 1.10.6 to 1.11.0.
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.10.6...1.11.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-17 07:08:12 +00:00
dependabot[bot]
f230830763
Bump mockk-android from 1.10.6 to 1.11.0
Bumps [mockk-android](https://github.com/mockk/mockk) from 1.10.6 to 1.11.0.
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.10.6...1.11.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-17 07:07:15 +00:00
Benoit Marty
9492887345 Restore call to clearUnavailableServersList() removed by mistake
See https://github.com/vector-im/element-android/pull/3001#pullrequestreview-613195611
2021-03-16 14:53:15 +01:00
Benoit Marty
4273a6a1be
Merge pull request #3001 from timokoesters/fix-parsing-servername
fix: make cross signing work with server names containing :
2021-03-16 14:46:47 +01:00
Benoit Marty
431d450fec
Merge branch 'develop' into feature/bma/rr 2021-03-16 14:46:10 +01:00
Benoit Marty
a30660ed43 Cleanup 2021-03-16 14:44:40 +01:00
Benoit Marty
cb17fa60dc Ganfra's review: delete files after the Realm transaction 2021-03-16 13:29:38 +01:00
Benoit Marty
e8bb3d81ed Ganfra's review: inject Moshi Moshi 2021-03-16 12:15:28 +01:00
Timo Kösters
dd2a7397a4
fix: make cross signing work with server names containing :
Server names are allowed to contain ':' to specify a port, see https://matrix.org/docs/spec/appendices#server-name
User ids on the other hand are not allowed to contain ':', even
historical user ids, see https://matrix.org/docs/spec/appendices#historical-user-ids

Therefore we can use the first instance of ':' to split the user
localpart from the server name.
2021-03-15 22:31:34 +01:00
Benoit Marty
e7c9fb987c Use AwaitTransaction (G's review) 2021-03-15 18:08:33 +01:00
Benoit Marty
4f3734f932 Ensure message are decrypted in the room list after a clear cache 2021-03-15 16:53:19 +01:00
Benoit Marty
75ad6a640b loglimit 2021-03-15 16:02:09 +01:00
Benoit Marty
13cbfaf5e7 Do not load room members in e2e after init sync 2021-03-15 15:29:20 +01:00
Benoit Marty
71f2c50799 Do what the comment said 2021-03-15 15:02:04 +01:00
Benoit Marty
c4aadfed33 Better API and avoid copying Collection 2021-03-15 14:35:21 +01:00
Benoit Marty
ed662d3add Fix double RR issue when optimizing init sync 2021-03-15 14:19:23 +01:00
SpiritCroc
699ad4eaeb Merge tag 'v1.1.1' into sc
Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.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/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/res/drawable/rounded_rect_shape.xml
	vector/src/main/res/menu/menu_timeline.xml
	vector/src/main/res/values/array.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
2021-03-14 10:58:57 +01:00
Benoit Marty
0c774c098f No op for empty list 2021-03-12 19:08:57 +01:00
Benoit Marty
e3d2186c25 Rework UpdateTrustWorker, should have better perf. 2021-03-12 18:55:53 +01:00
Benoit Marty
857bfcb971 Cleanup 2021-03-12 12:18:21 +01:00
Benoit Marty
0b0634b531 Ensure tmp file is always deleted when it is read 2021-03-12 12:17:47 +01:00
Benoit Marty
fe39c92e25 Load RR when opening a timeline 2021-03-12 12:17:47 +01:00
Benoit Marty
3777b00ad7 Store Ephemeral in files to handle them later (no second transaction) 2021-03-12 12:17:47 +01:00
ganfra
a407ed1903 Fix live timeline event race condition 2021-03-11 15:24:06 +01:00
ganfra
ea21892d03 Message state: fix and clean code after Benoits review 2021-03-10 19:32:50 +01:00
ganfra
6c8e2f1fd6 Message state: allow edit and copy when failed 2021-03-10 18:10:03 +01:00
ganfra
fad4140924 Message states: makes sure the actions bottom sheet is updated with synced event 2021-03-10 17:56:48 +01:00
Onuray Sahin
f5f16fd330 Retry and delete options added for all failed messages. 2021-03-10 11:10:23 +01:00
Benoit Marty
1fe8dfa810
Merge pull request #2978 from vector-im/feature/fga/send_queue_rework
Feature/fga/send queue rework
2021-03-10 09:27:21 +01:00
ganfra
7936c2c6f8 Send: clean after Benoits review 2021-03-09 20:23:06 +01:00
ganfra
3c7a108940 Send: clean and update CHANGES 2021-03-09 18:18:28 +01:00
Benoit Marty
c360404ed9
Merge pull request #2976 from vector-im/feature/bma/local_echo
Snappier local echo
2021-03-09 15:46:27 +01:00
Benoit Marty
eaf27a01e3
Merge pull request #2975 from vector-im/feature/bma/nsfw_filter
Basic filtering for "nsfw" keyword
2021-03-09 15:41:27 +01:00
Benoit Marty
25ea1ba641 Fix issue with local echo 2021-03-09 14:08:33 +01:00
Benoit Marty
66aa9cd888 Cleanup 2021-03-09 13:32:00 +01:00
Benoit Marty
33eed443d9 Split into smaller file - separation of concern 2021-03-09 13:32:00 +01:00
Benoit Marty
63329499ac Add comments 2021-03-09 13:32:00 +01:00
Benoit Marty
c57236da30 Code clarity 2021-03-09 13:00:18 +01:00
Benoit Marty
043ddcae2c Migrate RoomDirectoryService to coroutines (#2449) 2021-03-08 13:30:24 +01:00
ganfra
a0df20fcd2 Send: clean code and add more logs 2021-03-05 21:03:52 +01:00
ganfra
9174632cfc Send: use coroutines and let room sending queues be independent of each others 2021-03-05 19:17:57 +01:00
Benoit Marty
490780b906 Fix classical init sync (not used anymore, except in debug mode) case. 2021-03-05 09:47:57 +01:00
Benoit Marty
ccf8e94c5e Small cleanup 2021-03-05 09:47:57 +01:00
Benoit Marty
f28714c5b2 Avoid empty json in filter 2021-03-05 09:47:57 +01:00
Benoit Marty
b25f13cceb Rename method for clarity 2021-03-05 09:47:57 +01:00
Benoit Marty
9719c0b2f9 Split init sync insertion into 2 transactions.
Ephemeral Events can be inserted later, so the room list can be displayed faster.
2021-03-05 09:47:57 +01:00
Benoit Marty
9d7c31d531 Riot -> Element 2021-03-05 09:47:57 +01:00
Benoit Marty
e5656e264a
Merge pull request #2940 from vector-im/feature/bma/various_fixies
Rework event edition management
2021-03-04 18:03:45 +01:00
Benoit Marty
663fc28cd5 Fix copyright 2021-03-03 19:51:11 +01:00
Benoit Marty
915295efc0 Import SAS strings 2021-03-03 19:36:39 +01:00
Benoit Marty
68364e0a82 Fix test compilation issue 2021-03-03 18:50:21 +01:00
Benoit Marty
b8498aecd9 Code quality 2021-03-03 15:17:41 +01:00
Benoit Marty
9c76ee97eb Move SDK strings to the application 2021-03-03 14:50:54 +01:00
Benoit Marty
dc63d6ae73 Remove StringProvider from SDK 2021-03-03 14:16:11 +01:00
Benoit Marty
a3b1c348ef Create VectorRoomDisplayNameFallbackProvider to provide default room names 2021-03-03 14:15:40 +01:00
Benoit Marty
c13ff6a392 Extract Factories to dedicated files 2021-03-03 13:49:50 +01:00
Benoit Marty
8682c95c19 Do not leak user's local in fallback for verification request 2021-03-03 12:52:49 +01:00
Benoit Marty
e2e7516a99 Remove string usage from SDK - step 2 - InitSyncStep 2021-03-03 12:45:46 +01:00
Benoit Marty
c42b42cb61 Remove string usage from SDK - step 1 - Role
Lint will also be able to detect more possible errors with this change
2021-03-03 12:13:08 +01:00
Weblate
3b9adbf5c8 Merge branch 'origin/develop' into Weblate. 2021-03-03 09:29:37 +00:00
HelaBasa
7864707699 Translated using Weblate (Sinhala)
Currently translated at 0.4% (1 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/si/
2021-03-03 09:28:50 +00:00
Benoit Marty
5c9750fb07 Moar cleanup after rebase and before merge 2021-03-02 19:18:19 +01:00
Valere
533a7bb180 Code Review 2021-03-02 18:52:32 +01:00
Onuray Sahin
4450f51d78 runCatching added to loadMembersTask execution. 2021-03-02 18:50:43 +01:00
Onuray Sahin
fae484cb95 Create test for ensureOutboundSession function. 2021-03-02 18:50:43 +01:00
Onuray Sahin
11dffacc48 Code review fixes. 2021-03-02 18:50:43 +01:00
Onuray Sahin
8b39eabc0f Code review fixes. 2021-03-02 18:50:43 +01:00
Onuray Sahin
a623395585 Code review fixes. 2021-03-02 18:50:43 +01:00
Onuray Sahin
a2de80091d Code review fixes. 2021-03-02 18:49:11 +01:00
Onuray Sahin
e92edc7cb1 Fix remember to call the function. 2021-03-02 18:49:11 +01:00
Onuray Sahin
ae648c3e11 Make outbound key sharing strategy configurable. 2021-03-02 18:49:11 +01:00
HelaBasa
e6265c277e Added translation using Weblate (Sinhala) 2021-03-02 17:32:24 +00:00
Benoit Marty
4e2e73637a Be robust if Event.type is missing (#2946) 2021-03-02 16:14:57 +01:00
Benoit Marty
b027e43615 Cleanup 2021-03-02 11:41:20 +01:00
Benoit Marty
a8ba125bd2 Rename val for code clarity, and use facility 2021-03-02 11:37:13 +01:00
Benoit Marty
5d69a1ab91 Fix a last bug when all editions has been deleted 2021-03-02 11:30:30 +01:00
Benoit Marty
95395945f2 Also filter redacted events 2021-03-02 11:18:06 +01:00
Benoit Marty
c33af6de6a Do not show edition from other users 2021-03-02 11:11:28 +01:00
Benoit Marty
d2b39e5cb8 Convert RelationService to suspend (#2449) 2021-03-02 10:52:03 +01:00
dependabot[bot]
8c87716013
Bump libphonenumber from 8.12.18 to 8.12.19
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.18 to 8.12.19.
- [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.18...v8.12.19)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-02 06:59:54 +00:00
Benoit Marty
097668b762 Rework edition of event management - step 2 2021-03-01 20:42:47 +01:00
Benoit Marty
1bfd78753a Ensure we do not edit an Event from another room 2021-03-01 20:42:02 +01:00
Benoit Marty
bdec23f740 Rework edition of event management 2021-03-01 20:42:02 +01:00
Benoit Marty
c7e7bf4d2c Move VerificationState?.toState() to a dedicated file and in the correct package 2021-03-01 15:47:22 +01:00
Benoit Marty
9a635dd906 Move VerificationState to a dedicated file and in the correct package 2021-03-01 15:47:22 +01:00
Benoit Marty
de00bab1d4
Merge pull request #2912 from vector-im/dependabot/gradle/org.matrix.gitlab.matrix-org-olm-3.2.2
Bump olm from 3.2.1 to 3.2.2
2021-03-01 10:56:45 +01:00
Besnik Bleta
f65c9cf812 Translated using Weblate (Albanian)
Currently translated at 98.2% (222 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sq/
2021-02-27 17:34:20 +00:00
Marcelo Filho
3d5a15fb1b Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/pt_BR/
2021-02-27 17:34:20 +00:00
Ricardo
257fc08404 Translated using Weblate (Spanish)
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/es/
2021-02-27 17:34:20 +00:00
dependabot[bot]
f6123d8dfd
Bump daggerVersion from 2.32 to 2.33
Bumps `daggerVersion` from 2.32 to 2.33.

Updates `dagger` from 2.32 to 2.33
- [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.32...dagger-2.33)

Updates `dagger-compiler` from 2.32 to 2.33
- [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.32...dagger-2.33)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-26 07:14:10 +00:00
dependabot[bot]
f49777ef56
Bump olm from 3.2.1 to 3.2.2
Bumps olm from 3.2.1 to 3.2.2.

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-24 07:15:07 +00:00
Benoit Marty
c3192d9f7c Latest improvement 2021-02-23 10:31:19 +01:00
Benoit Marty
24e9e6bbd7 Move to dedicated package and split into several files 2021-02-23 10:31:19 +01:00
Benoit Marty
b870a8b791 Create ProgressReporter interface 2021-02-23 10:31:19 +01:00
Benoit Marty
1c83ee086a More rework of DefaultInitialSyncProgressService 2021-02-23 10:31:19 +01:00
Benoit Marty
5e7b36d319 Fix issue with progress 2021-02-23 10:31:19 +01:00
Benoit Marty
4e1fcf87ae Improve DefaultInitialSyncProgressService 2021-02-23 10:31:19 +01:00
Benoit Marty
a2225b3f76 Improve code about path 2021-02-23 10:31:19 +01:00
Benoit Marty
e069e196af Improve log 2021-02-23 10:31:19 +01:00
Benoit Marty
440d01c552 Do not log RAM usage in release 2021-02-23 10:31:19 +01:00
Benoit Marty
218be86c68 Cleanup 2021-02-23 10:31:19 +01:00
ganfra
3633199e68 Sync : clean a bit by introducing 2 moshi adapters 2021-02-23 10:31:19 +01:00
Benoit Marty
8e2161bd9e Log free memory before starting a task 2021-02-23 10:31:19 +01:00
Benoit Marty
39e66555f4 Try to log RAM usage 2021-02-23 10:31:19 +01:00
Benoit Marty
c938795576 Read init sync to a file and split into smaller files to handle it 2021-02-23 10:31:19 +01:00
Martin Johansen
ae4062828d Translated using Weblate (Norwegian Bokmål (nb))
Currently translated at 3.9% (9 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/nb/
2021-02-23 07:34:32 +00:00
Nikita Epifanov
8f02c52a26 Translated using Weblate (Russian)
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/ru/
2021-02-23 07:34:32 +00:00
XoseM
dc4d2fc15d Translated using Weblate (Galician)
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/gl/
2021-02-23 07:34:32 +00:00
Benoit Marty
b38ff46af4
Merge pull request #2896 from vector-im/feature/bma/dependabot
Upgrade dependencies
2021-02-22 12:22:43 +01:00
Benoit Marty
e162ebdf91
Merge pull request #2831 from vector-im/feature/bma/hs_version
Fetch homeserver type and version and display in a new setting screen and add info in rageshakes
2021-02-22 10:29:16 +01:00
Benoit Marty
bf48978065 Fix compilation issue after upgrade of realmfieldnameshelper from 1.1.1 to 2.0.0 2021-02-21 11:08:42 +01:00
dependabot[bot]
fd3c41a250 Bump realmfieldnameshelper from 1.1.1 to 2.0.0
Bumps [realmfieldnameshelper](https://github.com/cmelchior/realmfieldnameshelper) from 1.1.1 to 2.0.0.
- [Release notes](https://github.com/cmelchior/realmfieldnameshelper/releases)
- [Changelog](https://github.com/cmelchior/realmfieldnameshelper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cmelchior/realmfieldnameshelper/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-21 10:45:15 +01:00
XoseM
8250a64e34 Translated using Weblate (Galician)
Currently translated at 85.8% (194 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/gl/
2021-02-21 07:34:05 +00:00
waclaw66
58ab82a477 Translated using Weblate (Czech)
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/cs/
2021-02-21 07:34:05 +00:00
dependabot[bot]
471620c4c6
Bump robolectric from 4.3 to 4.5.1
Bumps [robolectric](https://github.com/robolectric/robolectric) from 4.3 to 4.5.1.
- [Release notes](https://github.com/robolectric/robolectric/releases)
- [Commits](https://github.com/robolectric/robolectric/compare/robolectric-4.3...robolectric-4.5.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-20 23:12:11 +00:00
Benoit Marty
75b74eaca8
Merge pull request #2886 from vector-im/dependabot/gradle/io.mockk-mockk-android-1.10.6
Bump mockk-android from 1.9.2.kotlin12 to 1.10.6
2021-02-21 00:11:50 +01:00
Benoit Marty
9e33e6bc4e
Merge pull request #2882 from vector-im/dependabot/gradle/io.mockk-mockk-1.10.6
Bump mockk from 1.9.2.kotlin12 to 1.10.6
2021-02-21 00:11:08 +01:00
Benoit Marty
4a510d583d
Merge pull request #2876 from vector-im/dependabot/gradle/androidx.work-work-runtime-ktx-2.5.0
Bump work-runtime-ktx from 2.4.0 to 2.5.0
2021-02-21 00:07:28 +01:00
SpiritCroc
ca0b360875 Merge tag 'v1.1.0' into sc
Change-Id: I73be281134a8a7ea7fdeffa9356ffae0dda8b0d6

Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.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/item/AbsBaseMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt
	vector/src/main/res/drawable/oval_positive.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/dialog_disclaimer_content.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_generic_with_value.xml
	vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
	vector/src/main/res/menu/menu_timeline.xml
	vector/src/main/res/values/array.xml
2021-02-20 15:41:01 +01:00
Benoit Marty
56a787b327
Merge pull request #2862 from vector-im/dependabot/gradle/io.realm-realm-gradle-plugin-10.3.1
Bump realm-gradle-plugin from 10.1.2 to 10.3.1
2021-02-20 11:28:38 +01:00
Benoit Marty
4defabeecc
Merge pull request #2887 from vector-im/dependabot/gradle/com.squareup.okhttp3-okhttp-bom-4.9.1
Bump okhttp-bom from 4.8.1 to 4.9.1
2021-02-20 11:24:45 +01:00
Benoit Marty
273211290b
Merge pull request #2885 from vector-im/dependabot/gradle/org.matrix.gitlab.matrix-org-olm-3.2.1
Bump olm from 3.1.2 to 3.2.1
2021-02-20 11:23:50 +01:00
dependabot[bot]
5320d16406
Bump work-runtime-ktx from 2.4.0 to 2.5.0
Bumps work-runtime-ktx from 2.4.0 to 2.5.0.

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-20 10:22:58 +00:00
Benoit Marty
04e78ec2e9
Merge pull request #2867 from vector-im/dependabot/gradle/retrofit_version-2.9.0
Bump retrofit_version from 2.6.2 to 2.9.0
2021-02-20 11:22:06 +01:00
Benoit Marty
17ddab585a
Merge pull request #2878 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.18
Bump libphonenumber from 8.10.23 to 8.12.18
2021-02-20 11:19:05 +01:00
Benoit Marty
e6eee47059
Merge pull request #2873 from vector-im/dependabot/gradle/androidx.exifinterface-exifinterface-1.3.2
Bump exifinterface from 1.3.1 to 1.3.2
2021-02-20 11:18:36 +01:00
dependabot[bot]
5aa50a6c60
Bump mockk from 1.9.2.kotlin12 to 1.10.6
Bumps [mockk](https://github.com/mockk/mockk) from 1.9.2.kotlin12 to 1.10.6.
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.9.2.kotlin12...1.10.6)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-20 10:07:19 +00:00
dependabot[bot]
f2bbfa1b0d
Bump okhttp-bom from 4.8.1 to 4.9.1
Bumps [okhttp-bom](https://github.com/square/okhttp) from 4.8.1 to 4.9.1.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.8.1...parent-4.9.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-19 23:27:04 +00:00
dependabot[bot]
6f01e3b99b
Bump mockk-android from 1.9.2.kotlin12 to 1.10.6
Bumps [mockk-android](https://github.com/mockk/mockk) from 1.9.2.kotlin12 to 1.10.6.
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.9.2.kotlin12...1.10.6)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-19 23:23:31 +00:00
dependabot[bot]
e10dc2e5a1
Bump olm from 3.1.2 to 3.2.1
Bumps olm from 3.1.2 to 3.2.1.

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-19 23:23:28 +00:00
dependabot[bot]
dfc57d1985
Bump libphonenumber from 8.10.23 to 8.12.18
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.10.23 to 8.12.18.
- [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.10.23...v8.12.18)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-19 23:22:13 +00:00
dependabot[bot]
d1c49e2a04
Bump exifinterface from 1.3.1 to 1.3.2
Bumps exifinterface from 1.3.1 to 1.3.2.

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-19 23:21:40 +00:00
dependabot[bot]
bfa84e092c
Bump retrofit_version from 2.6.2 to 2.9.0
Bumps `retrofit_version` from 2.6.2 to 2.9.0.

Updates `retrofit` from 2.6.2 to 2.9.0
- [Release notes](https://github.com/square/retrofit/releases)
- [Changelog](https://github.com/square/retrofit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/retrofit/compare/parent-2.6.2...2.9.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-19 23:21:11 +00:00
dependabot[bot]
7d287d7c63
Bump kluent-android from 1.61 to 1.65
Bumps kluent-android from 1.61 to 1.65.

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-19 23:18:28 +00:00
dependabot[bot]
6df58a796a
Bump realm-gradle-plugin from 10.1.2 to 10.3.1
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.1.2 to 10.3.1.
- [Release notes](https://github.com/realm/realm-java/releases)
- [Changelog](https://github.com/realm/realm-java/blob/v10.3.1/CHANGELOG.md)
- [Commits](https://github.com/realm/realm-java/compare/v10.1.2...v10.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-19 23:18:24 +00:00
Benoit Marty
e50d2f7809
Merge pull request #2856 from vector-im/dependabot/gradle/junit-junit-4.13.2
Bump junit from 4.13 to 4.13.2
2021-02-20 00:13:21 +01:00
dependabot[bot]
2c605d9ffb
Bump junit from 4.13 to 4.13.2
Bumps [junit](https://github.com/junit-team/junit4) from 4.13 to 4.13.2.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.2.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.13...r4.13.2)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-19 21:52:31 +00:00
dependabot[bot]
7a81eec6d8
Bump daggerVersion from 2.31 to 2.32
Bumps `daggerVersion` from 2.31 to 2.32.

Updates `dagger` from 2.31 to 2.32
- [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.31...dagger-2.32)

Updates `dagger-compiler` from 2.31 to 2.32
- [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.31...dagger-2.32)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-19 21:52:23 +00:00
Benoit Marty
f9f54cabdd Add upload capability on the screen and give possibility to refresh the data 2021-02-19 21:29:23 +01:00
Benoit Marty
531beb0a86 Add a screen to view details about the homeserver 2021-02-19 21:27:25 +01:00
Benoit Marty
a8be5ed6b0 Create FederationModule 2021-02-19 21:27:25 +01:00
Benoit Marty
1294d211d6
Merge branch 'develop' into feature/bma/fix_redirection 2021-02-19 14:43:01 +01:00
Benoit Marty
e8026c6d3f
Naming convention 2021-02-19 13:53:38 +01:00
Benoit Marty
544c1e4a6a Also fix the problem of cleanup too early (or done several times in case of bad password) for DefaultFinalizeAddingThreePidTask 2021-02-18 19:23:31 +01:00
Benoit Marty
2271ddacf8 Remove unused task and API 2021-02-18 19:05:42 +01:00
Benoit Marty
9443b80811 Fix test: ensure the session is open 2021-02-18 18:46:23 +01:00
Benoit Marty
5afdc81ce0 Moar cleanup 2021-02-18 18:43:48 +01:00
Benoit Marty
2df9b43abc Make the code a bit easier to understand (no change) 2021-02-18 18:42:55 +01:00
Benoit Marty
73e93e7d3d Doc and method signature 2021-02-18 17:56:05 +01:00
Benoit Marty
c76ced68e0 Make the code a bit easier to understand (no other change) 2021-02-18 17:47:11 +01:00
Benoit Marty
dea76fd81b Fix test compilation 2021-02-18 15:36:51 +01:00
LinAGKar
04c1cbd38e Translated using Weblate (Swedish)
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sv/
2021-02-18 03:34:08 +00:00
Jeff Huang
a66f609a07 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/zh_Hant/
2021-02-18 03:34:07 +00:00
XoseM
263b8b1e77 Translated using Weblate (Galician)
Currently translated at 85.3% (193 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/gl/
2021-02-18 03:34:07 +00:00
@a2sc:matrix.org
ca2c4a64e9 Translated using Weblate (German)
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/de/
2021-02-18 03:34:07 +00:00
zer0-x
5547f11192 Translated using Weblate (Arabic)
Currently translated at 84.5% (191 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/ar/
2021-02-18 03:34:06 +00:00
Benoit Marty
51fd45d317 typo and doc 2021-02-17 18:18:36 +01:00
Benoit Marty
0e322630f1 Ignore url override from credential if it is not valid (#2822) 2021-02-17 18:18:36 +01:00
Benoit Marty
d19cedef88 Less code 2021-02-17 18:18:36 +01:00
Benoit Marty
6aa5dc992d Migrate AuthenticationService API to coroutines (#2449) 2021-02-17 18:18:36 +01:00
Benoit Marty
373586c23e Cleanup 2021-02-17 10:25:06 +01:00
ganfra
776ebce497 Merge branch 'develop' into feature/fga/fix_some_voip_issues 2021-02-16 16:06:12 +01:00
ganfra
79acf1cc42 Fix copyright 2021-02-16 15:57:23 +01:00
Benoit Marty
b3a408a34c
Merge pull request #2805 from vector-im/feature/bca/devtools
Dev tools initial commit
2021-02-16 09:46:49 +01:00
ganfra
3170d4428c VoIP: extract the PSTNProtocoltChecker to the SDK 2021-02-15 19:34:37 +01:00
Benoit Marty
cf0b4d2581 Merge branch 'develop' into feature/bca/devtools 2021-02-15 16:00:32 +01:00
Benoit Marty
59634753b3 Code review 2021-02-15 15:03:58 +01:00
Slobodan Simić
adea3ab775 Translated using Weblate (Serbian)
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sr/
2021-02-15 12:08:01 +00:00
random
96b46af9f5 Translated using Weblate (Italian)
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/it/
2021-02-15 12:07:58 +00:00
Priit Jõerüüt
b3a9e20885 Translated using Weblate (Estonian)
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/et/
2021-02-15 12:07:57 +00:00
@a2sc:matrix.org
1f92e61d3c Translated using Weblate (German)
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/de/
2021-02-15 12:07:57 +00:00
Auri B. P
a41b4a3621 Translated using Weblate (Catalan)
Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/ca/
2021-02-15 12:07:57 +00:00
zer0-x
60041d433e Translated using Weblate (Arabic)
Currently translated at 55.7% (126 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/ar/
2021-02-15 12:07:57 +00:00
Weblate
2ac1287924 Merge branch 'origin/develop' into Weblate. 2021-02-12 10:30:37 +00:00
Andrejs
6203c393d7 Translated using Weblate (Latvian)
Currently translated at 88.1% (194 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/lv/
2021-02-12 10:30:25 +00:00
Benoit Marty
1978a180ff Compute WidgetUrl "onDemand" to properly handle the theme value 2021-02-10 16:10:32 +01:00
Benoit Marty
463f2a7ad7 Widget: resolve the avatar URL 2021-02-10 13:41:01 +01:00
SpiritCroc
04f4e13230 Merge tag 'v1.0.17' into sc
Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt

Note:
Upstream added their own "pass theme to widgets" implementation, which
currently does not respect "black" themes (but treats them as "dark"
themes).
For now, let's integrate our own implementation into the new one.

Change-Id: If99f2f87e20215595fc36996bb530bf5f247b0cb
2021-02-10 11:05:22 +01:00
Valere
e5da026f1f Dev tools initial commit 2021-02-10 10:17:19 +01:00
ganfra
370b9dabff VoIP: made some minor changes after review 2021-02-09 19:42:05 +01:00
SpiritCroc
2c22f1e926 Treat manually unread chats as notifications in bottom tabs
Change-Id: I34cea91674843d8d60285295b449d2722cb061e9
2021-02-09 17:48:00 +01:00
Benoit Marty
2cbce016bc Add missing case in a (not used) fun 2021-02-09 12:59:23 +01:00
Benoit Marty
f78c72db59 Merge branch 'develop' into feature/fga/voip_v1_start 2021-02-09 11:52:18 +01:00
ganfra
5c4cf3f7c9 VoIP: PR review remarks 2021-02-08 18:43:50 +01:00
Benoit Marty
fade21de57
Merge branch 'develop' into feature/bma/jitsi_in_timeline 2021-02-08 17:43:49 +01:00
ganfra
0ed327646a Merge branch 'develop' into feature/fga/voip_v1_start 2021-02-08 16:45:15 +01:00
Benoit Marty
eecb789603
Merge pull request #2765 from vector-im/feature/bma/big_e2e_rooms
[DANGEROUS PR] Properly delete all objects from Realm, avoid orphaned
2021-02-08 15:44:43 +01:00
Benoit Marty
d2c912e5c4
Merge branch 'develop' into feature/bma/url_preview_fixes 2021-02-08 14:32:55 +01:00
Benoit Marty
f2619df13d Import and cleanup 2021-02-08 14:25:33 +01:00
Benoit Marty
30be440774 Sugar: defined extensions fo deleteOnCascade() methods, as they have to be called in a transaction 2021-02-08 12:37:38 +01:00
Benoit Marty
8363eba32e Better test of a reply 2021-02-08 10:12:01 +01:00
XoseM
e9e3c0d011 Translated using Weblate (Galician)
Currently translated at 44.5% (98 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/gl/
2021-02-08 07:33:39 +00:00
Benoit Marty
b0e5d5d3e5 Copyright 2021-02-07 20:21:31 +01:00
Benoit Marty
07220d7a59 URL preview on reply fallback (#2756) 2021-02-07 15:28:07 +01:00
Benoit Marty
6ee6b0cad9 Ensure no invisible displayName will be used 2021-02-07 12:00:33 +01:00
Benoit Marty
d47ba6bd11 Create a WidgetItemFactory and use it for better rendering of Jitsi widget change (video conference) 2021-02-06 16:52:46 +01:00
Benoit Marty
d903dfb40b
Merge branch 'develop' into feature/bma/widget_url_robustness 2021-02-06 11:19:15 +01:00
Benoit Marty
41e4e823fb HTML unescaping for URL preview (#2766) 2021-02-05 20:40:57 +01:00
Benoit Marty
ad187f99bf
Merge pull request #2779 from vector-im/feature/bca/fix_join_by_alias_deferation
Join room other federation via alias error
2021-02-05 18:48:23 +01:00
Benoit Marty
6ecd63bf5d Fix a new bug 2021-02-05 13:25:58 +01:00
Benoit Marty
afd2ecd384 Remove duplicated method 2021-02-05 12:10:25 +01:00
Benoit Marty
557a5c715a Widget URL: properly encode parameters 2021-02-05 11:47:35 +01:00
Benoit Marty
b068dc39eb Update doc 2021-02-05 11:36:12 +01:00
Benoit Marty
5b3065730e Widget: avoid empty user display name 2021-02-05 09:36:29 +01:00
Benoit Marty
dd0be54b05 Fix lint issue and typo 2021-02-04 20:19:02 +01:00
Benoit Marty
0c613e36f1 Fix lint issue 2021-02-04 18:10:57 +01:00
Valere
6d5f89b65b Fixes #2778 2021-02-04 18:06:35 +01:00
SpiritCroc
c2ce787310 Merge tag 'v1.0.16' into sc
Change-Id: Ia65e40a4acaee3f26a5680f05b3ae1bf8327d4d6

Conflicts:
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
2021-02-04 17:10:15 +01:00
ganfra
6cd462f852 Merge branch 'develop' into feature/fga/voip_v1_start 2021-02-04 16:52:06 +01:00
Weblate
63fb5809bf Merge branch 'origin/develop' into Weblate. 2021-02-03 16:36:51 +00:00
Benoit Marty
9b13381938
Merge pull request #2762 from vector-im/feature/bma/track
Improvements
2021-02-03 17:02:25 +01:00
Benoit Marty
bc22647b48
Merge pull request #2753 from vector-im/feature/bca/sso_reauth
Feature/bca/sso reauth
2021-02-03 16:12:54 +01:00
Benoit Marty
ad9873c565 Some cleanup 2021-02-03 14:52:58 +01:00
Valere
e976100f1a Fix test compilation error 2021-02-03 14:48:43 +01:00
Valere
289a3ab21f remove dev id for now 2021-02-03 14:36:38 +01:00
Weblate
cbda0ad37b Merge branch 'origin/develop' into Weblate. 2021-02-03 08:53:37 +00:00
Slobodan Simić
db6fdcd098 Translated using Weblate (Serbian)
Currently translated at 100.0% (220 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sr/
2021-02-03 08:53:28 +00:00
Benoit Marty
424035f56f Better clearing of RealmLists 2021-02-03 09:46:35 +01:00
Valere
697b551b9b Cleaning / Code review 2021-02-02 23:10:14 +01:00
Valere
0211197c47 SSO UIA for add 3pid + refactoring move RegistrationFlow to api 2021-02-02 22:25:49 +01:00
Benoit Marty
3b65761110 Delete on cascade 2021-02-02 21:23:57 +01:00
Benoit Marty
cfdfd3a8af internal 2021-02-02 21:22:54 +01:00
Benoit Marty
a820443c56 Fix copyright 2021-02-02 13:05:39 +01:00
Valere
2a3962265b SSO UIA for deactivate account 2021-02-02 12:30:46 +01:00
Slobodan Simić
883a22ba83 Translated using Weblate (Serbian)
Currently translated at 89.5% (197 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sr/
2021-02-02 11:21:10 +00:00
sr093906
3e87534ddc Translated using Weblate (Chinese (Simplified))
Currently translated at 86.3% (190 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/zh_Hans/
2021-02-02 11:21:09 +00:00
Benoit Marty
e6fc605b08 Data for Worker overload (#2721) 2021-02-02 11:40:52 +01:00
Valere
8129cd0cd3 Cleaning + changelog 2021-02-02 09:32:04 +01:00
ganfra
9c9c1fa79c VoIP: make some clean up and update CHANGES 2021-02-01 19:19:46 +01:00
Valere
76b425ee8a Cleaning 2021-02-01 16:39:14 +01:00
Valere
5b8215a356 Support SSO provider brand + UI fixes 2021-02-01 16:39:14 +01:00
Valere
9c7df25862 Relax rule for e2e by default 2021-02-01 16:39:14 +01:00
Valere
da16ec0af3 UIA fixes + better error support 2021-02-01 16:39:14 +01:00
Valere
1244d00b31 SSO UIA 2021-02-01 16:39:14 +01:00
Onuray Sahin
06be3e691d Support $matrix_widget_id parameter. 2021-02-01 18:13:26 +03:00
Slobodan Simić
323a0a5aeb Translated using Weblate (Serbian)
Currently translated at 45.9% (101 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sr/
2021-02-01 02:35:53 +00:00
Ihor Hordiichuk
d4516080a2 Translated using Weblate (Ukrainian)
Currently translated at 70.0% (154 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/uk/
2021-02-01 02:35:53 +00:00
Flat Earth Israel Association
60d492370f Added translation using Weblate (Hebrew) 2021-01-30 21:52:40 +00:00
ganfra
f4fd8af3b4 Merge branch 'develop' into feature/fga/voip_v1_start 2021-01-29 18:46:19 +01:00
ganfra
940563f663 Merge branch 'feature/fga/voip_dial_pad' into feature/fga/voip_v1_start 2021-01-29 16:37:46 +01:00
ganfra
191cef6fff VoIP: clean after PR's review 2021-01-29 16:34:30 +01:00
Slobodan Simić
c9a124ba59 Translated using Weblate (Serbian)
Currently translated at 17.2% (38 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sr/
2021-01-29 11:36:00 +00:00
waclaw66
788406a549 Translated using Weblate (Czech)
Currently translated at 100.0% (220 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/cs/
2021-01-29 11:36:00 +00:00
ganfra
88e18a8640 VoIP: fix a bunch of issues 2021-01-27 16:55:34 +01:00
ganfra
1ef9ed5202 VoIP : clean code 2021-01-27 16:05:55 +01:00
Benoit Marty
c794843bb2 Inject the context in the constructor 2021-01-26 17:16:55 +01:00
Benoit Marty
d6a5b9fb48 fulfill assertion about eventId 2021-01-25 16:42:53 +01:00
Benoit Marty
57dba2f29a
Merge branch 'develop' into feature/ons/fix_url_preview_on_edit 2021-01-25 16:05:26 +01:00
Benoit Marty
f64db7f5f3 Fix test compilation 2021-01-25 16:03:31 +01:00
Benoit Marty
128d3845b9 Small rework 2021-01-25 15:19:01 +01:00
Benoit Marty
602ea3327b URL preview: improve fix regarding message edition 2021-01-25 15:11:42 +01:00
Benoit Marty
e55178612c
Merge pull request #2665 from vector-im/feature/bca/dendrite_sync_fix
Fix Dendrite sync response support
2021-01-25 14:23:13 +01:00
Benoit Marty
5a0d62db6f Cleanup (PR review)
Also add some doc and add missing `internal` keyword
2021-01-25 12:42:39 +01:00
Ihor Hordiichuk
35c59e699a Translated using Weblate (Ukrainian)
Currently translated at 53.1% (117 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/uk/
2021-01-24 19:36:38 +00:00
@a2sc:matrix.org
633b80c622 Translated using Weblate (German)
Currently translated at 100.0% (220 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/de/
2021-01-24 19:36:38 +00:00
Auri B. P
b37c203885 Translated using Weblate (Catalan)
Currently translated at 100.0% (220 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/ca/
2021-01-24 19:36:38 +00:00
Benoit Marty
b65fc4f46b rename val 2021-01-22 17:59:56 +01:00
Benoit Marty
401b5e2b7a Move private fun 2021-01-22 17:48:13 +01:00
Benoit Marty
a44d00a31c Create data class. 2021-01-22 17:44:24 +01:00
Benoit Marty
267ae457ee Use const 2021-01-22 17:38:17 +01:00
Benoit Marty
887da0a3d6 Improve code #2 2021-01-22 17:37:25 +01:00
Benoit Marty
07ffd3ded3 Improve code 2021-01-22 17:32:00 +01:00
Benoit Marty
25dbb3e9ea Fix bad copy/paste 2021-01-22 17:26:10 +01:00
Benoit Marty
0a96841336
Merge branch 'develop' into develop 2021-01-22 17:20:36 +01:00
Benoit Marty
4dcd7846b0
Merge pull request #2616 from vector-im/feature/ons/android_11_migration
Migrate to Android 11, API 30.
2021-01-22 17:17:04 +01:00
Andrew Ferrazzutti
daf019b288 Identity: Recompute hashes after M_INVALID_PEPPER
When a new pepper is retrieved after an M_INVALID_PEPPER response,
recompute hashes with that pepper, and send those new hashes in the next
lookup attempt instead of reusing the original hashes.

Signed-off-by: Andrew Ferrazzutti <fair@miscworks.net>
2021-01-21 21:52:19 -05:00
Onuray Sahin
5eeb545ae2 Update url preview when the event is edited. 2021-01-21 15:20:19 +03:00
Benoit Marty
c75eb050df Cleanup and fix test compilation 2021-01-20 16:32:41 +01:00
Benoit Marty
4709002429 Fix clear cache issue: sometimes, after a clear cache, there is still a token, so the init sync service is not started.
Migratiing to supend methods fixes the problem, I'm not sure why...
2021-01-20 15:19:48 +01:00
XoseM
f1390bdd29 Translated using Weblate (Galician)
Currently translated at 36.3% (80 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/gl/
2021-01-19 18:35:55 +00:00
ganfra
0f77c5be90 VoIP : branch dialpad in transfer call screen 2021-01-19 10:46:43 +01:00
Slobodan Simić
dd7aadd01c Translated using Weblate (Serbian)
Currently translated at 10.4% (23 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sr/
2021-01-17 15:36:07 +00:00
MamasLT
b3d102d56e Translated using Weblate (Lithuanian)
Currently translated at 14.5% (32 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/lt/
2021-01-17 15:36:03 +00:00
notramo
ac7e13a701 Translated using Weblate (Hungarian)
Currently translated at 80.0% (176 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/hu/
2021-01-17 15:36:03 +00:00
Slobodan Simić
0593f2f928 Added translation using Weblate (Serbian) 2021-01-17 09:09:59 +00:00
SpiritCroc
53c498b728 Merge tag 'v1.0.14' into sc
Change-Id: I0d3df2f8c5f4e611f3268c4c4d2784f7eac89bb5

Conflicts:
	gradle/wrapper/gradle-wrapper.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/media/UrlsExtractor.kt
	vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt
	vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.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/url/PreviewUrlView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.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
	vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
2021-01-16 11:21:09 +01:00
ganfra
2c0b7ce0f4 Dagger: update to 2.31 and use new AssistedInject 2021-01-15 15:23:24 +01:00
ganfra
55fd983fd3 Merge branch 'feature/fga/voip_v1_start' into feature/fga/voip_dial_pad 2021-01-14 15:10:07 +01:00
Benoit Marty
d6ef3ea08e Fix lint issues 2021-01-14 14:08:08 +01:00
ganfra
3e4a41bd73 DialPad: clean code 2021-01-14 12:35:00 +01:00
Benoit Marty
844fe2c4cd
Merge branch 'develop' into feature/bca/crypto_store_outbound 2021-01-14 10:43:38 +01:00
Benoit Marty
69efb45fb7
Merge pull request #2659 from vector-im/feature/bma/fix_init_sync
Fix issue with delay set to 0
2021-01-14 10:41:10 +01:00
Benoit Marty
c88072e55f
Merge branch 'develop' into feature/bma/investigation 2021-01-14 10:38:56 +01:00