3753 Commits

Author SHA1 Message Date
SpiritCroc
4b63a9f939 Merge tag 'v1.3.9' into sc
Change-Id: I26834af19e0b02887f288b6441ced6d993cb8861

Conflicts:
	vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt
	vector/src/gplay/java/im/vector/app/push/fcm/EmbeddedDistrib.kt
	vector/src/main/java/im/vector/app/VectorApplication.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/composer/MessageComposerViewEvents.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
	vector/src/main/res/drawable/ic_shield_custom.xml
	vector/src/main/res/drawable/ic_shield_trusted.xml
2021-12-05 13:46:55 +01:00
Adam Brown
cdb5376a19 Adding support for voice drafts
- introduces a new Voice draft and sender mode type
- initializes the voice recorder with a previously recorded file (the draft)
- renames RecordingUiStates to map to their actual UI states
2021-11-30 10:22:25 +00:00
SpiritCroc
c8abe21ec0 Apply presence to all DMs with a user
Change-Id: I7193cb5975a6a2e20055f5f99f8fa116b8dc1470
2021-11-27 15:33:21 +01:00
Benoit Marty
32441eb81b
Merge pull request #4553 from vector-im/feature/adm/stricter-voice-file-deletion
Unable to upload .ogg to rooms
2021-11-24 13:55:31 +01:00
Adam Brown
31bd4fd2d0 avoiding inferred voice type check via waveform in favour of using the attachment type 2021-11-24 11:38:28 +00:00
Adam Brown
5ee379e10d including a new voice message attachment type
- allows for us to explictly delete voice message after uploading rather than inferring that audio message with the .ogg extension are voice messages which could have caused us to delete users files
2021-11-24 10:21:12 +00:00
Benoit Marty
bd423db98a
Merge pull request #4548 from vector-im/feature/adm/sealed-class-cleanup
Voice related sealed class cleanup
2021-11-24 11:10:10 +01:00
Adam Brown
70d25653c8 removing unused base property from the sealed classes and switching to interfaces 2021-11-23 18:21:42 +00:00
Adam Brown
d1102f7be4 fixing wrong cased data class names 2021-11-23 18:19:33 +00:00
Adam Brown
bdf9402685 only deleting voice files if they were successfully uploading
- fixes flaky networks losing the voice file and being unable to retry
2021-11-23 17:45:10 +00:00
Benoit Marty
c72dd5eec6
Merge pull request #4507 from vector-im/feature/bca/crypto_better_logs
Improve crypto log to debug UISI
2021-11-23 15:35:28 +01:00
Valere
31eeb0674b cleaning 2021-11-23 13:38:45 +01:00
Valere
77454c8ae9 code review 2021-11-23 11:58:01 +01:00
Valere
feda53bfb7 Improve crypto log to debug UISI 2021-11-18 15:39:13 +01:00
Benoit Marty
e98dd2e663
Merge pull request #4396 from vector-im/feature/aris/thread_aware
Feature/aris/thread aware
2021-11-18 10:16:56 +01:00
SpiritCroc
c03c6867f7 Merge branch 'merge-v1.3.8' into sc
Change-Id: If000613462f3cd3b73c8de24f456dccc16fcde38

Conflicts:
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
2021-11-17 20:26:27 +01:00
SpiritCroc
d9a5991559 Merge tag 'v1.3.8' into HEAD
Change-Id: If3e3927755638ee38d8817f8504f09b0df14f309

Conflicts:
	dependencies.gradle
	vector/src/fdroid/AndroidManifest.xml
	vector/src/gplay/AndroidManifest.xml
	vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/HomeActivity.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/composer/ComposerEditText.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
2021-11-17 20:17:45 +01:00
SpiritCroc
c5f48fa4d2 Merge tag 'v1.3.7' into sc
Change-Id: Id73c834c10e11ccd46d7d2adc8328eb95d051941

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
	vector/build.gradle
	vector/src/fdroid/AndroidManifest.xml
	vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/main/java/im/vector/app/VectorApplication.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
	vector/src/main/java/im/vector/app/core/receiver/OnApplicationUpgradeOrRebootReceiver.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
