Commit graph

13951 commits

Author SHA1 Message Date
Florian Renaud
a06efb7abd Fix lint issues 2022-10-31 10:58:09 +01:00
Joaquín Aguirrezabalaga
3a430efb02 Add setting to allow disabling direct share
Direct share continues to be enabled by default.

As requested in #2725

Signed-off-by: Joaquín Aguirrezabalaga <kinote@kinote.org>
2022-10-30 11:32:52 +01:00
Jorge Martín
0cb9fdd3a2 Fix share actions from outside the app
Change-Id: I2671d6b9b096c487c22f4032a9152e60c260b4c4
2022-10-29 18:11:02 +02:00
SpiritCroc
cf92927a03 Fix some neutral grey icons
Change-Id: Ib90cb3d72503889fc1a5945974fd2ba7b3eb8f73
2022-10-28 18:29:51 +02:00
SpiritCroc
da5dcd18b0 Move voice message setting out of labs
Having no voice message button is actually more thoroughly tested than
the default setting... so let's put it to the other related settings

Change-Id: I82fda959dd8d0798a59d0444cd0cecdcda6b8cd3
2022-10-28 18:24:14 +02:00
SpiritCroc
9269a4442c Merge remote-tracking branch 'sc2/merge-v1.5.4-1' into sc
Change-Id: Idc08fd88297d8e1f5211908217e32b93fb6df693

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
2022-10-28 18:16:15 +02:00
SpiritCroc
759da1fd09 Merge tag 'v1.5.4' into merge-v1.5.4
Change-Id: I3028022ed007c35d0ddbd6a859bc71958b8d2146

Conflicts:
	library/ui-styles/src/main/res/values/colors.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataTypes.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
	vector-config/src/main/res/values/config-settings.xml
	vector/src/main/java/im/vector/app/SpaceStateHandler.kt
	vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
	vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerView.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/voice/VoiceMessageViews.kt
	vector/src/main/java/im/vector/app/features/settings/labs/VectorSettingsLabsFragment.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt
	vector/src/main/res/drawable/ic_voice_mic.xml
	vector/src/main/res/layout/fragment_timeline.xml
	vector/src/main/res/layout/view_voice_message_recorder.xml
	vector/src/main/res/xml/vector_settings_labs.xml
