mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-12-23 01:31:24 +03:00
Code Issues Projects Releases Packages Wiki Activity
9611 commits 160 branches 159 tags 271 MiB
Commit graph

3559 commits

Author SHA1 Message Date
Benoit Marty
c70445a9a1 Fix warning 1.5: 'toUpperCase(Locale): String' and 'toLowerCase(Locale): String' are deprecated 2021-05-14 12:48:57 +02:00
Benoit Marty
7a28be941c Fix warning 1.5: 'Char.toInt(): Int' is deprecated 2021-05-14 12:47:09 +02:00
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
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
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
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
Damir Jelić
fe4abbbeef crypto: Fix a bunch of linter warnings 2021-04-27 16:33:13 +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
Damir Jelić
324cdc4db1 Merge remote-tracking branch 'upstream/develop' into rust 2021-04-20 14:44:02 +02:00
Damir Jelić
326641a7e5 crypto: Document the requestRoomKey method 2021-04-20 14:40:58 +02:00
Damir Jelić
711e607fca crypto: Improve the docs a bit 2021-04-20 14:34:54 +02:00
Damir Jelić
389273d56a crypto: Rename the share_group_session method 2021-04-20 14:34:32 +02:00
Damir Jelić
09c0ca10e5 crypto: Enable the sending of outgoing to-device requests 2021-04-20 14:33:43 +02:00
Damir Jelić
ed902fc42a crypto: Improve the startup log line 2021-04-20 14:33:01 +02:00
Damir Jelić
8bfb7a6e0c crypto: Connect the room key requesting to the rust side 2021-04-20 13:29:52 +02:00
Benoit Marty
f8be814079 RegistrationWizard.createAccount() parameters are now all optional, following Matrix spec (#3205) 2021-04-20 12:32:03 +02:00
Damir Jelić
0db07011b1 crypto: Return our own device from the store as well 
The Kotlin side doesn't differentiate between our own device and other
devices of our own user while the Rust side does, create and return our
own device when it's requested from the store using trusted data.
 2021-04-19 19:25:56 +02:00
Damir Jelić
91d28658fc crypto: Correctly decode the byte array when importing keys 2021-04-19 18:04:11 +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
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
Damir Jelić
0afdcb35f1 crypto: Clean up some log lines 2021-04-14 12:46:29 +02:00
Benoit Marty
699b1429b7 Simplify LoginFlowResult model 2021-04-14 12:42:47 +02:00
Damir Jelić
2805772d0a crypto: Notify the rest of the code about received room keys 2021-04-14 12:16:46 +02:00
Damir Jelić
3ba29b4ea9 crypto: Prepare outgoing to-device requests to be sent out 2021-04-14 12:16:09 +02:00
Damir Jelić
aebfef8fa9 crypto: Remove a unused method 2021-04-14 12:15:30 +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
Damir Jelić
543a638e87 crypto: Forward some more errors from the rust side to the kotlin side 2021-04-12 15:03:28 +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
Damir Jelić
e9e3d129ba crypto: Send out some of our requests in parallel 2021-04-09 19:10:25 +02: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
Damir Jelić
99477914df crypto: Remove the higher level Device since it's unlikely we'll be using it 2021-04-09 14:47:59 +02:00
Damir Jelić
9296cab4fc crypto: Expose more device data from the rust side 2021-04-09 13:53:55 +02:00
Damir Jelić
188d2d57c0 crypto: Use a concurrent hashmap for the live devices update logic 2021-04-09 13:53:31 +02:00
Damir Jelić
74a1c226a4 crypto: Introduce some locks for some of our e2ee operations 2021-04-09 12:42:22 +02:00
Damir Jelić
8692f05e34 crypto: Connect the room key discarding logic 2021-04-09 12:35:13 +02:00
Damir Jelić
427eb5e249 Merge remote-tracking branch 'upstream/develop' into rust 2021-04-09 09:47:00 +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
Damir Jelić
5253f9708c crypto: Fix a crash when we access the devices before the olmMachine is set up 
The crypto service is fully initialized only after the first sync but EA
seems to access live devices before that. This results in a crash since
we now use the olm machine to access devices.
 2021-04-08 15:55:38 +02:00
Damir Jelić
edfd1b2fe0 crypto: Get rid of the DeviceKeysManager 2021-04-08 15:55:10 +02:00
Benoit Marty
7b1d313e8e Small cleanup 2021-04-08 12:46:55 +02:00
Damir Jelić
08d0787cc9 crypto: More docs 2021-04-08 11:18:48 +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