Commit graph

3542 commits

Author SHA1 Message Date
Benoit Marty
2ca0a99dce Follow the spec
https://github.com/matrix-org/matrix-doc/blob/travis/msc/voice-messages/proposals/3245-voice-messages.md#unstable-prefix
2021-07-09 21:49:37 +02:00
Benoit Marty
b26aba9fc0 Remove EventDecryptor and inject the cryptoService when needed
Not used anymore in RoomSummaryUpdater, to avoid a DI dependency loop. let's see if this is a problem
2021-07-09 12:50:34 +02:00
Benoit Marty
f609bfaf10 This class is not injected. 2021-07-08 18:39:54 +02:00
Benoit Marty
f8ad024f1b Remove some dead code. 2021-07-08 18:38:49 +02:00
Benoit Marty
54c3b4192e Small cleanup and format 2021-07-08 17:14:45 +02:00
Damir Jelić
d4090c4b0a crypto: Only add our own devices if we're requesting devices for our own user 2021-07-08 16:52:31 +02:00
Damir Jelić
33c2184c52 crypto: Allow verifications to be requested 2021-07-08 12:49:44 +02:00
Benoit Marty
2948f03978
Merge pull request #3551 from vector-im/feature/bca/room_upgrade
Feature/bca/room upgrade
2021-07-08 10:00:01 +02:00
Onuray Sahin
b1c7cb3219 Lint fixes. 2021-07-07 11:37:01 +03:00
Onuray Sahin
7a1b138894 Merge branch 'develop' into feature/ons/voice_message
* develop: (286 commits)
  Fix crash after video call
  Fix issue on button styles
  Clean after benoits review
  Fix warning about implicit type, introduced in Kotlin 1.5.20. "Returning type parameter has been inferred to Nothing implicitly. Please specify type arguments explicitly to hide this warning. Nothing can produce an exception at runtime."
  Bump kotlin_version from 1.5.10 to 1.5.20
  Bump libphonenumber from 8.12.25 to 8.12.26
  Fix call invite processed after call is ended because of fastlane mode.
  Jump to unread: removes unnecessary check which can cause scroll issue
  Jump to unread: avoid blink when jumping
  Clean after Benoits review
  Delete unused drawable to avoid conflict on develop
  Jump to unread: add towncrier file.
  Read marker: fix some issues with jump to unread visibility.
  Stop using ProgressDialog, there is a theme issue with it. It's not maintain by Google since it's deprecated. Force usage of MaterialAlertDialogBuilder to have the same UI effect. We sometimes need to block the UI :/
  Reordering
  Add text style for dialogs
  Colored dialog button is now handled by the theme
  Update theme for material dialog and create a destructive variant
  Reorder buttons
  Update doc
  ...