2022-10-28 18:02:53 +02:00
Benoit Marty
fbabe50875 Fix vulnerability 2022-10-28 16:41:44 +02:00
Benoit Marty
46d1795276 Fix crash due to missing notification
Thread: main, Exception: java.lang.RuntimeException: Unable to start service org.jitsi.meet.sdk.JitsiMeetOngoingConferenceService@3d1f0bc with Intent { cmp=im.vector.app.debug/org.jitsi.meet.sdk.JitsiMeetOngoingConferenceService (has extras) }: java.lang.IllegalArgumentException: Invalid notification (no valid small icon): Notification(channel=JitsiOngoingConferenceChannel pri=0 contentView=null vibrate=null sound=null defaults=0x0 flags=0xa color=0x00000000 category=call actions=2 vis=PUBLIC semFlags=0x0 semPriority=0 semMissedCount=0)
2022-10-28 11:10:08 +02:00
Florian Renaud
362696cfc8 VoiceBroadcast - Show error dialog if user is not able to record a voice broadcast 2022-10-28 10:43:34 +02:00
Florian Renaud
838e11c167 rename observeIncomingEvents method and reorder some methods 2022-10-28 10:43:05 +02:00
Florian Renaud
3fcac097d3 VoiceBroadcastPlayer - Fetch playlist in dedicated use case and improve player 2022-10-27 23:50:21 +02:00
SpiritCroc
22f5408a1c Always allow collapsing sections to fix cases where state doesn't restore
Change-Id: Ib609de02b48b84a08e0643281a918793074ccc9d
2022-10-27 17:15:27 +02:00
Florian Renaud
174ba4f4cc VoiceBroadcastPlayer - Create player interface and move implementation to dedicated class 2022-10-27 16:54:32 +02:00
Benoit Marty
6b34bb2086 Fix issue with Back button not working when conference is not joined yet. 2022-10-27 16:10:40 +02:00
Benoit Marty
1b5852fbcb API break, replace leave() by broadcast 2022-10-27 14:37:29 +02:00
Benoit Marty
f93f43bf8b Fix issue with Jitsi compilation
Error was lots of `Duplicate class org.checkerframework.common.reflection.qual.MethodVal found in modules jetified-checker-3.1 (org.checkerframework:checker:3.1.1) and jetified-checker-qual-3.12.0 (org.checkerframework:checker-qual:3.12.0)
Cannot use latest 3.15.0 since it required min API 26.
2022-10-27 14:36:45 +02:00
Benoit Marty
ac4785a0dd Fix lint issue 2022-10-27 14:36:45 +02:00
Benoit Marty
4515dcdfe9 Update Jitsi and WebRtc dependencies to android-sdk-6.2.2 2022-10-27 14:34:58 +02:00
jonnyandrew
c776aae9d0
[Rich text editor] Add plain text mode and new attachment UI (#7459)
* Add new attachments selection dialog

* Add rounded corners to bottom sheet dialog.

Note these are currently only visible in the collapsed state.
- [Google issue](https://issuetracker.google.com/issues/144859239)
- [Rejected PR](https://github.com/material-components/material-components-android/pull/437)
- [Github issue](https://github.com/material-components/material-components-android/issues/1278)

* Add changelog entry

* Remove redundant call to superclass click listener

* Refactor to use view visibility helper

* Change redundant sealed class to interface

* Remove unused string

* Revert "Add rounded corners to bottom sheet dialog."

This reverts commit 17c43c9188.

* Remove redundant view group

* Remove redundant `this`

* Update rich text editor to latest

* Update rich text editor version

* Allow toggling rich text in the new editor

* Persist the text formatting setting

* Add changelog entry
2022-10-26 18:37:40 +02:00
Eric Decanini
29d3856ef2
Merge pull request #7424 from vector-im/feature/eric/msc3773
Implements MSC3773 (Thread Notifications)
2022-10-26 10:44:32 -04:00
Florian Renaud
bdfc96ff66 Fix merge conflicts 2022-10-26 16:36:51 +02:00
Florian Renaud
cb5fc75c5d GetOngoingVoiceBroadcastsUseCase: Return empty list if there is no session 2022-10-26 16:08:03 +02:00
Florian Renaud
c20f6fe326 GetOngoingVoiceBroadcastsUseCase: Remove debug logs 2022-10-26 16:07:38 +02:00
Florian Renaud
6ee77ad101
Merge pull request #7450 from vector-im/feature/fre/voice_broadcast_stop_on_app_restart
Voice Broadcast - Stop recording on app restart
2022-10-26 15:49:32 +02:00
Jorge Martin Espinosa
d242ab049b
[Rich text editor] Implement full screen editor mode (simple approach) (#7436)
* Rich text editor: implement full screen editor mode using ConstraintSets

* Add back press handler

* Change ToggleFullScreen to SetFullScreen, fix rebase issues

* Add warning to fragment_timeline* files
2022-10-26 15:15:48 +02:00
Florian Renaud
0cc2a477b4 Mockk GetOngoingVoiceBroadcastsUseCase and adapt tests 2022-10-26 14:54:55 +02:00
Florian Renaud
23b4f6d42f Inject ActiveSessionHolder in GetOngoingVoiceBroadcastsUseCase 2022-10-26 12:49:51 +02:00
Florian Renaud
443d573205 Remove getOngoingVoiceBroadcasts from VoiceBroadcastHelper 2022-10-26 12:48:32 +02:00
Florian Renaud
5855fe1242 Add StopOngoingVoiceBroadcastUseCase 2022-10-26 12:44:38 +02:00
Florian Renaud
2f14d19130 Fix failing test 2022-10-26 12:44:37 +02:00
Maxime NATUREL
e765575cf6 Renaming and creating a fixture method for DeviceFullInfo mocks 2022-10-26 12:22:26 +02:00
Maxime NATUREL
db17d02f36 Using host variable to make the code nicer 2022-10-26 12:22:26 +02:00
Maxime NATUREL
3e1c110343 Updating some new string keys to make them more generic 2022-10-26 12:22:26 +02:00
Maxime NATUREL
600f650256 Fixing visibility of the select session action when empty list 2022-10-26 12:22:25 +02:00
Maxime NATUREL
b7f9419bd4 Fix usage of @+id in xml file 2022-10-26 12:22:25 +02:00
Maxime NATUREL
2e99d45c82 Adding unit test about select mode 2022-10-26 12:22:25 +02:00
Maxime NATUREL
3bba9dea25 Adding unit test for filter action 2022-10-26 12:22:25 +02:00
Maxime NATUREL
4a8289c6cc Adding first unit test on OtherSessionsViewModel for init of ViewModel 2022-10-26 12:22:25 +02:00
Maxime NATUREL
3390d7fde4 Handling correct UI for selected session 2022-10-26 12:22:25 +02:00
Maxime NATUREL
a703b8ae10 Select all/Deselect all actions 2022-10-26 12:22:25 +02:00
Maxime NATUREL
2fc2665ff3 Deselect all sessions when leaving select mode 2022-10-26 12:22:25 +02:00
Maxime NATUREL
5b1bf8a68e Select devices with basic UI for tests 2022-10-26 12:22:25 +02:00
Maxime NATUREL
ab2e91ae80 Enable selectMode when long pressing on list item 2022-10-26 12:22:25 +02:00
Maxime NATUREL
2e155b1acc Toggling of selectMode using menu i OtherSessionsFragment 2022-10-26 12:22:25 +02:00
Florian Renaud
65a5ae9d3d
Merge pull request #7449 from vector-im/feature/fre/voice_broadcast_device_id
Voice Broadcast - Do not display the recording tile on the other sessions
2022-10-26 11:54:02 +02:00
Florian Renaud
1554d79f1a Change listeners Map variable to immutable 2022-10-26 10:48:11 +02:00
Florian Renaud
8fe3b5e750 Rename method renderPlayingState to renderRecordingState 2022-10-26 10:46:33 +02:00
Florian Renaud
6091ec4ce3 Fix wrong content description 2022-10-26 10:45:25 +02:00
Florian Renaud
ec80adc8aa Rename usecase file 2022-10-26 10:10:56 +02:00