2021-11-17 19:01:22 +01:00
ariskotsomitopoulos
8015ffee42 PR remrarks 2021-11-17 19:56:06 +02:00
ariskotsomitopoulos
9972dbc278 Use RealmConfiguration instead of Monarchy 2021-11-17 16:54:03 +02:00
Benoit Marty
a5518e90ae
Merge pull request #4485 from vector-im/feature/bma/small_cleanup
Small cleanup after content scanner code has been merged
2021-11-17 15:08:07 +01:00
ariskotsomitopoulos
d463500998 Remove unused import 2021-11-17 14:48:10 +02:00
ariskotsomitopoulos
88656ce80b Use GetEventTask instead of session from the ThreadAwarenessHandler 2021-11-17 14:14:21 +02:00
Benoit Marty
c0af8214a6 Improve and use MatrixUrls 2021-11-17 11:27:59 +01:00
Benoit Marty
0fd29d763c
Markdown and sploiler in roomlist + spoiler in notifications (#4483)
Render markdown in room list and make notifications spoiler aware, per MSC3124
Reorder when case to put the most common on top

Co-authored-by: Onuray Sahin <onurays@element.io>
Co-authored-by: Wasabi\preston <1337paf92@gmail.com>
2021-11-17 10:21:48 +00:00
Benoit Marty
adea1db87a Remove useless ? 2021-11-17 11:19:59 +01:00
Benoit Marty
855b672f48
Add content scanner service (#4392)
* Add content scanner APIs

* Move to content scanner matrix SDK to FOSS

* Update file service

* Refactoring

* Replace matrix callbacks by coroutines

* Fix lint errors

* Add changelog

Co-authored-by: yostyle <yoanp@element.io>
2021-11-17 11:18:20 +01:00
Adam Brown
10a460bf0c
Sign out crash - Realm configuration mismatch (#4480)
Dispatching session events to a specified session instance instead of always querying the session manager
- fixes the close session flow causing the session to be recreated
2021-11-17 10:39:46 +01:00
Benoit Marty
be3aafeef2
Merge pull request #4433 from vector-im/feature/bma/android12
Android12
2021-11-16 13:27:33 +01:00
Benoit Marty
35e2a1083b
Merge pull request #4360 from vector-im/feature/ons/poll
Poll Feature - Create
2021-11-15 14:05:40 +01:00
Benoit Marty
df60b0c2b7
Merge pull request #4430 from vector-im/feature/adm/feature-notification-images
Notification images
2021-11-15 12:46:51 +01:00
Benoit Marty
0a9845af30 @OnLifecycleEvent is deprecated, use DefaultLifecycleObserver instead 2021-11-15 12:24:48 +01:00
Onuray Sahin
89db5a6ecd Lint fixes. 2021-11-11 11:52:01 +03:00
yostyle
6ddf3f6e5a Fix lint errors 2021-11-10 22:31:23 +01:00
yostyle
7a78bc6866 Replace matrix callbacks by coroutines 2021-11-10 21:57:45 +01:00
yostyle
98ae9d0e8a Refactoring 2021-11-10 21:57:44 +01:00
yostyle
016f3faeea Update file service 2021-11-10 21:57:44 +01:00
yostyle
0ad66446e7 Move to content scanner matrix SDK to FOSS 2021-11-10 21:57:44 +01:00
yostyle
80a42d0a55 Add content scanner APIs 2021-11-10 21:57:44 +01:00
Valere
b304ef82fc add comments 2021-11-10 17:41:06 +01:00
Valere
5b76d4b682 Fix fallback otk support 2021-11-10 16:55:34 +01:00
SpiritCroc
c3a6e3bd9b Rework counting of unread chats
Avoid counting chats twice that are actually unread and additionally
manually marked as unread.
Also fix some corner cases.

Change-Id: I0bc8a3bcdb8b658618b627648eec34305e66082b
2021-11-09 12:34:54 +01:00
SpiritCroc
30fec15c20 Fix a case where a space could show one unread, but all chats are read
Change-Id: I8a0cd85ebd994c22914d3e9a3708ce835c5c7a11
2021-11-09 12:34:28 +01:00
Adam Brown
9dd01d5b20
Merge pull request #4429 from vector-im/feature/adm/relogin-sanity-check
Sign out - Sign in sanity check & nightly sanity check
2021-11-08 20:21:15 +00:00
Adam Brown
9c1d6e0484 avoiding null unwrapping by merging the contains check with eagerly throwing if the session component is missing 2021-11-08 17:14:00 +00:00
Adam Brown
7646f7ce32 updating copyright header 2021-11-08 15:24:08 +00:00
Adam Brown
037d1fcf52 adding catch around the push event dispatching to match previous behaviour 2021-11-08 15:24:08 +00:00
Adam Brown
5190ef4280 replacing separated push listener callbacks with a single onEvents callback
- simplifies the handling of notifications, will allow us to reduce redundant synchronisations and suspend the entire notification update (will be needed for supporting images)
2021-11-08 15:24:07 +00:00
Adam Brown
2d1aed1839 separating the stopping of in-flight tasks form the cleaning up of the session state
- by stopping the session tasks before invalidating the current session we're able to avoid any extra token failures which retrigger the signout flow
2021-11-08 14:50:58 +00:00
Adam Brown
52731cf59d double checking the sync state in order to avoid redundant invalid token events 2021-11-08 14:50:58 +00:00