Benoit Marty
2ca3c68611
Big annoying commit: execute command ./gradlew ktlintFormat
- Fix "import-ordering"
2021-10-01 13:31:15 +02:00
Adam Brown
49e332cb1c
formatting
2021-09-30 17:30:23 +01:00
Adam Brown
7105a20f4f
fixes notifications not being marked as read when the last chunk containing the event is no longer the latest
...
- use explict returns constants to attempt to add more documentation
- queries for the existence of the event in all of the chunk history and if a read receipt exists in the latest chunk (which it should if a user has just read on another client) which allows us to mark old notifications events as read
2021-09-30 17:15:04 +01:00
ganfra
845c396f8f
Clean code after PR review
2021-09-30 16:43:49 +02:00
Benoit Marty
3719382569
Merge pull request #3953 from vector-im/dependabot/gradle/androidx.work-work-runtime-ktx-2.6.0
...
Bump work-runtime-ktx from 2.5.0 to 2.6.0
2021-09-30 14:25:43 +02:00
ganfra
be8c6f1836
Merge branch 'develop' into feature/fga/expose_sync
2021-09-30 12:10:38 +02:00
Benoit Marty
3f7e810f14
Handle change from WorkManager 2.6.0.
...
https://developer.android.com/jetpack/androidx/releases/work#2.6.0
2021-09-30 12:06:57 +02:00
SpiritCroc
38ae03893f
Merge tag 'v1.3.1' into sc
...
Change-Id: I1e5589c78e3398867519b1dbd326581cbe60baea
Conflicts:
vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
vector/src/main/res/drawable/ic_jump_to_unread.xml
vector/src/main/res/drawable/ic_radio_on.xml
vector/src/main/res/drawable/ic_voice_message_locked.xml
vector/src/main/res/drawable/ic_voice_mic_recording.xml
2021-09-30 09:27:15 +02:00
Benoit Marty
0033378f8b
Merge pull request #4050 from vector-im/dependabot/gradle/kotlin-1.5.31
...
Bump kotlin from 1.5.30 to 1.5.31
2021-09-29 17:09:39 +02:00
Benoit Marty
c0adde56df
Merge pull request #4027 from vector-im/feature/fre/permalink
...
Add client base url support for permalinks
2021-09-29 17:08:12 +02:00
Benoit Marty
31a7bfed02
version++
2021-09-29 14:56:10 +02:00
SpiritCroc
0c7981dc26
Revert "Revert "Revert "Use Java 11 source code"""
...
This reverts commit 23afa02cad957e4426cc7fc872910c6f0b556cb5.
Change-Id: I0dc76749a7084473a5c15e84032f0ba5058cac72
Conflicts:
attachment-viewer/build.gradle
library/ui-styles/build.gradle
matrix-sdk-android-rx/build.gradle
matrix-sdk-android/build.gradle
vector/build.gradle
2021-09-29 09:56:32 +02:00
SpiritCroc
4f93eb041c
Merge tag 'v1.3.0' into sc
...
Change-Id: Ib681fa5493f078b15d6110262ba622b9d0384d68
Conflicts:
gradle.properties
vector/build.gradle
vector/src/main/java/im/vector/app/AppStateHandler.kt
vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.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/UnreadMessagesSharedViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
vector/src/main/res/layout/reaction_button.xml
2021-09-29 09:55:02 +02:00
SpiritCroc
b51bd743c7
Revert "Revert "Use Java 11 source code""
...
This will make the latest upstream merge easier.
This reverts commit 302b2865264ec94471c59041ce8efdc45d3764f4.
2021-09-29 09:13:59 +02:00
Benoit Marty
465b8bfe05
Version++
2021-09-27 13:11:15 +02:00
SpiritCroc
45c6a4e9ba
Restore old hasUnread detection algorithm to include notices
...
Change-Id: Ib934a381cad1fec18815e222d61350240ba9d93f
2021-09-25 17:16:53 +02:00
Benoit Marty
045e4bbf76
Merge pull request #4052 from vector-im/feature/adm/email_notification_toggle
...
Add email notification toggle
2021-09-24 20:42:44 +02:00
Valere
1fed27961a
Code review
2021-09-24 19:35:49 +02:00
Valere
0acf90d8cd
Code review
2021-09-24 18:12:12 +02:00
Valere
d59aaa7611
Support entering mail in user invite screen
2021-09-24 18:12:12 +02:00
Adam Brown
4482cbdaa6
using dedicated pusher removal methods for the different types of pushers
...
- also adds a separate removePusher which supports removing any type of pusher
2021-09-24 17:00:48 +01:00
Adam Brown
95b4f99970
making the add email pusher append parameter configurable by clients, typically we wouldn't want to overwrite other accounts but we can expose the option to clients if they want that behaviour
2021-09-24 15:39:08 +01:00
SpiritCroc
3563e76432
Update local unreadCount when marking chat as read
...
Change-Id: I12718de30fb36b701fe4d5e63ccae96e13b9e34c
2021-09-24 15:51:49 +02:00
Benoit Marty
1b262a4df8
Merge pull request #4071 from vector-im/tools/adm/connected_tests
...
Fixing no tests found when running vector:connectedAndroidTest
2021-09-24 09:53:04 +02:00
Adam Brown
7bd8890276
extracting orchestrator dependency to the dependencies.gradle file
2021-09-23 20:24:16 +01:00
Benoit Marty
ed03d2d278
Merge pull request #4021 from vector-im/dependabot/gradle/com.otaliastudios-transcoder-0.10.4
...
Bump transcoder from 0.10.3 to 0.10.4
2021-09-23 19:40:26 +02:00
Benoit Marty
f3c4e9a1df
ktlint
2021-09-23 19:33:38 +02:00
Benoit Marty
80aad8a958
Merge pull request #4033 from vector-im/feature/bca/improve_store_key_throttling
...
Use in memory cache when adding inBoundGroupSession
2021-09-23 19:31:35 +02:00
SpiritCroc
586f565c23
Properly hide unread counts if not supported by homeserver
...
Showing a "1" for every unread chat doesn't make too much sense.
Change-Id: I8e49f2bf20477f9b58039005c411041269ca6652
2021-09-23 18:13:15 +02:00
Benoit Marty
a40cee337e
Fix warning "This expression will be resolved to Int in future releases. Please add explicit conversion call"
2021-09-23 15:52:01 +02:00
Adam Brown
0302d19f47
formatting
2021-09-23 13:20:01 +01:00
Benoit Marty
75fb026289
Rename some classes after new feature implemented
2021-09-23 13:54:03 +02:00
Benoit Marty
306e3cf055
Improve log to track push and sync request
...
Also change some log level from d to v
2021-09-23 13:54:03 +02:00
Benoit Marty
05aff3314d
Add error state
2021-09-23 13:54:03 +02:00
Benoit Marty
f5151463e2
Add the number of rooms and toDevice events in the debug data
2021-09-23 13:54:03 +02:00
Benoit Marty
63a84dcb8a
Add incremental sync status to the room list and the room detail (only in developer mode)
2021-09-23 13:54:03 +02:00
Adam Brown
d31ad7e187
extracting constants for the pusher kinds and email appId
2021-09-23 12:33:48 +01:00
Adam Brown
8316728e53
removing this. usages where there's no clashes
2021-09-23 11:45:09 +01:00
dependabot[bot]
013b16a37d
Bump transcoder from 0.10.3 to 0.10.4
...
Bumps [transcoder](https://github.com/natario1/Transcoder ) from 0.10.3 to 0.10.4.
- [Release notes](https://github.com/natario1/Transcoder/releases )
- [Commits](https://github.com/natario1/Transcoder/compare/v0.10.3...v0.10.4 )
---
updated-dependencies:
- dependency-name: com.otaliastudios:transcoder
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-09-23 08:46:12 +00:00
dependabot[bot]
654010570e
Bump libphonenumber from 8.12.32 to 8.12.33
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.32 to 8.12.33.
- [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.32...v8.12.33 )
---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-09-22 23:05:09 +00:00
SpiritCroc
e1546cec06
Fix wrong notification count calculation
...
Change-Id: Ia136933c3afe60a99362076566b6a5991f4a1ac7
2021-09-22 22:31:27 +02:00
SpiritCroc
8d267649eb
Setting to count unread rooms instead of messages in aggregates
...
Change-Id: I557741771ba8b83cc2ce7bb6c90501ebc14a7736
2021-09-22 19:41:25 +02:00
SpiritCroc
cc13146f81
Update unread counter handling
...
Change-Id: I2f5738b822b4161d18de28074385c5664f3d1f98
2021-09-22 17:50:24 +02:00
SpiritCroc
45746dfbbf
Use MSC 2654 server-reported unread counts
...
Change-Id: I6569f9c07c109bcb17dab48ad7f32480a22efb54
2021-09-22 16:55:46 +02:00
Adam Brown
8734d5d2e7
removing redundant comments about pusher kind from apis which don't have a kind field
2021-09-21 16:08:46 +01:00
Adam Brown
2c25efc36a
making the removePusher more generic as it can handle email and http pushers
...
- Updates the doc to reflect that to remove emails an appId of m.email is required
2021-09-21 13:46:18 +01:00
Adam Brown
78d70eab12
enforcing emails pushes to always be appended
...
- always appending allows the same email to be used for other accounts see https://github.com/matrix-org/matrix-react-sdk/pull/2727 https://github.com/matrix-org/matrix-react-sdk/pull/2727/files#diff-ec232520bf51337e5e6939b885d21f428ad6da3306c8e17a3ff660b2b341179dR165
2021-09-21 11:32:33 +01:00
Adam Brown
516bb6ed95
lifting the email branding to its own parameter so clients of the sdk can configure it
2021-09-21 11:26:11 +01:00
Adam Brown
ee3f2877e9
adding matrix SDK support for email adding and removing email pushes
...
- email pushes make use of a new undocumented `brand` field, for now this field maps directly to the app display name so we can resuse it
2021-09-21 09:52:00 +01:00
Florian Renaud
fa3abecf8f
Fix review
2021-09-20 15:18:06 +02:00
SpiritCroc
756529e565
Revert "Use Java 11 source code"
...
This seems to break device compatibility with a ZTE Blade L3, Android
5.0.2, stock ROM - even though the Google Play Developer Console views
the device as supported.
Not sure how long we want to stick to Java 8, but we should at least
give everyone who had v1.2.0 installed the chance to get to v1.2.2, to
get a version with the recent security vulerability fix.
This reverts commit 80f23f1f3c
.
Change-Id: If599d9154e9385a33f10b6df17469cd86deccb7b
2021-09-18 20:26:29 +02:00
Benoit Marty
b5f7351564
Merge pull request #4008 from vector-im/feature/fga/small_timeline_optimisation
...
Feature/fga/small timeline optimisation
2021-09-17 18:06:58 +02:00
Florian Renaud
e37fb313c0
Permalink: Merge LinkHandlerActivity with PermalinkHandlerActivity
...
Also convert links to matrix.to before permalink parsing
2021-09-17 17:19:32 +02:00
Florian Renaud
a73f0a9fa8
Permalink: use client base url if any
2021-09-17 16:46:09 +02:00
Florian Renaud
0d344fde03
Permalink: add client url field in MatrixConfiguration
2021-09-17 16:46:09 +02:00
Florian Renaud
afb49430be
Permalink: move method implementation from service to factory
2021-09-17 16:46:09 +02:00
Benoit Marty
744523b200
Merge pull request #4017 from vector-im/feature/aris/optimize_global_gradle_variables
...
Optimize dependencies handling
2021-09-17 15:28:49 +02:00
ariskotsomitopoulos
1dcf6b9539
Enhance dependencies handling to support Dependabot
2021-09-17 14:58:44 +03:00
Valere
22319a0f0a
Cleaning, line too long
2021-09-16 09:33:06 +02:00
Valere
e5de62b57c
Code review
2021-09-16 09:33:06 +02:00
Valere
94f88c80fc
Fix parent relation handling
2021-09-16 09:33:06 +02:00
ariskotsomitopoulos
87fefdc7bb
Add more dependencies to common dependencies.gradle
2021-09-15 20:22:52 +03:00
Valere
70ebb3a3f2
Code review
2021-09-15 18:48:40 +02:00
Valere
2c1435f08c
Change default power to invite in private space + setting
2021-09-15 18:47:38 +02:00
Benoit Marty
d6b261ce4c
Merge pull request #3986 from vector-im/feature/bca/room_summary_api
...
Better room preview, use room Summary API if available
2021-09-15 15:03:31 +02:00
ariskotsomitopoulos
c89b2c0536
Optimize dependencies handling
2021-09-15 13:21:25 +03:00
Valere
f2b7ee3e06
Code review
2021-09-15 09:21:30 +02:00
Benoit Marty
73692bc067
Merge pull request #3630 from vector-im/dependabot/gradle/org.robolectric-robolectric-4.6.1
...
Bump robolectric from 4.5.1 to 4.6.1
2021-09-14 21:01:18 +02:00
Valere
7142cd899b
Use in memory cache when adding inBoundGroupSession
2021-09-14 14:01:17 +02:00
SpiritCroc
741ac9f3f6
Merge tag 'v1.2.2' into sc
...
Change-Id: Icda1859305bac1e48f3d1889282a23049dd83c29
2021-09-13 15:37:54 +02:00
Valere
3a0734f6e2
Store device key in SharedSessionEntity
...
Code review changes
Fix database migraiton
Fix wrong self assignement + comment
2021-09-13 15:29:45 +02:00
Valere
8d2f95d5db
Store device key in SharedSessionEntity
...
Code review changes
Fix database migraiton
Fix wrong self assignement + comment
2021-09-13 15:25:30 +02:00
dependabot[bot]
d54549bdf3
Bump robolectric from 4.5.1 to 4.6.1
...
Bumps [robolectric](https://github.com/robolectric/robolectric ) from 4.5.1 to 4.6.1.
- [Release notes](https://github.com/robolectric/robolectric/releases )
- [Commits](https://github.com/robolectric/robolectric/compare/robolectric-4.5.1...robolectric-4.6.1 )
---
updated-dependencies:
- dependency-name: org.robolectric:robolectric
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-09-13 09:25:33 +00:00
dependabot[bot]
57abc04752
Bump libphonenumber from 8.12.31 to 8.12.32
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.31 to 8.12.32.
- [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.31...v8.12.32 )
---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-09-10 23:07:44 +00:00
ganfra
f96485c493
Timeline: use json directly to be a bit more speedy (those methods are called a lot)
2021-09-09 19:06:09 +02:00
SpiritCroc
f4d8f78ac7
Fix timeline rebuild on DM state change
...
Needs slightly different handling after
50a042683b
"Architecture: get rid of RoomSummariesHolder as it can lead to errors"
Change-Id: I1d34ca5058d93a73dc26c3b2fee7f8a296ec4880
2021-09-09 12:12:31 +02:00
SpiritCroc
133579d066
Merge tag 'v1.2.1' into sc
...
Change-Id: I7446b0a3b8f2bbeee76e337e78eb722cbd05ef2a
Conflicts:
build.gradle
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector/src/main/java/im/vector/app/core/di/VectorComponent.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/composer/VoiceMessageRecorderView.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/actions/RoomListQuickActionsEpoxyController.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
2021-09-09 10:51:12 +02:00
Benoit Marty
3fcfe7000f
Update user agent: MatrixAndroidSDK_X
is replaced by MatrixAndroidSdk2
2021-09-09 09:59:06 +02:00
Benoit Marty
5a5d4fda2d
DSL value has shorter alias now
2021-09-09 09:55:24 +02:00
Benoit Marty
529a7aedcb
Cleanup useless values
2021-09-09 09:55:24 +02:00
Benoit Marty
6a1409ba59
Better management of SDK version
2021-09-09 09:55:24 +02:00
Valere
b1c95e32eb
Better room preview, use room Summary API if available
2021-09-08 13:55:22 +02:00
Onuray Sahin
3bd392a55d
Code review fixes.
2021-09-08 13:44:52 +03:00
Onuray Sahin
1df867f345
Fix rendering voice message if the waveform data is corrupted.
2021-09-08 13:20:56 +03:00
Benoit Marty
ffedd6fcfa
Fix other warning
2021-09-03 17:02:14 +02:00
Benoit Marty
fc22376050
Ignore warning in test.
...
There is probably a better way than using the GlobalScope, but I'm not sure how to do it now.
2021-09-03 17:02:14 +02:00
Benoit Marty
377c4e00a3
Merge pull request #3954 from vector-im/dependabot/gradle/com.android.tools.build-gradle-7.0.2
...
Bump gradle from 4.2.2 to 7.0.2
2021-09-03 12:11:52 +02:00
Valere
1c7e567187
Fix test compilation (autojoin descoped)
2021-09-02 11:56:16 +02:00
Valere
9687a59371
Code review
2021-09-02 11:34:08 +02:00
Valere
97114b4f48
cleaning
2021-09-02 11:34:08 +02:00
Valere
0bcd363677
Cleaning
2021-09-02 11:34:08 +02:00
Valere
5297512f87
Support Space explore pagination
2021-09-02 11:34:08 +02:00
Benoit Marty
ec6bae6b1e
Lint now check all the modules, but is does not check all the variants. Let's keep it like that for now
...
https://developer.android.com/studio/releases/gradle-plugin#running_lint_on_default_variant_only
2021-09-02 10:43:33 +02:00
Benoit Marty
80f23f1f3c
Use Java 11 source code
...
https://developer.android.com/studio/releases/gradle-plugin#java-11
2021-09-02 09:50:34 +02:00
Benoit Marty
616e5b17f0
Fix warning
...
provider#androidx.work.impl.WorkManagerInitializer was tagged at AndroidManifest.xml:16 to remove other declarations but no other declaration present
2021-09-02 09:43:39 +02:00
Valere
ec77006ddf
FIx / bad format of restricted join rule
2021-09-01 17:15:37 +02:00
yostyle
d579670080
Add password matrix errors
2021-09-01 10:30:20 +02:00
Benoit Marty
32bad57536
Cleanup
2021-08-31 11:50:23 +02:00
Benoit Marty
d304469903
Merge branch 'develop' into develop
2021-08-30 14:25:13 +02:00
Benoit Marty
23e3241b95
Merge pull request #1809 from dkter/conversation-features
...
Support Android 11 Conversation features
2021-08-30 14:15:42 +02:00
Benoit Marty
2a89e2b4ac
Merge pull request #3908 from vector-im/feature/fga/fix_jitsi_widget
...
Fix Jitsi-hosted jitsi conferences not loading
2021-08-30 13:57:39 +02:00
dependabot[bot]
7cc1de0eb2
Bump realm-gradle-plugin from 10.7.1 to 10.8.0
...
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java ) from 10.7.1 to 10.8.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.7.1...v10.8.0 )
---
updated-dependencies:
- dependency-name: io.realm:realm-gradle-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-08-27 23:06:59 +00:00
Benoit Marty
65c8ae3597
Merge pull request #3739 from vector-im/feature/bca/accept_unbound_3pid_invite
...
support email invite
2021-08-27 19:02:42 +02:00
Benoit Marty
5b2478a34f
Merge pull request #3894 from vector-im/feature/dla/keyword_notification_settings
...
Feature/dla/keyword notification settings
2021-08-27 18:19:17 +02:00
Benoit Marty
54a4a84ac0
Merge pull request #3741 from vector-im/dependabot/gradle/daggerVersion-2.38.1
...
Bump daggerVersion from 2.38 to 2.38.1
2021-08-27 17:37:03 +02:00
Valere
1ffacd1788
Code review
2021-08-27 17:30:32 +02:00
Valere
819e7c49b0
Code review
2021-08-27 17:30:32 +02:00
Valere
f2ab0987cc
Add change log + cleaning
2021-08-27 17:30:09 +02:00
Valere
69c84a2460
support email invite
2021-08-27 17:30:09 +02:00
Valere
4107d2643c
Merge pull request #3704 from vector-im/feature/bca/promote_restricted
...
Promote restricted join rule to admins
2021-08-27 17:27:57 +02:00
Benoit Marty
048800684c
Merge pull request #3914 from vector-im/feature/bma/enabled_body
...
PushRule enabling request is not following the spec
2021-08-27 16:58:51 +02:00
dependabot[bot]
7a44c6980c
Bump daggerVersion from 2.38 to 2.38.1
...
Bumps `daggerVersion` from 2.38 to 2.38.1.
Updates `dagger` from 2.38 to 2.38.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.38...dagger-2.38.1 )
Updates `dagger-compiler` from 2.38 to 2.38.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.38...dagger-2.38.1 )
---
updated-dependencies:
- dependency-name: com.google.dagger:dagger
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger-compiler
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-08-27 14:33:17 +00:00
Benoit Marty
fa1a6b141a
Merge pull request #3832 from vector-im/dependabot/gradle/com.jakewharton.timber-timber-5.0.1
...
Bump timber from 4.7.1 to 5.0.1
2021-08-27 16:32:29 +02:00
Benoit Marty
276b89b8b7
PushRule enabling request is not following the spec
2021-08-27 16:15:08 +02:00
Valere
b408d7346f
Fix / use unstable prefix for room_capabilities
2021-08-27 15:56:07 +02:00
Florian Renaud
7714cc41f7
Attach documentation reference to expired account error
2021-08-27 14:33:12 +02:00
Florian Renaud
1ca4b3b78a
Add expired account error code
...
For synapse instances which have activated and configured the email account validity module, an error code (ORG_MATRIX_EXPIRED_ACCOUNT) is triggered for any request authenticated by the user's access token which is expired.
This change only add the error code in the matrix SDK but does not handle it for now in the client side.
More documentation can be found in the dedicated Synapse plugin module repository: https://github.com/matrix-org/synapse-email-account-validity
2021-08-27 14:28:07 +02:00
ganfra
84e6a67a51
Jitsi widget: refact a bit so we use data instead of url when possible
2021-08-27 14:03:52 +02:00
David Teresi
842ccb12b2
Improve shortcut sorting
2021-08-25 13:41:32 -04:00
David Langley
daaa40b27a
Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/keyword_notification_settings
2021-08-25 17:41:37 +01:00
David Langley
1d767d6e3f
Fix keyword style, preference persistence and add comment to keyword ruleid
2021-08-25 17:38:12 +01:00
Benoit Marty
4ad542f0d3
Merge pull request #3891 from vector-im/fre/when_statement
...
Use `when` statement instead of `if`/ `else`
2021-08-25 12:03:31 +02:00
Benoit Marty
4a4c76c4c4
Merge pull request #3896 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.31
...
Bump libphonenumber from 8.12.30 to 8.12.31
2021-08-25 11:59:18 +02:00
dependabot[bot]
8988ea8997
Bump libphonenumber from 8.12.30 to 8.12.31
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.30 to 8.12.31.
- [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.30...v8.12.31 )
---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-08-24 23:09:52 +00:00
David Langley
fb8c7f6be0
lint
2021-08-24 19:08:27 +01:00
ganfra
2e2deba3ac
Fix message edition is not rendered in e2e rooms after pagination ( #3887 )
2021-08-24 19:58:54 +02:00
David Langley
3481fc70c7
Cleanup and fix resValue
2021-08-24 16:49:18 +01:00
David Langley
238f772461
Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/keyword_notification_settings
2021-08-24 15:51:23 +01:00
Florian Renaud
07adc43481
Use when
statement instead of if
/ else
2021-08-24 15:38:33 +02:00
Benoit Marty
c301bcf4b6
Send an empty body for POST rooms/{roomId}/receipt/{receiptType}/{eventId}
2021-08-23 16:49:45 +02:00
ganfra
a968a848b0
Sync: exposes ShareFlow<SyncResponse> from the SyncThread
2021-08-23 16:46:37 +02:00
ganfra
ebe1e28689
Sync: makes SyncResponse in public API
2021-08-23 16:46:13 +02:00
Benoit Marty
9fa862ec76
Merge pull request #3711 from vector-im/feature/bma/sendToDevice
...
Ensure that txnId is the same if the request is retried
2021-08-23 16:11:33 +02:00
Benoit Marty
4a33fbb635
Merge pull request #3743 from vector-im/florian14/dm_email_invite
...
Update Account Data with user matrix id for invited user by email
2021-08-23 16:08:39 +02:00
dependabot[bot]
3a03b5b63c
Bump timber from 4.7.1 to 5.0.1
...
Bumps [timber](https://github.com/JakeWharton/timber ) from 4.7.1 to 5.0.1.
- [Release notes](https://github.com/JakeWharton/timber/releases )
- [Changelog](https://github.com/JakeWharton/timber/blob/trunk/CHANGELOG.md )
- [Commits](https://github.com/JakeWharton/timber/compare/4.7.1...5.0.1 )
---
updated-dependencies:
- dependency-name: com.jakewharton.timber:timber
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-08-23 13:12:59 +00:00
Benoit Marty
d659479040
Merge pull request #3784 from vector-im/dependabot/gradle/io.realm-realm-gradle-plugin-10.7.1
...
Bump realm-gradle-plugin from 10.6.1 to 10.7.1
2021-08-23 15:08:42 +02:00
Benoit Marty
ed639a254e
Merge pull request #3795 from vector-im/dependabot/gradle/androidx.exifinterface-exifinterface-1.3.3
...
Bump exifinterface from 1.3.2 to 1.3.3
2021-08-23 15:05:12 +02:00
SpiritCroc
2f4d379ed0
Do not crash on sending 0 byte videos
...
java.lang.RuntimeException: setDataSource failed: status = 0xFFFFFFEA
at android.media.MediaMetadataRetriever._setDataSource(MediaMetadataRetriever.java)
at android.media.MediaMetadataRetriever.setDataSource(MediaMetadataRetriever.java:306)
at android.media.MediaMetadataRetriever.setDataSource(MediaMetadataRetriever.java:327)
at android.media.MediaMetadataRetriever.setDataSource(MediaMetadataRetriever.java:376)
at org.matrix.android.sdk.internal.session.room.send.LocalEchoEventFactory.createVideoEvent
at org.matrix.android.sdk.internal.session.room.send.LocalEchoEventFactory.createMediaEvent
at org.matrix.android.sdk.internal.session.room.send.DefaultSendService.sendMedia(DefaultSendService.kt:253)
at org.matrix.android.sdk.internal.session.room.send.DefaultSendService.sendMedias(DefaultSendService.kt:240)
at org.matrix.android.sdk.internal.session.room.DefaultRoom.sendMedias
at im.vector.app.features.home.room.detail.RoomDetailViewModel.handleSendMedia(RoomDetailViewModel.kt:1158)
at im.vector.app.features.home.room.detail.RoomDetailViewModel.handle(RoomDetailViewModel.kt:298)
at im.vector.app.features.home.room.detail.RoomDetailFragment$contentAttachmentActivityResultLauncher$1.invoke(RoomDetailFragment.kt:1161)
at im.vector.app.features.home.room.detail.RoomDetailFragment$contentAttachmentActivityResultLauncher$1.invoke(RoomDetailFragment.kt:1156)
at im.vector.app.core.extensions.FragmentKt.registerStartForActivityResult$lambda-0
at im.vector.app.core.extensions.FragmentKt.lambda$6uyRKSScfR1yqThCkGUu8777SL8
at im.vector.app.core.extensions.-$$Lambda$FragmentKt$6uyRKSScfR1yqThCkGUu8777SL8.onActivityResult(lambda:0)
at androidx.activity.result.ActivityResultRegistry$1.onStateChanged(ActivityResultRegistry.java:148)
at androidx.lifecycle.LifecycleRegistry$ObserverWithState.dispatchEvent(LifecycleRegistry.java:354)
at androidx.lifecycle.LifecycleRegistry.forwardPass(LifecycleRegistry.java:265)
at androidx.lifecycle.LifecycleRegistry.sync(LifecycleRegistry.java:307)
at androidx.lifecycle.LifecycleRegistry.moveToState(LifecycleRegistry.java:148)
at androidx.lifecycle.LifecycleRegistry.handleLifecycleEvent(LifecycleRegistry.java:134)
at androidx.fragment.app.Fragment.performStart(Fragment.java:3026)
at androidx.fragment.app.FragmentStateManager.start(FragmentStateManager.java:589)
at androidx.fragment.app.FragmentStateManager.moveToExpectedState(FragmentStateManager.java:300)
at androidx.fragment.app.FragmentStore.moveToExpectedState
at androidx.fragment.app.FragmentManager.moveToState(FragmentManager.java:1647)
at androidx.fragment.app.FragmentManager.dispatchStateChange(FragmentManager.java:3128)
at androidx.fragment.app.FragmentManager.dispatchStart
at androidx.fragment.app.FragmentController.dispatchStart
at androidx.fragment.app.FragmentActivity.onStart(FragmentActivity.java:510)
at androidx.appcompat.app.AppCompatActivity.onStart(AppCompatActivity.java:246)
at android.app.Instrumentation.callActivityOnStart(Instrumentation.java:1455)
at android.app.Activity.performStart(Activity.java:8076)
at android.app.ActivityThread.handleStartActivity(ActivityThread.java:3653)
at android.app.servertransaction.TransactionExecutor.performLifecycleSequence(TransactionExecutor.java:221)
at android.app.servertransaction.TransactionExecutor.cycleToPath(TransactionExecutor.java:201)
at android.app.servertransaction.TransactionExecutor.executeLifecycleState(TransactionExecutor.java:173)
at android.app.servertransaction.TransactionExecutor.execute(TransactionExecutor.java:97)
at android.app.ActivityThread$H.handleMessage(ActivityThread.java:2203)
at android.os.Handler.dispatchMessage(Handler.java:106)
at android.os.Looper.loopOnce(Looper.java:201)
at android.os.Looper.loop(Looper.java:288)
at android.app.ActivityThread.main(ActivityThread.java:7822)
at java.lang.reflect.Method.invoke(Method.java)
at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:548)
at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:1003)
Change-Id: Ib909abe6468703452d53e760bde414e81a8876e3
2021-08-20 09:15:58 +02:00
dependabot[bot]
fac0198b26
Bump libphonenumber from 8.12.28 to 8.12.30
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.28 to 8.12.30.
- [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.28...v8.12.30 )
---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-08-17 23:05:56 +00:00
SpiritCroc
677330921d
Merge tag 'v1.1.16' into sc
...
v1.1.16
Change-Id: Id68bd7e36129c9168cc871d81c5c0935b689e1e9
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
2021-08-10 09:54:58 +02:00
Onuray Sahin
885a663380
Fix error when sending encrypted message if someone in the room logs out.
2021-08-06 15:23:24 +03:00
dependabot[bot]
fb5b167e31
Bump exifinterface from 1.3.2 to 1.3.3
...
Bumps exifinterface from 1.3.2 to 1.3.3.
---
updated-dependencies:
- dependency-name: androidx.exifinterface:exifinterface
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-08-04 23:10:45 +00:00
dependabot[bot]
211bb8e96c
Bump realm-gradle-plugin from 10.6.1 to 10.7.1
...
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java ) from 10.6.1 to 10.7.1.
- [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.6.1...v10.7.1 )
---
updated-dependencies:
- dependency-name: io.realm:realm-gradle-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-08-03 23:07:02 +00:00
SpiritCroc
d268930a5c
Fix sending encrypted messages after someone logged out a device
...
Removing devices in foreach resulted in an exception, thus the device
did not get properly removed, which resulted in following issues:
- In the room settings, members would show with unverified devices,
where devices were actually logged out
- Sending encrypted messages to contacts who logged out a device did
lead to a "Message failed to send" with Retry button showing
E/ /Tag: ## CRYPTO | refreshOutdatedDeviceLists() : ERROR updating device keys for users [@redacted:somematrixserver.com]
java.util.NoSuchElementException: Cannot access index 10 when size is 9. Remember to check hasNext() before using next().
at io.realm.RealmList$RealmItr.next(RealmList.java:9)
at org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStore$storeUserDevices$1.invoke(RealmCryptoStore.kt:41)
at org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStore$storeUserDevices$1.invoke(RealmCryptoStore.kt:1)
at org.matrix.android.sdk.internal.crypto.store.db.-$$Lambda$HelperKt$XtYpPdQTMtzbOWZdtlMV_aWM9XY.execute(lambda:2)
at io.realm.Realm.executeTransaction(Realm.java:9)
at org.matrix.android.sdk.api.MatrixCallback$DefaultImpls.doRealmTransaction(MatrixCallback.kt:2)
at org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStore.storeUserDevices(RealmCryptoStore.kt:1)
at org.matrix.android.sdk.internal.crypto.DeviceListManager.doKeyDownloadForUsers(DeviceListManager.kt:120)
at org.matrix.android.sdk.internal.crypto.DeviceListManager$doKeyDownloadForUsers$1.invokeSuspend(DeviceListManager.kt:1)
at kotlin.coroutines.jvm.internal.BaseContinuationImpl.resumeWith(ContinuationImpl.kt:3)
at kotlinx.coroutines.DispatchedTask.run(DispatchedTask.kt:18)
at android.os.Handler.handleCallback(Handler.java:883)
at android.os.Handler.dispatchMessage(Handler.java:100)
at android.os.Looper.loop(Looper.java:237)
at android.os.HandlerThread.run(HandlerThread.java:67)
Change-Id: Icd3e21f15c6672673fec58e0fc617fa8c57ba18e
2021-08-03 12:00:52 +02:00
David Langley
8d7e3b6544
add keyword checkbox preference and chip/edit text for modificying keywords
2021-08-03 09:52:36 +01:00
SpiritCroc
2db315219a
Lab setting to load rooms at first unread message
...
Change-Id: I781e5a32d8557939c51387eadf1387cba0d3b149
2021-08-02 13:57:54 +02:00
SpiritCroc
6c9c2eaef5
Fix scrolling to bottom if it's not far and it wasn't at bottom initially
...
Change-Id: Ifaf2395140d30b456acd9130bd058ed573888423
2021-08-01 12:11:58 +02:00
SpiritCroc
25ba52115b
Merge tag 'v1.1.15' into sc
...
Change-Id: I6bc7a7c052ccaae6adec247889b37baac2672ba4
Conflicts:
vector/src/main/assets/open_source_licenses.html
vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
vector/src/main/res/drawable/ic_insert_emoji.xml
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
vector/src/main/res/layout/fragment_room_detail.xml
vector/src/main/res/layout/item_timeline_event_base.xml
vector/src/main/res/xml/vector_settings_labs.xml
2021-08-01 09:37:33 +02:00
Valere
efdaa49e70
Code review
2021-07-30 18:44:25 +02:00
Valere
a7dc7e8d8a
klint
2021-07-30 18:44:14 +02:00
Valere
88fec379c4
Cleaning
2021-07-30 18:44:14 +02:00
Valere
5adceaca23
Code quality
2021-07-30 18:44:14 +02:00
Valere
2f16a7fff3
Restricted room mgmt when supported
2021-07-30 18:43:34 +02:00
Valere
6c2a917d9f
WIP
2021-07-30 18:43:34 +02:00
Onuray Sahin
c6bd6e4961
Merge pull request #3598 from vector-im/feature/ons/voice_message
...
Voice Message
2021-07-30 17:24:17 +03:00
Benoit Marty
7cd90b0b14
Merge pull request #3760 from vector-im/feature/bma/otk1
...
2 small fixes
2021-07-30 12:55:57 +02:00
Florian Renaud
0a08746937
Set DirectMessagesContent immutable
2021-07-30 11:20:35 +02:00
Benoit Marty
57f3a2437e
cleanup
2021-07-30 10:59:46 +02:00
Benoit Marty
54f707644c
Migration to cleanup orphan TrustLevelEntities
2021-07-29 17:42:55 +02:00
Benoit Marty
b4e7f10019
Better algorithm to update user devices
...
Should fix the problem of too many TrustLevelEntity objects
2021-07-29 16:46:09 +02:00
Benoit Marty
5eb794f8af
Small optimization
2021-07-29 15:39:03 +02:00
chagai95
426389194e
removing double the
2021-07-29 13:35:03 +02:00
Florian Renaud
ac56b1ef3e
Update account data for invited users by email
...
When an user has been invited by email to a DM, account data entry was stuck on the user email after the user account creation.
When the user has joined element, an event m.room.member is triggered for each room attached to the user, containing a third party invite with the user matrix id. We use this event to update the user account with the matrix id.
2021-07-29 09:37:33 +02:00
cfriedlander
f45338be4c
confirming to reviewed PR
2021-07-28 18:55:10 +02:00
Florian Renaud
6d47fdf3d3
Rename getLocalUserAccount to getLocalDirectMessages
2021-07-28 10:29:54 +02:00
Benoit Marty
4caf333769
Do not check the baseURL to override if it is the same than the one previously known and used
2021-07-27 09:59:01 +02:00
David Langley
9c139b3bd0
Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/fix_account_notifications_discrepancies
2021-07-26 22:55:27 +01:00
cfriedlander
618ab6c862
the base domain permalinks don't have the mxid in the first param but in the second after /user/mxid
2021-07-26 14:25:31 +02:00
SpiritCroc
acb12c2005
Merge tag 'v1.1.14' into sc
...
Change-Id: I7668fc7603c8f6e7aafa89886bb0fdf586e4a871
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
2021-07-24 10:12:48 +02:00
David Langley
5d092ce18a
simplify getHighlight logic
2021-07-23 14:29:37 +01:00
Benoit Marty
adabb31688
Changelog
2021-07-23 11:25:56 +02:00
Benoit Marty
0c211d7b1e
Merge pull request #3723 from vector-im/feature/fga/log_tags_voip
...
Feature/fga/log tags voip
2021-07-23 11:23:09 +02:00
Benoit Marty
b764746323
Merge pull request #3724 from vector-im/feature/bma/ensureOTK
...
Ensure OTKs are uploaded when the session is created
2021-07-23 11:21:07 +02:00
ganfra
45a51d138e
Voip log: clean after Benoit review
2021-07-23 09:50:09 +02:00
Benoit Marty
ed0143c240
Log errors
2021-07-22 16:20:16 +02:00
Benoit Marty
1d5ed46a49
Small cleanup
2021-07-22 16:01:01 +02:00
Benoit Marty
05988107a7
Ask the number of OTK if unknown from the sync.
2021-07-22 15:59:37 +02:00
ganfra
e356e71431
Merge branch 'develop' into feature/fga/log_tags_voip
2021-07-22 15:32:25 +02:00
Benoit Marty
7a7c292b3c
Rename store API
2021-07-22 15:26:11 +02:00
Benoit Marty
be488ae75a
Ensure OTK are uploaded when we upload the device keys
...
The sync response can omit the field device_one_time_keys_count.signed_curve25519 and the SDK was waiting to know this value to upload the OTK.
Now the SDK uploads the OTK when it uploads the device keys.
2021-07-22 15:24:05 +02:00
ganfra
79c8ef7ebf
LoggerTag: try new thing and branch more on VOIP
2021-07-22 15:22:15 +02:00
dependabot[bot]
a75ceee03f
Bump appcompat from 1.3.0 to 1.3.1
...
Bumps appcompat from 1.3.0 to 1.3.1.
---
updated-dependencies:
- dependency-name: androidx.appcompat:appcompat
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-07-22 12:13:24 +00:00
Benoit Marty
19f9f5a6ee
Merge pull request #3715 from vector-im/feature/bma/initialState
...
Add initialState support to CreateRoomParams
2021-07-22 14:11:49 +02:00
Benoit Marty
4bbf175187
Fix a crash which can happen when user signs out.
...
The crypto DB has been deleted, and the key download request is cancelled, but in the catch block we tried to write to the deleted DB
2021-07-22 12:48:13 +02:00
ganfra
115f00ff1a
Start experiment on log tags
2021-07-22 10:12:46 +02:00
Benoit Marty
5d65c83a3d
Merge pull request #3712 from vector-im/feature/fga/missed_call_notification
...
Feature/fga/missed call notification
2021-07-22 09:46:40 +02:00
Benoit Marty
966a959e41
do not send empty invite list when creating a room
2021-07-21 20:56:08 +02:00
Benoit Marty
b862e5ccbf
Add initialState support to CreateRoomParams ( #3713 )
2021-07-21 20:53:17 +02:00
ganfra
8955049110
Minor changes after benoits review
2021-07-21 17:35:08 +02:00
Benoit Marty
08ea3c0888
More useful comment
2021-07-21 14:40:07 +02:00
Benoit Marty
4ead39038c
Code review
2021-07-21 14:09:16 +02:00
Benoit Marty
ab6e0767bb
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt
...
Co-authored-by: poljar <poljar@termina.org.uk>
2021-07-21 14:05:51 +02:00
Benoit Marty
eded4eacd7
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt
...
Co-authored-by: poljar <poljar@termina.org.uk>
2021-07-21 13:59:40 +02:00
Benoit Marty
bf1ce17972
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt
...
Co-authored-by: poljar <poljar@termina.org.uk>
2021-07-21 13:59:32 +02:00
Benoit Marty
bb617ffaa7
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt
...
Co-authored-by: poljar <poljar@termina.org.uk>
2021-07-21 13:59:19 +02:00
ganfra
5dda5a107a
Missed call notif: make some cleanup and minor changes
2021-07-21 12:28:14 +02:00
Benoit Marty
a2180ec695
Create RequestIdHelper.createUniqueRequestId() for code clarity
2021-07-21 12:04:11 +02:00
Benoit Marty
0d408264e0
Bad copy paste
2021-07-21 11:46:11 +02:00
Benoit Marty
7513e972d1
Ensure the same txnId is reused if the Worker is started again.
2021-07-21 11:43:47 +02:00
Benoit Marty
49a44bd042
Do not change txnId it in case of retry, if not provided in the params
...
Also create txnId using UUID.randomUUID() instead of Random.nextInt(Integer.MAX_VALUE) for coherency
2021-07-21 11:37:15 +02:00
Benoit Marty
98720ce4a5
Merge pull request #3707 from poljar/poljar/fix/verification-transaction-id-mixup
...
crypto: Don't use the transaction ID of the verification for the request
2021-07-21 09:39:22 +02:00
Benoit Marty
e4ae80e348
Merge pull request #3708 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.28
...
Bump libphonenumber from 8.12.27 to 8.12.28
2021-07-21 09:28:19 +02:00
dependabot[bot]
89dc4bb13e
Bump daggerVersion from 2.37 to 2.38
...
Bumps `daggerVersion` from 2.37 to 2.38.
Updates `dagger` from 2.37 to 2.38
- [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.37...dagger-2.38 )
Updates `dagger-compiler` from 2.37 to 2.38
- [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.37...dagger-2.38 )
---
updated-dependencies:
- dependency-name: com.google.dagger:dagger
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: com.google.dagger:dagger-compiler
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-07-20 23:06:50 +00:00
dependabot[bot]
b809d4acf4
Bump libphonenumber from 8.12.27 to 8.12.28
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.27 to 8.12.28.
- [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.27...v8.12.28 )
---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-07-20 23:06:30 +00:00
Damir Jelić
278bba3ada
crypto: Don't use the transaction ID of the verification for the request
...
Verification flows have something called a transaction id. This is a
client-set custom ID that identifies the flow and is established by the
first message that gets sent out. This transaction ID needs to be kept the
same and be part of all events that are sent during the verification flow.
To-device requests have something called a transaction id. This is a
client-set custom ID that identifies a given request. It is used to
ensure idempotency of requests, i.e. retrying to send a request won't
result in two events being sent as long as the transaction id is kept
the same.
This patch removes usage of the first type of transaction ID for the
second use-case.
This closes : #3589 .
2021-07-20 17:17:42 +02:00
David Langley
608a1d3f8f
clarify sdk update and cleanup typos
2021-07-20 11:24:17 +01:00
David Langley
da993b5b58
lint
2021-07-19 22:13:23 +01:00
David Langley
89ece22f73
Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/fix_account_notifications_discrepancies
2021-07-19 22:08:34 +01:00
David Langley
a29ccda68e
move mutable push rule logic to static declarations as on web
2021-07-19 21:29:46 +01:00
Benoit Marty
40907a71b6
Cleanup
2021-07-19 18:44:57 +02:00
Benoit Marty
a34d445215
Merge pull request #3699 from vector-im/feature/bma/part_dl
...
Complement for #3656
2021-07-19 18:09:33 +02:00
Benoit Marty
a2996ee042
Rename var
2021-07-19 16:32:02 +02:00
SpiritCroc
8497a307a1
Merge tag 'v1.1.13' into sc
...
Change-Id: Icc97ef8699b1cc96447369121f3c88582ac651bc
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
2021-07-19 16:10:57 +02:00
Benoit Marty
9f631768eb
Avoid crash in debug app
2021-07-19 13:34:51 +02:00
Benoit Marty
2f6d2cfe09
Avoid crash in debug app
2021-07-19 13:31:09 +02:00
Benoit Marty
7643cc506d
Remove part file(s) in case of failure
...
Will not always delete part files in case of crashes
2021-07-19 11:08:03 +02:00
Benoit Marty
9c1bec94c9
Create AtomicFileCreator class to avoid code copy/paste
2021-07-19 10:59:40 +02:00
Benoit Marty
2e64f89ec6
Merge pull request #3656 from SpiritCroc/broken_downloads
...
Avoid incomplete downloads in cache
2021-07-19 10:50:52 +02:00
Benoit Marty
45efb4386b
Merge pull request #3668 from vector-im/dependabot/gradle/org.amshove.kluent-kluent-android-1.68
...
Bump kluent-android from 1.67 to 1.68
2021-07-16 18:05:45 +02:00
Benoit Marty
343ea42ef5
Fix issue on Android 21
2021-07-15 17:30:48 +02:00
Paulo Pinto
5d4e71a011
Standardise casing of integration manager
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-15 15:58:50 +01:00
Paulo Pinto
d39e14cc5c
Standardise casing of homeserver
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-15 15:58:50 +01:00
Paulo Pinto
74104d7d84
Standardise casing of identity server
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-15 15:58:50 +01:00
Paulo Pinto
e61c8c28bb
Standardise spelling and casing of homeserver
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-15 15:58:50 +01:00
Benoit Marty
bb742eb483
Handle record/play error
2021-07-15 15:06:38 +02:00
Benoit Marty
0cf10b2f84
Fix issue with waveform rendering
2021-07-13 18:48:59 +02:00
Benoit Marty
df795d1881
Cleanup
2021-07-13 18:17:11 +02:00
Benoit Marty
6a0ea11e7a
Follow the spec regarding waveform content
2021-07-13 17:58:14 +02:00
Benoit Marty
9df874c975
Merge branch 'develop' into feature/ons/voice_message
2021-07-13 10:36:05 +02:00
dependabot[bot]
b0ea022eea
Bump kluent-android from 1.67 to 1.68
...
Bumps [kluent-android](https://github.com/MarkusAmshove/Kluent ) from 1.67 to 1.68.
- [Release notes](https://github.com/MarkusAmshove/Kluent/releases )
- [Changelog](https://github.com/MarkusAmshove/Kluent/blob/master/CHANGELOG.md )
- [Commits](https://github.com/MarkusAmshove/Kluent/commits )
---
updated-dependencies:
- dependency-name: org.amshove.kluent:kluent-android
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-07-12 23:07:08 +00:00
TheWayOfTheWarrior
995f9d87bb
Typo in InitializeCrossSigningTask.kt
...
Typo in comment. Was "userSigningKey" instead of "selfSigningKey".
2021-07-10 22:17:17 +02:00
SpiritCroc
4ef1f5c90f
Avoid incomplete downloads in cache
...
Previously, when a download was aborted (e.g. due to a bad internet
connection), a partly downloaded file was remaining in cache, which
would then be delivered upon later requests.
This can lead e.g. to chats where images aren't loading.
To avoid this, first download files to a temporary file that is not the
final cache file, and only rename/move it on finish.
Note that if you already have broken downloads, you still need to clear
cache once to get rid of them after this commit, but it should not
occur anymore afterwards.
2021-07-10 11:12:15 +02:00
SpiritCroc
bcb7ff01bb
Avoid incomplete downloads in cache
...
Previously, when a download was aborted (e.g. due to a bad internet
connection), a partly downloaded file was remaining in cache, which
would then be delivered upon later requests.
This can lead e.g. to chats where images aren't loading.
To avoid this, first download files to a temporary file that is not the
final cache file, and only rename/move it on finish.
Note that if you already have broken downloads, you still need to clear
cache once to get rid of them after this commit, but it should not
occur anymore afterwards.
Change-Id: Ic4fb58853f04f8239c639814031e9ef00c091995
2021-07-10 10:52:02 +02:00
Benoit Marty
e391a1371c
Merge branch 'develop' into feature/ons/voice_message
2021-07-09 22:19:50 +02:00
Benoit Marty
db80ea6432
Prefer testing attachment.waveform to see if it's a voice message
2021-07-09 22:17:04 +02:00
Benoit Marty
984112e83f
Also copy waveform when sending again
2021-07-09 22:15:50 +02:00
Benoit Marty
963eb9daf4
Fix missing duration in audio event, and move AudioWaveformInfo
to the proper package
2021-07-09 22:06:09 +02:00
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
910c0ff326
Merge pull request #3648 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.27
...
Bump libphonenumber from 8.12.26 to 8.12.27
2021-07-09 09:47:45 +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
dependabot[bot]
76890a3b26
Bump libphonenumber from 8.12.26 to 8.12.27
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.26 to 8.12.27.
- [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.26...v8.12.27 )
---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-07-07 23:06:17 +00: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
e22bd8f637
Merge pull request #3593 from vector-im/dependabot/gradle/androidx.test.ext-junit-1.1.3
...
Bump junit from 1.1.2 to 1.1.3
2021-07-05 21:36:38 +02: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
SpiritCroc
e5c9c33a0f
Merge tag 'v1.1.12' into sc
...
Change-Id: I224f427a0d65bfea7ed0b1e19a95e1f03d0d5236
Conflicts:
library/ui-styles/src/main/res/values/text_appearances.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.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/GroupRoomListSectionBuilder.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/RoomSummaryItemFactory.kt
vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
vector/src/main/res/layout/dialog_export_e2e_keys.xml
vector/src/main/res/layout/dialog_import_e2e_keys.xml
2021-07-05 16:58:45 +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
dependabot[bot]
974d5c23d3
Bump junit from 1.1.2 to 1.1.3
...
Bumps junit from 1.1.2 to 1.1.3.
---
updated-dependencies:
- dependency-name: androidx.test.ext:junit
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-07-05 14:19:54 +00:00
Benoit Marty
d85099f23c
Merge pull request #3595 from vector-im/dependabot/gradle/espresso_version-3.4.0
...
Bump espresso_version from 3.3.0 to 3.4.0
2021-07-05 16:19:17 +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
c40add88f9
Merge pull request #3617 from vector-im/dependabot/gradle/io.realm-realm-gradle-plugin-10.6.1
...
Bump realm-gradle-plugin from 10.6.0 to 10.6.1
2021-07-05 14:38:07 +02:00
dependabot[bot]
8639582671
Bump espresso_version from 3.3.0 to 3.4.0
...
Bumps `espresso_version` from 3.3.0 to 3.4.0.
Updates `espresso-core` from 3.3.0 to 3.4.0
Updates `espresso-contrib` from 3.3.0 to 3.4.0
Updates `espresso-intents` from 3.3.0 to 3.4.0
---
updated-dependencies:
- dependency-name: androidx.test.espresso:espresso-core
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: androidx.test.espresso:espresso-contrib
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: androidx.test.espresso:espresso-intents
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-07-05 12:38:04 +00:00
Benoit Marty
5ccfbf4ed8
Merge pull request #3596 from vector-im/dependabot/gradle/androidx.core-core-ktx-1.6.0
...
Bump core-ktx from 1.5.0 to 1.6.0
2021-07-05 14:37:48 +02:00
Benoit Marty
242962f770
Merge pull request #3594 from vector-im/dependabot/gradle/io.mockk-mockk-android-1.12.0
...
Bump mockk-android from 1.11.0 to 1.12.0
2021-07-05 14:37:33 +02:00
Benoit Marty
ca39182665
Merge pull request #3592 from vector-im/dependabot/gradle/io.mockk-mockk-1.12.0
...
Bump mockk from 1.11.0 to 1.12.0
2021-07-05 14:37:20 +02:00
Benoit Marty
f03155bbae
Merge pull request #3591 from vector-im/dependabot/gradle/androidxTest_version-1.4.0
...
Bump androidxTest_version from 1.3.0 to 1.4.0
2021-07-05 14:37:14 +02:00
Benoit Marty
80b1aa3c01
Merge pull request #3590 from vector-im/dependabot/gradle/androidx.test-orchestrator-1.4.0
...
Bump orchestrator from 1.3.0 to 1.4.0
2021-07-05 14:37:07 +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
SpiritCroc
b808d8b464
Avoid chat position jumps during message loading
...
Sometimes, the chat list would jump without the user scrolling:
- During intial loading of a room content, i.e. when it is expected
that the list stays scrolled to bottom
- During loading of messages after jumping to a linked message
With this commit, the target event is repeatedly scrolled to upon list
changes until the users scroll themselves, to avoid above scenarios.
Change-Id: Iabbe76832e7e68686431b0baed9356c88eb50901
2021-07-02 15:19:20 +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
dependabot[bot]
9430d7a5dd
Bump realm-gradle-plugin from 10.6.0 to 10.6.1
...
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java ) from 10.6.0 to 10.6.1.
- [Release notes](https://github.com/realm/realm-java/releases )
- [Changelog](https://github.com/realm/realm-java/blob/v10.6.1/CHANGELOG.md )
- [Commits](https://github.com/realm/realm-java/compare/v10.6.0...v10.6.1 )
---
updated-dependencies:
- dependency-name: io.realm:realm-gradle-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-07-01 23:07:36 +00: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
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
dependabot[bot]
752290424c
Bump core-ktx from 1.5.0 to 1.6.0
...
Bumps core-ktx from 1.5.0 to 1.6.0.
---
updated-dependencies:
- dependency-name: androidx.core:core-ktx
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-30 23:07:55 +00:00
dependabot[bot]
7316bf4ee0
Bump mockk-android from 1.11.0 to 1.12.0
...
Bumps [mockk-android](https://github.com/mockk/mockk ) from 1.11.0 to 1.12.0.
- [Release notes](https://github.com/mockk/mockk/releases )
- [Commits](https://github.com/mockk/mockk/compare/1.11.0...v1.12.0 )
---
updated-dependencies:
- dependency-name: io.mockk:mockk-android
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-30 23:07:27 +00:00
dependabot[bot]
f1001231d6
Bump mockk from 1.11.0 to 1.12.0
...
Bumps [mockk](https://github.com/mockk/mockk ) from 1.11.0 to 1.12.0.
- [Release notes](https://github.com/mockk/mockk/releases )
- [Commits](https://github.com/mockk/mockk/compare/1.11.0...v1.12.0 )
---
updated-dependencies:
- dependency-name: io.mockk:mockk
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-30 23:06:35 +00:00
dependabot[bot]
2ebfeb1709
Bump androidxTest_version from 1.3.0 to 1.4.0
...
Bumps `androidxTest_version` from 1.3.0 to 1.4.0.
Updates `core` from 1.3.0 to 1.4.0
Updates `runner` from 1.3.0 to 1.4.0
Updates `rules` from 1.3.0 to 1.4.0
---
updated-dependencies:
- dependency-name: androidx.test:core
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: androidx.test:runner
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: androidx.test:rules
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-30 23:06:24 +00:00
dependabot[bot]
3378be935b
Bump orchestrator from 1.3.0 to 1.4.0
...
Bumps orchestrator from 1.3.0 to 1.4.0.
---
updated-dependencies:
- dependency-name: androidx.test:orchestrator
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-30 23:06:02 +00: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
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
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
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
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
Benoit Marty
2e37b5efa3
Merge pull request #3565 from vector-im/feature/fga/fix_call_notification
...
Fix call invite processed after call is ended because of fastlane mode.
2021-06-25 16:47:54 +02:00
dependabot[bot]
9e2f2f2372
Bump libphonenumber from 8.12.25 to 8.12.26
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.25 to 8.12.26.
- [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.25...v8.12.26 )
---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-24 23:05:19 +00:00
ganfra
a2c8680d7a
Fix call invite processed after call is ended because of fastlane mode.
2021-06-24 20:49:35 +02:00
Benoit Marty
ca3e5cdf90
Merge pull request #3544 from vector-im/dependabot/gradle/org.amshove.kluent-kluent-android-1.67
...
Bump kluent-android from 1.65 to 1.67
2021-06-24 14:49:53 +02:00
Benoit Marty
14184aae6f
Merge pull request #3506 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.25
...
Bump libphonenumber from 8.12.24 to 8.12.25
2021-06-24 14:34:45 +02:00
Benoit Marty
f0fd40b189
Merge pull request #3505 from vector-im/dependabot/gradle/io.realm-realm-gradle-plugin-10.6.0
...
Bump realm-gradle-plugin from 10.5.0 to 10.6.0
2021-06-24 14:32:35 +02:00
SpiritCroc
d11c1fcc62
Merge tag 'v1.1.11' into sc
...
Change-Id: I15d6e584f1594764f956c129003b2a459b5d24a6
2021-06-24 10:19:24 +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
SpiritCroc
72aa4bb999
Merge tag 'v1.1.10' into sc
...
Change-Id: I01e7b61adf9444e6894232235ee71ac8295b00ab
Conflicts:
library/ui-styles/src/main/res/color/bottom_navigation_icon_tint_selector.xml
library/ui-styles/src/main/res/drawable/splash.xml
library/ui-styles/src/main/res/values/theme_light.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/accountdata/RoomAccountDataTypes.kt
vector/src/main/AndroidManifest.xml
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/HomeDetailViewState.kt
vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
vector/src/main/res/drawable/ic_attachment.xml
vector/src/main/res/drawable/ic_insert_emoji.xml
vector/src/main/res/drawable/ic_keyboard.xml
vector/src/main/res/layout/composer_layout.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/fragment_home_detail.xml
vector/src/main/res/layout/fragment_login_server_url_form.xml
vector/src/main/res/layout/fragment_user_list.xml
vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
vector/src/main/res/layout/item_room.xml
vector/src/main/res/layout/item_space_beta_header.xml
vector/src/main/res/layout/item_suggested_room.xml
vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
vector/src/main/res/values/styles_riot.xml
2021-06-23 13:38:41 +02:00
SpiritCroc
f66747e972
Merge commit '0f4e546e1e96c76219649d27eca38a98e6c04c5f' into sc
...
Change-Id: I782ef7ae26d7a3c168d26a1458f84fbfe80e9767
Conflicts:
vector/src/debug/res/layout/activity_debug_menu.xml
vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.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/list/RoomListFragment.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt
vector/src/main/res/color/bottom_navigation_icon_tint_selector.xml
vector/src/main/res/color/button_positive_background_selector.xml
vector/src/main/res/color/button_positive_text_color_selector.xml
vector/src/main/res/color/checked_accent_color_selector.xml
vector/src/main/res/color/login_button_tint.xml
vector/src/main/res/drawable/bg_breadcrumbs_typing.xml
vector/src/main/res/drawable/bg_login_server_checked.xml
vector/src/main/res/drawable/bg_send.xml
vector/src/main/res/drawable/highlighted_message_background.xml
vector/src/main/res/drawable/ic_settings_root_advanced.xml
vector/src/main/res/drawable/ic_settings_root_call.xml
vector/src/main/res/drawable/ic_settings_root_flair.xml
vector/src/main/res/drawable/ic_settings_root_general.xml
vector/src/main/res/drawable/ic_settings_root_help_about.xml
vector/src/main/res/drawable/ic_settings_root_ignored_users.xml
vector/src/main/res/drawable/ic_settings_root_labs.xml
vector/src/main/res/drawable/ic_settings_root_notification.xml
vector/src/main/res/drawable/ic_settings_root_preferences.xml
vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
vector/src/main/res/drawable/reaction_rounded_rect_shape.xml
vector/src/main/res/drawable/splash.xml
vector/src/main/res/drawable/vector_tabbar_selected_background.xml
vector/src/main/res/layout/alerter_incoming_call_layout.xml
vector/src/main/res/layout/custom_action_item_layout_badge.xml
vector/src/main/res/layout/dialog_export_e2e_keys.xml
vector/src/main/res/layout/dialog_import_e2e_keys.xml
vector/src/main/res/layout/fragment_home_drawer.xml
vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
vector/src/main/res/layout/fragment_login_server_selection.xml
vector/src/main/res/layout/fragment_login_server_url_form.xml
vector/src/main/res/layout/fragment_login_server_url_form_2.xml
vector/src/main/res/layout/fragment_login_splash.xml
vector/src/main/res/layout/fragment_public_rooms.xml
vector/src/main/res/layout/fragment_qr_code_scanner.xml
vector/src/main/res/layout/fragment_qr_code_scanner_with_button.xml
vector/src/main/res/layout/fragment_review_terms.xml
vector/src/main/res/layout/fragment_room_detail.xml
vector/src/main/res/layout/fragment_space_add_rooms.xml
vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml
vector/src/main/res/layout/item_bottom_sheet_action.xml
vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
vector/src/main/res/layout/item_form_submit_button.xml
vector/src/main/res/layout/item_generic_list.xml
vector/src/main/res/layout/item_generic_with_value.xml
vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
vector/src/main/res/layout/item_notification_troubleshoot.xml
vector/src/main/res/layout/item_room.xml
vector/src/main/res/layout/item_settings_centered_image.xml
vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
vector/src/main/res/layout/item_timeline_event_poll_stub.xml
vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
vector/src/main/res/layout/item_verification_action.xml
vector/src/main/res/layout/view_attachment_type_selector.xml
vector/src/main/res/layout/view_bottom_sheet_action_button.xml
vector/src/main/res/layout/view_call_controls.xml
vector/src/main/res/menu/menu_submit.xml
vector/src/main/res/menu/menu_timeline.xml
vector/src/main/res/values/styles_riot.xml
vector/src/main/res/values/theme_dark.xml
2021-06-23 11:08:10 +02:00
Valere
171793d190
room version cap support + room upgrade
2021-06-22 17:35:39 +02:00
dependabot[bot]
e2e3e2de86
Bump kluent-android from 1.65 to 1.67
...
Bumps [kluent-android](https://github.com/MarkusAmshove/Kluent ) from 1.65 to 1.67.
- [Release notes](https://github.com/MarkusAmshove/Kluent/releases )
- [Changelog](https://github.com/MarkusAmshove/Kluent/blob/master/CHANGELOG.md )
- [Commits](https://github.com/MarkusAmshove/Kluent/commits )
---
updated-dependencies:
- dependency-name: org.amshove.kluent:kluent-android
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-21 23:06:17 +00: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