Commit Graph

12515 Commits

Author SHA1 Message Date
Florian Renaud a06efb7abd Fix lint issues 2022-10-31 10:58:09 +01: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
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
Florian Renaud 47047b2034 move map operator in a new line 2022-10-26 10:00:56 +02:00
Florian Renaud 85bc78bd72 Do not pause already paused voice broadcast 2022-10-26 09:50:58 +02:00
Florian Renaud 6eeb54ae40 Stop ongoing voice broadcast on app restart 2022-10-26 09:46:23 +02:00
ericdecanini 51251c2b2b Merge remote-tracking branch 'origin/develop' into feature/eric/msc3773 2022-10-25 11:56:46 -04:00
Florian Renaud c7c05d1fe6 Add check on deviceId before showing recording tile 2022-10-25 17:54:26 +02:00
Florian Renaud 513097585a Fix kdoc issue 2022-10-25 17:38:05 +02:00
Florian Renaud 649747bbb8 Move voice broadcast item attributes to dedicated class 2022-10-25 16:32:44 +02:00
Florian Renaud f31429cf25 Rename renderLiveIcon method 2022-10-25 16:32:44 +02:00
Florian Renaud 2c144614ca Improve recording state rendering if app has been relaunched 2022-10-25 16:32:44 +02:00
Florian Renaud a7c24b23a0 Improve VoiceBroadcastItemFactory 2022-10-25 16:31:25 +02:00
Florian Renaud 4defc3dded Voice Broadcast - Add style for the "live" indicator 2022-10-25 16:31:25 +02:00
Florian Renaud 1566adb669 Timeline - Add abstraction on voice broadcast items 2022-10-25 16:31:24 +02:00
Florian Renaud 6a88c61d12 Group voice broadcast controller buttons in a Flow 2022-10-25 16:31:24 +02:00
jonnyandrew 7cc06fa5ee
Merge pull request #7429 from jonnyandrew/feat/PSU-919-attachments-v2
Add new UI for selecting an attachment type
2022-10-25 11:46:34 +01:00
Benoit Marty 5b6763ff89
Merge pull request #7349 from vector-im/dependabot/gradle/com.github.UnifiedPush-android-connector-2.1.1
Bump android-connector from 2.1.0 to 2.1.1
2022-10-25 11:12:07 +02:00
ericdecanini 3673e720fa Code improvements 2022-10-24 10:31:55 -04:00
ericdecanini 35be56a44a Merge remote-tracking branch 'origin/develop' into feature/eric/msc3773
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
2022-10-24 10:28:21 -04:00
Jonny Andrew cdc8f7fea7
Remove redundant `this` 2022-10-24 09:43:28 +01:00
Jonny Andrew b9c1aa6ded
Remove redundant view group 2022-10-24 09:31:25 +01:00
Jonny Andrew 293811220d
Revert "Add rounded corners to bottom sheet dialog."
This reverts commit 17c43c9188.
2022-10-24 09:26:11 +01:00
Jonny Andrew c401d55dea
Change redundant sealed class to interface 2022-10-24 09:22:12 +01:00
Jonny Andrew 74591f5261
Refactor to use view visibility helper 2022-10-24 09:20:51 +01:00
Jonny Andrew 9da575b4d0
Remove redundant call to superclass click listener 2022-10-24 09:19:01 +01:00
Jonny Andrew 17c43c9188
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)
2022-10-21 17:40:09 +01:00
Jonny Andrew bec7143824
Add new attachments selection dialog 2022-10-21 17:40:08 +01:00
ericdecanini 1086ed367e Fixes thread notifications instantly disappearing 2022-10-20 19:42:06 -04:00
Florian Renaud 926f4d9201 Fix play/pause button disabled 2022-10-20 23:58:17 +02:00
Florian Renaud 34cafa373f Add missing content description 2022-10-20 23:43:33 +02:00
Florian Renaud 4a76998c98 Use CopyOnWriteArrayList 2022-10-20 23:28:33 +02:00
Florian Renaud f2cc08263f Call onClick instead of setOnClickListener 2022-10-20 23:28:33 +02:00
Florian Renaud 9a96de4f06 Set id to VoiceBroadcast items 2022-10-20 23:28:33 +02:00
Florian Renaud 930c856728 Add additional information in listening tile 2022-10-20 23:28:32 +02:00
Florian Renaud 72a1acec89 Fix voice broadcast state update on wrong thread 2022-10-20 23:28:32 +02:00
Florian Renaud 6ff7a7f3ae Update buffering view 2022-10-20 23:28:32 +02:00
Florian Renaud 9c5b6d8207 Fix null voiceBroadcastId when the playlist is empty 2022-10-20 23:28:32 +02:00
Florian Renaud cebc096ac7 VoiceBroadcast - Update live indicator icon 2022-10-20 23:28:32 +02:00
Florian Renaud f711a0ea74 VoiceBroadcast - Listening view 2022-10-20 23:28:32 +02:00
Florian Renaud f1b4ebbc37 VoiceBroadcast - Introduce listening view 2022-10-20 23:28:32 +02:00
Florian Renaud 4c71209573 VoiceBroadcast - Add recording view 2022-10-20 23:28:31 +02:00
yostyle 0a9f2bfa0a Fix some PR comments 2022-10-20 23:03:28 +02:00
Florian Renaud 05eeef9dfe VoiceBroadcastListener - Handle end of live listening 2022-10-20 23:03:28 +02:00
Florian Renaud bafa2f8bde VoiceBroadcastRecorder - Send last sequence number on pause and stop 2022-10-20 23:03:28 +02:00
Florian Renaud 94390697ae VoiceBroadcastPlayer - Filter live broadcast state listening on the referenced eventId 2022-10-20 23:03:28 +02:00
Florian Renaud 6d6b4e5208 VoiceBroadcast - Ignore voice broadcast info with empty content (eg. redacted) 2022-10-20 12:51:08 +02:00
Florian Renaud f05f0a85b0 VoiceBroadcastRecorder - Improve recorder by sending chunk when pausing 2022-10-20 12:51:08 +02:00
Florian Renaud e9c81ca98f VoiceBroadcastPlayer - Live listening 2022-10-20 12:51:08 +02:00
Florian Renaud fe44a829af VoiceBroadcastPlayer - Improve currentVoiceBroadcastId 2022-10-20 12:34:59 +02:00
Florian Renaud 0c847cffc1 VoiceBroadcastPlayer - Use more accurate coroutine scope 2022-10-20 12:34:59 +02:00
Florian Renaud b89ab6c2fd VoiceBroadcastPlayer - release previous MediaPlayer 2022-10-20 12:34:59 +02:00
Florian Renaud 6554f571f2 VoiceBroadcastPlayer - Inject ActiveSessionHolder instead of Session 2022-10-20 12:34:59 +02:00
Johannes Marbach 451f5f824a
Merge pull request #7369 from vector-im/feature/hughns/qr_code_login
Implement logic for sign in with QR
2022-10-19 17:10:19 +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
Onuray Sahin 0c52a7ed04 Fix layout after try again button is clicked. 2022-10-18 15:45:39 +03: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
Hugh Nimmo-Smith 916ae654e7 Don't log whole QR code 2022-10-18 12:11:41 +01: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
Hugh Nimmo-Smith a3126b0026 Progress to status screen on failure 2022-10-18 00:35:35 +01:00
Hugh Nimmo-Smith cf1c7515fb Automatically try again on partial failed QR scan 2022-10-18 00:35:13 +01: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
Hugh Nimmo-Smith 6d17d51fe9 remove nullability 2022-10-17 17:36:35 +01:00
Hugh Nimmo-Smith 8c8190202f Better function name 2022-10-17 17:31:14 +01:00
Hugh Nimmo-Smith 41dbdbcd7b Lint 2022-10-17 17:30:54 +01:00
Onuray Sahin b2dc0b33b5 Implement try again button action. 2022-10-17 18:32:35 +03:00
Hugh Nimmo-Smith 552fb9de9a Improved comment around QR generation 2022-10-17 16:24:01 +01:00
Hugh Nimmo-Smith e01ee619d3 Refactor error handling and report E2EE errors 2022-10-17 16:02:25 +01: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
Benoit Marty cbd0972eca Reuse injected members in parent activity. 2022-10-17 15:06:22 +02:00
Benoit Marty f95d21ef17 Inject member in VectorBaseActivity instead of using SingletonEntryPoint 2022-10-17 15:06:22 +02:00
Benoit Marty ae802dea31 Avoid using ActiveSessionHolder in a Fragment. Use the userId from `state.personalizationState` 2022-10-17 15:06:22 +02:00
Benoit Marty b5eb15c7e3 Avoid using ActiveSessionHolder in a Fragment. Move the userId to `state.personalizationState` 2022-10-17 15:06:22 +02:00
Hugh Nimmo-Smith e89774e160 Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login 2022-10-17 13:26:35 +01:00
Hugh Nimmo-Smith 1976451c81 Lint 2022-10-17 12:23:14 +01:00
Onuray Sahin 91bb86d3c6 Code review fixes. 2022-10-17 14:16:29 +03:00
Hugh Nimmo-Smith 3be4a0ca21 Remove unused val 2022-10-17 11:25:09 +01:00
Onuray Sahin 8547fee562 Enable qr code login by default. 2022-10-17 12:44:25 +03:00
Benoit Marty 36e5166051
Merge pull request #7375 from vector-im/feature/mna/device-manager-go-to-new-screen
[Device Management] Redirect to the new screen everywhere when lab flag is on
2022-10-17 11:44:02 +02:00
dependabot[bot] 93a346392b
Bump gradle from 7.2.2 to 7.3.1 (#7364)
* Bump gradle from 7.2.2 to 7.3.1

Bumps gradle from 7.2.2 to 7.3.1.

---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Try to fix build issue caused by KSP workaround

* Add missing dependency

* Suppress false positive in linter

* Suppress more false positives, fix 2 possible leaks

* Fix tests

* Ignore flaky test

* Use namespaces instead of packagenames in AndroidManifest files

* Reorder dependency groups

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jorge Martín <jorgem@element.io>
2022-10-17 09:14:28 +02:00
Eric Decanini 75c97bc7c5
Device Manager Notification and Pusher Fixes (#7370)
* Fixes existing pushers being overwritten on app startup

* Refreshes pushers in SessionOverview screen

* Fixes push toggle not working for non pusher sessions

* Various code improvements

* Further code improvements for safety

* Fixes CI errors
2022-10-14 15:02:11 -04:00
Hugh Nimmo-Smith a3fc785945 Fix missing param 2022-10-14 18:52:42 +01:00
Hugh Nimmo-Smith bfe3daa37f Fix compile error from bad merge 2022-10-14 17:25:06 +01:00
Hugh Nimmo-Smith fdc55965ca Linting 2022-10-14 17:23:26 +01:00
Hugh Nimmo-Smith dc9b41d19a Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login 2022-10-14 17:12:08 +01:00
Jorge Martin Espinosa f1acb4712c
Fix editing formatted messages in plain text editor (#7360)
* Fix editing formatted messages in plain text editor

* Update changelog.d/7359.sdk

Co-authored-by: Benoit Marty <benoitm@matrix.org>

Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-10-14 15:15:12 +00:00
Onuray Sahin 6c10a9bf2d Code review fixes. 2022-10-14 18:10:18 +03:00
Onuray Sahin e83bdc3779 Use correct homeserver url to check qr code login support. 2022-10-14 17:46:14 +03:00
Maxime NATUREL 612d2e51e5
Merge pull request #7361 from vector-im/feature/mna/device-manager-unknown-verification-status
[Device management] Update the unknown verification status icon (PSG-824)
2022-10-14 16:22:33 +02:00
Maxime NATUREL ec5964bc20
Merge pull request #7352 from vector-im/feature/mna/device-manager-lab-flag-account-data
[Device management] Add lab flag for matrix client info account data event (PSG-800)
2022-10-14 16:03:40 +02:00
Maxime NATUREL 81038bdd23 Fixing security section recommendation visibility 2022-10-14 15:19:51 +02:00
Hugh Nimmo-Smith 4325600d27 Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login 2022-10-14 13:57:04 +01:00
Maxime NATUREL 111a70f6c1 Checking lab flag to select session manager screen to navigate to 2022-10-14 14:26:21 +02:00
Onuray Sahin 5953346b3d Merge branch 'develop' into feature/ons/qr_code_login_ui
# Conflicts:
#	library/ui-strings/src/main/res/values/strings.xml
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo038.kt
#	vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
#	vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
#	vector/src/main/java/im/vector/app/features/VectorFeatures.kt
2022-10-14 15:17:55 +03:00
Maxime NATUREL cf25b81e9a Adding new shield color into resources 2022-10-14 14:00:01 +02:00
Maxime NATUREL 189e77211e Improving when structure 2022-10-14 13:46:33 +02:00
Maxime NATUREL 86132219d8 Adding settings for visibility of labs flags 2022-10-14 13:45:23 +02:00
Benoit Marty 7699628959 Fix other potential issue when using Session.getUser() 2022-10-14 12:25:55 +02:00
Benoit Marty 0a6d620f27 getUser() can return null more often than before, since the SDK will retrieve data asynchronously. So ensure that the initial state can always be built. 2022-10-14 11:38:24 +02:00
Benoit Marty 8fc35ef792 Remove unused param 2022-10-14 11:25:41 +02:00
Hugh Nimmo-Smith 626e3dbd10
Merge pull request #7358 from vector-im/feature/hughns/qr_code_login_task 2022-10-14 09:38:07 +01:00
Jorge Martin Espinosa 81ef1415dc
Apply design changes to WYSIWYG editor (#7354)
* Apply design changes to WYSIWYG editor

* Add changelog

* Remove unneeded attribute in RichTextComposerLayout

* Fix lint issues

* Fix style naming issue.

* Change rich text editor border radius depending on the number of lines.

* Replace standby voice recorder icon.
2022-10-14 09:59:43 +02:00
Hugh Nimmo-Smith de4232dff5 Fix logic for showing confirm button 2022-10-14 06:17:48 +01:00
Hugh Nimmo-Smith d72371906e Add flag to allow QR login on all servers + split flag for showing in device manager 2022-10-14 06:17:48 +01:00
Hugh Nimmo-Smith efa70fa0ff Revert "Retry scanning if not a QR code"
This reverts commit 87956e9438.
2022-10-14 06:17:48 +01:00
Hugh Nimmo-Smith 4c7c86100f Fix logic for showing confirm button 2022-10-14 02:04:08 +01:00
Hugh Nimmo-Smith 343cf74871 Add flag to allow QR login on all servers + split flag for showing in device manager 2022-10-14 01:45:03 +01:00
Hugh Nimmo-Smith c00ce91214 Linting 2022-10-14 01:11:25 +01:00
Hugh Nimmo-Smith c18439f99b Refactor code into api from internal 2022-10-14 01:07:19 +01:00
Hugh Nimmo-Smith f04f0e6fac Revert "Revert "Partial implementation of QR login logic""
This reverts commit e305478dda.
2022-10-13 22:42:58 +01:00
Hugh Nimmo-Smith 958ee2d356 Revert "Revert "Retry scanning if not a QR code""
This reverts commit 9429a4f22a.
2022-10-13 22:32:02 +01:00
Hugh Nimmo-Smith dd47297dfd QR login + E2EE set up 2022-10-13 22:14:55 +01:00
Hugh Nimmo-Smith 9a72d6529b Support for navigation to home screen 2022-10-13 22:13:56 +01:00
Hugh Nimmo-Smith 991eeb1de6 Map for soft logout 2022-10-13 22:13:56 +01:00
Hugh Nimmo-Smith b03240330d Only do completeOnNewDevice if we received a confirmation code 2022-10-13 22:13:55 +01:00
Onuray Sahin ef574bd82f Merge branch 'develop' into feature/ons/qr_code_login_ui
# Conflicts:
#	library/ui-strings/src/main/res/values/strings.xml
#	library/ui-styles/src/main/res/values/stylable_sessions_list_header_view.xml
#	vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
#	vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
#	vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
#	vector/src/main/java/im/vector/app/features/VectorFeatures.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
#	vector/src/main/res/layout/fragment_other_sessions.xml
#	vector/src/main/res/layout/fragment_settings_devices.xml
2022-10-13 22:13:55 +01:00
Hugh Nimmo-Smith bfab07d716 Partial implementation of QR login logic 2022-10-13 22:13:55 +01:00