12692 Commits

Author SHA1 Message Date
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
SpiritCroc
af95abe15e Fix some space back navigation crashes
Change-Id: I6d6058547688503a99fa7308a42e25652b00c01f
2022-10-19 18:11:36 +02:00
Benoit Marty
f5fe5cce62
Merge pull request #7372 from vector-im/feature/bma/fix_getUser_null
Handle properly when getUser returns null - prefer using getUserOrDefault
2022-10-19 08:40:44 +02:00
Florian Renaud
e4a98378a1 Fix unit test 2022-10-18 21:11:03 +02:00
Florian Renaud
0781ee84d9 Reformat file 2022-10-18 21:08:09 +02:00
Florian Renaud
a658e7727a Voice Broadcast - Update chunk length to 120 sec 2022-10-18 21:08:09 +02:00
Florian Renaud
5004db07fb Remove legacy comment 2022-10-18 21:08:09 +02:00
Florian Renaud
64456860e2 Voice Broadcast - Add deviceId in state event content 2022-10-18 21:08:09 +02:00
Florian Renaud
1647fe233f Voice Broadcast - Introduce io.element.voice_broadcast_chunk key in voice messages 2022-10-18 21:08:09 +02:00
Florian Renaud
90803be3ee Voice Broadcast - Move Android API check on fragment 2022-10-18 21:07:45 +02:00
Florian Renaud
63c02c6fef Voice Broadcast - Restore feature flag and enable it by default 2022-10-18 21:07:44 +02:00
Florian Renaud
ecc22a1401 Voice Broadcast - Change default chunk duration 2022-10-18 21:07:44 +02:00
Florian Renaud
050dff6548 Voice Broadcast - Rename voice message files with sequence number 2022-10-18 21:07:44 +02:00
Florian Renaud
03ac0f1f03 Move Voice Broadcast feature flag to labs settings 2022-10-18 21:07:44 +02:00
Florian Renaud
0dad78a24a
Merge pull request #7387 from vector-im/feature/fre/voice_broadcast_start_listening
Voice Broadcast - Listening
2022-10-18 17:54:07 +02:00
Florian Renaud
b67500515c
Merge pull request #7363 from vector-im/feature/fre/voice_broadcast_start_record
Voice Broadcast - Start record
2022-10-18 16:43:18 +02:00
Florian Renaud
d53ad4328c Voice Broadcast - Pause listening outside of the timeline 2022-10-18 13:41:05 +02:00
Florian Renaud
4a32ccecfa Voice Broadcast Player - Add missing try catch 2022-10-18 13:41:05 +02:00
Florian Renaud
402224721b Voice Broadcast - Add voice message extensions 2022-10-18 13:41:05 +02:00
Florian Renaud
16c27ba174 Voice Broadcast - Get voice messages events related to a given VB 2022-10-18 13:41:05 +02:00
Florian Renaud
215128c213 Voice Broadcast - Add timeline item listening state 2022-10-18 13:41:04 +02:00
Florian Renaud
2760781f0a Voice Broadcast - Introduce listening actions 2022-10-18 13:41:04 +02:00
Florian Renaud
eb44b02228 Create VoiceBroadcastMediaPlayer 2022-10-18 13:41:04 +02:00
Florian Renaud
032c0152e4 Voice Broadcast - Move timeline item creation to dedicated factory 2022-10-18 13:41:04 +02:00
Florian Renaud
5f35926ce6 Voice Broadcast - Hide related voice message events 2022-10-18 13:41:04 +02:00
Florian Renaud
b9335c6065 Rename const DEFAULT_CHUNK_LENGTH_IN_SECONDS 2022-10-18 13:33:17 +02:00
Florian Renaud
92bd8cdcfe Voice Broadcast - Remove check on voice message minimum duration 2022-10-18 13:33:17 +02:00
Florian Renaud
def9fc07bb Revert AudioMessageHelper.pauseRecording 2022-10-18 13:33:16 +02:00
Florian Renaud
400118ed3e Remove useless Android API checks 2022-10-18 13:33:16 +02:00
Benoit Marty
f3309692a4
Merge pull request #7239 from vector-im/feature/bma/arch_fixes
Feature/bma/arch fixes
2022-10-18 11:47:12 +02:00
Florian Renaud
1db3d69aeb Change chunk_length type in unit test 2022-10-18 08:58:21 +02:00
Florian Renaud
3a951f2076 Add punctuation to kdoc 2022-10-17 22:33:43 +02:00
Florian Renaud
62596b38c7 Pause recording when the composer is not visible anymore 2022-10-17 22:33:43 +02:00
Florian Renaud
9d35e81db7 Compute max file size from chunk length 2022-10-17 22:33:43 +02:00
Florian Renaud
64e6a2bfab Compute file size from chunk length 2022-10-17 22:33:43 +02:00
Florian Renaud
c492fda000 Change VoiceBroadcastRecorder as Interface 2022-10-17 22:33:43 +02:00
Florian Renaud
ad730d55c1 Fix tests 2022-10-17 22:33:42 +02:00
Florian Renaud
aecb66015d Move Voice Broadcast constants into dedicated object 2022-10-17 22:33:42 +02:00
Florian Renaud
3ad245db8b Trigger VoiceBroadcast recording actions 2022-10-17 22:33:42 +02:00
Florian Renaud
ad2bf8d1ce Add VoiceBroadcastRecorder 2022-10-17 22:33:42 +02:00
Florian Renaud
e775404e35 Improve VoiceRecorder abstraction 2022-10-17 22:33:42 +02:00
Florian Renaud
a88a172f0f Trigger play/pause/resume/stop actions on VoiceRecorder 2022-10-17 22:33:42 +02:00
Onuray Sahin
47c87141b2
Merge pull request #7338 from vector-im/feature/ons/qr_code_login_ui
QR Code Login UI
2022-10-17 17:20:07 +03:00
Benoit Marty
fa1d2bd8ab Fix compilation issue after rebase. 2022-10-17 15:12:41 +02:00
Benoit Marty
822f06fef4 Fix ktlint issue 2022-10-17 15:07:11 +02:00
Benoit Marty
3bc3da1073 Rename PermalinkUseCase to PermalinkFactory 2022-10-17 15:07:11 +02:00
Benoit Marty
37f34dbdfd Expect the userId from the fakeSession 2022-10-17 15:07:11 +02:00
Benoit Marty
cfca776d01 Create PermalinkUseCase to avoid injecting the Session in the View. 2022-10-17 15:07:11 +02:00
Benoit Marty
aa806ed2c6 More cleanup on @Inject members 2022-10-17 15:07:11 +02:00
Benoit Marty
b3068c017d Inject ErrorFormatter in the parent Activity (often used) 2022-10-17 15:07:11 +02:00