# Conflicts:
#	library/ui-styles/src/main/res/values/theme_dark.xml
#	library/ui-styles/src/main/res/values/theme_light.xml
#	vector/build.gradle
#	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/composer/TextComposerView.kt
#	vector/src/main/res/values/strings.xml
2021-07-06 13:17:49 +03:00
Benoit Marty
ca45cdd5c7
Merge pull request #3585 from vector-im/feature/bma/wellknown
Improve wellknown usage
2021-07-05 21:36:16 +02:00
Benoit Marty
d29e04f16c Create fun String.getDomain(): String to avoid duplicated code 2021-07-05 16:49:09 +02:00
Benoit Marty
67f41028ff Remove Riot ref: Riot -> Web client 2021-07-05 16:41:26 +02:00
Benoit Marty
edbf70c820
Merge pull request #3273 from vector-im/feature/bma/cleanup_redundant_fields
Cleanup redundant fields - TO BE MERGED ON JULY 1st
2021-07-05 16:16:33 +02:00
Benoit Marty
b285bd0359 Merge branch 'develop' into feature/bca/room_upgrade 2021-07-05 16:01:27 +02:00
Benoit Marty
2513be744c CryptoStore migration has to be object to avoid crash
Thread: main, Exception: java.lang.IllegalArgumentException: Configurations cannot be different if used to open the same file. The most likely cause is that equals() and hashCode() are not overridden in the migration class: org.matrix.android.sdk.internal.database.RealmSessionStoreMigration
2021-07-02 17:29:44 +02:00
Benoit Marty
7dc5d8490f
Merge pull request #3584 from vector-im/feature/bca/fix_oom_spacechild
Fix / dm flattenParents always growing
2021-07-02 09:35:51 +02:00
Valere
adcd1a64df empty migration to fix big flattenParentIds for DM 2021-07-01 15:28:26 +02:00
Benoit Marty
ef31aad42c Fix copyright 2021-07-01 14:47:04 +02:00
Damir Jelić
d24c94d0f9 crypto: Allow the direct start of the short SAS flow 2021-07-01 13:15:26 +02:00
Benoit Marty
ed7be13ea3 PR review part 2 2021-07-01 12:51:33 +02:00
Onuray Sahin
9d48b399df Voice message playback implementation. 2021-07-01 10:49:04 +03:00
Damir Jelić
85e4b5eb49 Merge remote-tracking branch 'upstream/develop' into rust-verification 2021-07-01 08:09:33 +02:00
Benoit Marty
ec515ced66 PR review part 1 2021-06-30 18:54:13 +02:00
Benoit Marty
3e53fa710a
Merge branch 'develop' into feature/bca/room_upgrade 2021-06-30 17:56:32 +02:00
Damir Jelić
cd5aad9a31 crypto: Move the request sending logic into the sender 2021-06-30 16:28:21 +02:00
Damir Jelić
2c1dc053ed crypto: Support answering in-room verifications 2021-06-30 15:48:24 +02:00
Benoit Marty
7292c4e13d Code quality 2021-06-30 13:57:42 +02:00
Benoit Marty
14ac5a292c Auto review 2021-06-30 12:32:43 +02:00
Benoit Marty
8f3db11693 Perform .well-known request first, even if the entered URL is a valid homeserver base url 2021-06-30 11:52:04 +02:00
Benoit Marty
a61917f2b4 Also change base URL for federationAPI 2021-06-30 11:19:22 +02:00
Benoit Marty
38cb8bd33e Store homeServerUriBase independently that the base URL for client-server API
Also handle the migration for the specific matrix-client.matrix.org URL
2021-06-30 11:07:24 +02:00
Benoit Marty
984b1dd6a8 RawService.getWellknown() now takes a domain instead of a matrixId as parameter 2021-06-30 09:20:08 +02:00
Valere
1d8b95560b Fix / dm flattenParents always growing 2021-06-29 14:57:43 +02:00
Damir Jelić
bcfb121215 crypto: Prepare the verification service to allow starting short SAS flows 2021-06-29 11:12:41 +02:00
Benoit Marty
7f70a03f41 Use interface field 2021-06-29 10:58:28 +02:00
Benoit Marty
0d02a197a5 Remove redundant mimetype (vector-im/element-web#2547) 2021-06-29 10:58:28 +02:00
Damir Jelić
304c89a56d crypto: Dispatch updates when we receive MAC events 2021-06-29 10:03:53 +02:00
Damir Jelić
53b3f54808 crypto: Add support to accept the short SAS verification flow 2021-06-29 09:28:41 +02:00
Benoit Marty
9bbe002988
Merge pull request #3531 from vector-im/feature/fga/auto_accept_invite
Feature/fga/auto accept invite
2021-06-28 16:40:10 +02:00
Damir Jelić
6bb7d5faaa crypto: Dispatch verification request cancellations as well 2021-06-28 15:25:31 +02:00
Damir Jelić
1f7311a428 crypto: Allow verification requests to be canelled 2021-06-28 14:08:49 +02:00
Damir Jelić
05119bcf90 crypto: Allow devices to be marked manually as verified 2021-06-28 14:08:08 +02:00
Damir Jelić
02b8b1f5b1 crypto: Clean up the SAS verification transaction a bit 2021-06-28 11:37:27 +02:00
Damir Jelić
d21137d910 crypto: Add a state for when we confirmed the QR code 2021-06-28 11:37:27 +02:00
Damir Jelić
4473af85b1 crypto: Move more of the request sending logic into the sender class 2021-06-28 11:37:27 +02:00
Damir Jelić
6523ca5afe crypto: Allow the displaying of QR codes 2021-06-28 11:37:27 +02:00
Damir Jelić
846242217b crypto: Move the VerificationRequest into a separate file 2021-06-28 11:37:27 +02:00
Damir Jelić
f95c4ae088 crypto: Allow cancelling of SAS transactions 2021-06-28 11:37:27 +02:00
Damir Jelić
f854e9cf1c crypto: Remove the intermediately CancelCode and use strings to map over FFI 2021-06-28 11:37:27 +02:00
Damir Jelić
b53b0a0093 crypto: Use a when instead of a big if/else statement 2021-06-28 11:37:27 +02:00
Damir Jelić
948aa1a141 crypto: Correctly pick up our device verification state 2021-06-28 11:37:27 +02:00
Damir Jelić
aad18ebec7 crypto: Move the sendToDevice logic to a common class and use it for verifications 2021-06-28 11:37:27 +02:00
Damir Jelić
6a79d022c3 crypto: Expose the trust state of our devices 2021-06-28 11:37:27 +02:00
Damir Jelić
6649aaca2e crypto: Support SAS verification up to showing emojis 2021-06-28 11:37:14 +02:00
Damir Jelić
e97ce33ed9 Merge remote-tracking branch 'upstream/develop' into rust-verification 2021-06-28 11:36:57 +02:00
Valere
4aa93d79fe cleaning 2021-06-28 09:42:54 +02:00
Benoit Marty
060e9d7a7e
Merge pull request #3568 from vector-im/dependabot/gradle/kotlin_version-1.5.20
Bump kotlin_version from 1.5.10 to 1.5.20
2021-06-25 19:11:34 +02:00
Benoit Marty
631e7881ef Fix warning about implicit type, introduced in Kotlin 1.5.20.
"Returning type parameter has been inferred to Nothing implicitly. Please specify type arguments explicitly to hide this warning. Nothing can produce an exception at runtime."
2021-06-25 17:42:38 +02:00
ganfra
a2c8680d7a Fix call invite processed after call is ended because of fastlane mode. 2021-06-24 20:49:35 +02:00
Valere
57c75f8039 Ugrade unstable room notice in settings
default update parent, clean migrate bottomsheet layout
2021-06-24 09:38:52 +02:00
Valere
171793d190 room version cap support + room upgrade 2021-06-22 17:35:39 +02:00
ganfra
d8327a5161 Fix crash on signout: release session at the end so you clean up files first. 2021-06-21 11:10:10 +02:00
Damir Jelić
d00b54929f crypto: Add the scaffolding to connect the SAS verification to the rust side 2021-06-20 22:34:54 +02:00
ganfra
4b6484d317 Merge branch 'develop' into feature/fga/auto_accept_invite 2021-06-18 17:37:24 +02:00
ganfra
c551cf3058 Clean and add towncrier 2021-06-18 17:30:32 +02:00
ganfra
6b10406622 AutoAcceptInvite: refact and hide behind flag 2021-06-18 17:24:51 +02:00
Valere
4180b4ccd3 Code review 2021-06-18 10:47:21 +02:00
Valere
19a2b56011 Code review AliasAvailabilityResult 2021-06-18 10:41:24 +02:00
Valere
b1ab6eb58f Add alias management in space settings 2021-06-18 10:41:13 +02:00
Valere
fb337dacd6 Add space alias in creation wizard 2021-06-18 10:41:13 +02:00
Benoit Marty
5325c761f4
Merge pull request #3502 from vector-im/feature/bca/spaces_dnd
Feature/bca/spaces dnd
2021-06-18 10:28:59 +02:00
Benoit Marty
bffa96ae10 Import sas strings 2021-06-18 10:25:37 +02:00
Valere
3dc7a6dc34 cleaning, quality 2021-06-17 17:00:28 +02:00
Valere
682e926965 Dnd enhancement
+ klint fix
2021-06-17 15:53:35 +02:00
Onuray Sahin
cb96886568 Send voice message. 2021-06-17 16:18:20 +03:00
Valere
944c9641a9 Code review 2021-06-17 14:44:24 +02:00
Valere
a1aad53769 Space top level ordering 2021-06-17 14:44:24 +02:00
Damir Jelić
a4e1a5bbcb crypto: Initial support to answer to-device verification requests 2021-06-17 13:38:30 +02:00
Damir Jelić
c0bac69733 crypto-service: Use constants when we check the event type 2021-06-16 13:21:37 +02:00
Damir Jelić
5ad596c3bc crypto: Bind more verification methods and types 2021-06-15 13:22:51 +02:00
Damir Jelić
a144b1f7b5 rust: Fix the build and update our deps 2021-06-15 13:16:30 +02:00
Damir Jelić
f110bf34fa Merge remote-tracking branch 'upstream/develop' into rust 2021-06-15 10:26:16 +02:00
Benoit Marty
dfb01a462e
Merge pull request #3456 from vector-im/feature/fga/dial_pad_tab
Feature/fga/dial pad tab
2021-06-11 12:23:19 +02:00
ganfra
68143ab2cf Merge branch 'develop' into feature/fga/voip_asserted_identity 2021-06-10 16:01:48 +02:00
ganfra
880da9ecd5 Merge branch 'develop' into feature/fga/dial_pad_tab
# Conflicts:
#	vector/src/main/java/im/vector/app/features/call/dialpad/DialPadFragment.kt
#	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
2021-06-10 15:37:24 +02:00
ganfra
dfcffb9464 Merge branch 'develop' into feature/fga/account_data_rework 2021-06-09 18:58:47 +02:00
ganfra
d19dffe45f Clean and add towncrier file 2021-06-09 18:57:35 +02:00
ganfra
e368ba606b Account data: allow querying room account data globally from session) 2021-06-09 18:44:30 +02:00
ganfra
0c6506da8c Account data : define 2 services 2021-06-09 16:20:21 +02:00
Benoit Marty
f7f4ec3ecc Dominaezzz review 2021-06-09 15:41:06 +02:00
Benoit Marty
04f06b2803 Convert KeysImporter to coroutines 2021-06-09 15:41:06 +02:00
Benoit Marty
3be95ca442 Convert KeysExporter to coroutines 2021-06-09 15:39:46 +02:00
Benoit Marty
f99600f115 Convert DefaultTypingService to coroutines 2021-06-09 15:38:50 +02:00
Benoit Marty
209792a9ec Cleanup 2021-06-09 15:38:50 +02:00
Benoit Marty
047c59eba0 Rework colors management 2021-06-09 15:36:20 +02:00
ganfra
a421f37e70 VoIP : clean and add changelog 2021-06-03 19:50:09 +02:00
ganfra
1b8b59076c Should fix issue with DM creation where we can ends up with DM in rooms 2021-06-03 19:36:58 +02:00
ganfra
771b9b8d78 Dial pad tab: second step, add to home 2021-06-02 19:43:39 +02:00
Valere
00ee61a2a0 stable ids for MSC 2858 2021-06-01 12:13:06 +02:00
Benoit Marty
90a16ebbaf /snow -> /snowfall and update wording (iso Element Web) (#3430) 2021-05-31 11:03:02 +02:00
ganfra
0098d435b3 Asserted identity: process event 2021-05-28 18:42:29 +02:00
ganfra
c90717a2c8 Asserted identity: introduce new content 2021-05-28 18:17:14 +02:00
Benoit Marty
575ebdc3e8
Merge pull request #3421 from vector-im/feature/fga/call_transfer
Feature/fga/call transfer
2021-05-28 16:48:01 +02:00
Benoit Marty
fca74e9eb4 Small cleanup during review 2021-05-28 16:36:03 +02:00
Benoit Marty
270a195478
Merge pull request #3425 from vector-im/feature/fga/fix_crash_signout
Fix crash on signout
2021-05-28 15:44:02 +02:00
Benoit Marty
5657da3493
Merge pull request #3401 from vector-im/feature/bca/spaces_fix_3386
Fixes #3386 show space description in explore header
2021-05-28 15:27:49 +02:00
Valere
871360754e Code review 2021-05-28 11:12:10 +02:00
ganfra
cc6263b20f Fix crash on signout 2021-05-28 10:29:21 +02:00
Benoit Marty
0db5dd3d50
Merge pull request #3419 from vector-im/feature/bma/gitter
Feature/bma/gitter
2021-05-27 21:23:05 +02:00
Benoit Marty
302e29831e Compress thumbnail: change Jpeg quality from 100 to 80 (#3396) 2021-05-27 18:42:07 +02:00
Benoit Marty
d2fd652fb5
Merge pull request #3414 from vector-im/feature/bma/wording_homeserver
Feature/bma/wording homeserver
2021-05-27 17:32:27 +02:00
ganfra
8e8bc0055d Call transfer: clean & add changelog 2021-05-27 16:32:14 +02:00
ganfra
bcc360692e Call transfer: makes call transfer working properly 2021-05-27 16:00:32 +02:00
ganfra
90ccc3006d Merge develop into feature/fga/call_transfer 2021-05-27 14:40:06 +02:00
Benoit Marty
ea4b5e19fe VoIP: add protocols checks and third party lookups
Add RoomAccountData and handle RoomSyncAccountData
Virtual rooms: add CallUserMapper, branch onNewInvite and mapping, hide them on sdk side (not ideal solution)
Introduce SessionScopedProperty to handle session dependency in the app
Author: ganfra (rebased by Benoit)
2021-05-27 10:28:32 +02:00
Benoit Marty
64222ff704 Move the class RoomDirectoryData form the SDK to the app 2021-05-26 16:08:56 +02:00
Benoit Marty
535f3ad02d Clean doc 2021-05-26 16:03:13 +02:00
Benoit Marty
898c8cc3a7 Refact: inject ThumbnailExtractor 2021-05-26 14:42:09 +02:00
Valere
d04cbadd04 Compute via param from list utility method 2021-05-26 14:25:21 +02:00
Valere
b75d0cbfc6 Introduce SpaceItem 2021-05-26 14:25:21 +02:00
Valere
432fd67ce2 Fixes #3406 2021-05-26 14:25:21 +02:00
Valere
447bd98a78 Fixes #3386 show space description in explore header 2021-05-26 14:25:21 +02:00
ganfra
e67cb0eae7 Merge branch 'develop' into feature/fga/call_transfer 2021-05-26 12:26:34 +02:00
ganfra
8eeae51cc6 Call transfer: prepare code for consult feature 2021-05-25 15:21:54 +02:00
Benoit Marty
b44c1a1c77
Merge pull request #3383 from vector-im/feature/fga/authenticated_jitsi
Feature/fga/authenticated jitsi
2021-05-25 10:24:54 +02:00
Benoit Marty
6706a88a21
Merge pull request #3188 from vector-im/feature/bma/login_v2
Login v2 - WIP
2021-05-21 14:55:22 +02:00
Benoit Marty
40bb58c9cb
Merge branch 'develop' into feature/bca/fix_3371 2021-05-21 14:53:21 +02:00
Benoit Marty
697b9ff535
Merge branch 'develop' into feature/bca/spaces_quick_fixes 2021-05-21 14:49:12 +02:00
Benoit Marty
fb5dda30bd Better handling of filename 2021-05-21 13:22:47 +02:00
Benoit Marty
762eb0db12 Format update 2021-05-21 13:00:37 +02:00
Valere
ae5a5ec92b Spaces | Personal spaces add DM - Web Parity #3271 2021-05-21 11:46:13 +02:00
Valere
877a64fbce Don't create private spaces with encryption enabled #3363 2021-05-21 11:46:13 +02:00
Valere
8d3167cb66 Code review 2021-05-21 11:42:01 +02:00
Valere
cb6f414c60 Fix | Explore room list: the RoomId is displayed instead of name (#3371) 2021-05-21 11:40:09 +02:00
ganfra
03f81258c4 Jitsi auth: clean after Benoits review 2021-05-20 20:16:37 +02:00
ganfra
894af10934 Jitsi auth: fix some mistakes and gives the jwt to Jitsi 2021-05-20 18:53:56 +02:00
ganfra
e4b65053d4 Jitsi auth: fix openId API 2021-05-20 18:41:27 +02:00
Benoit Marty
8d94b5548d
Merge pull request #3316 from vector-im/feature/bma/secretstoring_migration
Feature/bma/secretstoring migration
2021-05-20 15:45:58 +02:00
Benoit Marty
a7c1dc5cd9
Merge branch 'develop' into feature/bma/login_v2 2021-05-20 15:18:18 +02:00
ganfra
ca2f671286 Jitsi auth: introduce openid token 2021-05-19 19:34:06 +02:00
Benoit Marty
448eda8624 Replace unbreakable space by a regular space 2021-05-18 19:11:57 +02:00
Benoit Marty
36f397be48
Merge branch 'develop' into dependabot/gradle/kotlin_version-1.5.0 2021-05-17 12:15:19 +02:00
Benoit Marty
640b86ca9e
Merge pull request #3341 from vector-im/feature/bma/fix_migration_nightly
Fix a problem with database migration on nightly builds (#3335)
2021-05-14 16:32:28 +02:00
Benoit Marty
08aefa270e internal 2021-05-14 13:15:35 +02:00
Benoit Marty
4a94426d38 Fix warning 1.5: 'sumBy((T) -> Int): Int' is deprecated 2021-05-14 13:10:16 +02:00
Benoit Marty
babbcedd87 Fix warning 1.5: 'Char.toByte(): Byte' is deprecated 2021-05-14 12:49:38 +02:00
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