Commit Graph

14206 Commits

Author SHA1 Message Date
Florian Renaud f62f661d2b Room list - Do not show live broadcast if the started event is redacted 2023-01-11 17:56:12 +01:00
Florian Renaud 493fa7a0eb Use private method to mockk voice broadcast event 2023-01-11 17:31:52 +01:00
Florian Renaud 2df94807e0 Restore private visibility of fake component fields 2023-01-11 17:31:52 +01:00
Florian Renaud 39c0cb2015 Add unit test 2023-01-11 17:31:52 +01:00
Florian Renaud c63d6fa1fb Fix unexpected live voice broadcast in the room list 2023-01-11 17:31:51 +01:00
Onuray Sahin 61f7f12d7f Fix edited rendering poll question in action preview. 2023-01-11 15:58:10 +03:00
Onuray Sahin 912d3e5055 Fix edited poll preview in room list. 2023-01-11 15:57:39 +03:00
Benoit Marty 242596744a Use Fragment 1.6.0 alpha to fix issue with test
https://issuetracker.google.com/issues/128612536
2023-01-11 12:13:45 +01:00
Benoit Marty d686d7aab2 Project property value can only be strings.
Fix
> Failed to notify project evaluation listener.
   > Could not create task ':element-android:matrix-sdk-android:compileDebugAndroidTestKotlin'.
      > Could not create task of type 'KotlinCompile'.
         > class java.util.LinkedHashMap cannot be cast to class java.lang.String (java.util.LinkedHashMap and java.lang.String are in module java.base of loader 'bootstrap')
2023-01-11 12:13:00 +01:00
dependabot[bot] 2614911631 Bump kotlin-reflect from 1.7.22 to 1.8.0
Bumps [kotlin-reflect](https://github.com/JetBrains/kotlin) from 1.7.22 to 1.8.0.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.22...v1.8.0)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-reflect
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-11 12:13:00 +01:00
Benoit Marty 62c07fa02c
Merge pull request #7322 from vector-im/feature/nfe/app_layout_tests
new app layout home screen unit tests
2023-01-11 11:31:52 +01:00
Onuray Sahin c012d559b7
Merge pull request #7900 from vector-im/feature/ons/render_ended_poll
Render ended polls (PSG-904)
2023-01-10 21:06:03 +03:00
jonnyandrew b7073cb104
[Rich text editor] Update list item bullet appearance (#7930) 2023-01-10 17:04:39 +00:00
Onuray Sahin 8495536fd3 Code review fix. 2023-01-10 19:22:56 +03:00
Onuray Sahin ec27c67940 Fix color of winning vote count. 2023-01-10 19:14:30 +03:00
Florian Renaud 9d3b5c5bbb Fix no display name for some voice broadcast recorder name 2023-01-10 16:00:19 +01:00
Florian Renaud 3663f22590 Handle download error during playback 2023-01-10 15:42:37 +01:00
Florian Renaud 2d24eb1273 Handle playback error 2023-01-10 15:42:37 +01:00
Florian Renaud f8852856c6 Convert state enum to sealed interface 2023-01-10 15:30:54 +01:00
Benoit Marty e384669d85
Merge pull request #5717 from thefirstofthe300/increase-message-font-size
fix: increase font size for messages
2023-01-10 15:16:39 +01:00
Benoit Marty 7badf7783f
Merge branch 'develop' into feature/nfe/app_layout_tests 2023-01-10 14:43:21 +01:00
Benoit Marty 31a0a049b1
Merge pull request #7432 from ByeongsuPark/feature/bspark/enhancement-7111-trim-username
Add trim to username input when sign-in
2023-01-10 14:38:56 +01:00
Benoit Marty 4c4f3ff11d
Merge pull request #7810 from vector-im/dependabot/gradle/com.gabrielittner.threetenbp-lazythreetenbp-0.13.0
Bump lazythreetenbp from 0.12.0 to 0.13.0
2023-01-10 14:21:14 +01:00
Benoit Marty ac482b1389
Merge pull request #7917 from vector-im/feature/bma/viewEventReplay
View event replay
2023-01-10 14:10:14 +01:00
Onuray Sahin a8b111dc8c Code review fixes. 2023-01-10 15:04:13 +03:00
Benoit Marty 02c61d3fb5 Fix view event replay 2023-01-10 10:51:58 +01:00
Benoit Marty cceb1cd66c Add constraint on T. It has to extend `VectorViewEvents` 2023-01-09 16:39:12 +01:00
Benoit Marty ca3d441de0 Handle error in the thread list request. 2023-01-09 14:16:12 +01:00
Onuray Sahin 2b26f2b221 Fix related event id is null issue. 2023-01-09 16:00:24 +03:00
Benoit Marty baa46634b5
Merge pull request #7885 from vector-im/feature/bma/fixLint
Fix lint false positive
2023-01-06 18:44:37 +01:00
Benoit Marty 93021a6028
Merge pull request #7724 from vector-im/feature/bma/launchWhenResumed
Observe ViewEvents only when resumed
2023-01-06 18:43:53 +01:00
Benoit Marty e9d1de8fba Fix compilation issue after rebase. 2023-01-06 17:36:40 +01:00
Maxime NATUREL f856142cdc
Merge pull request #7886 from vector-im/feature/mna/past-polls-ui
[Poll] Render past polls list of a room (PSG-1029)
2023-01-06 16:07:44 +01:00
Onuray Sahin 2c24601155
Merge branch 'develop' into feature/ons/render_ended_poll 2023-01-06 17:21:08 +03:00
Onuray Sahin b73485e7b3 Fix unit tests. 2023-01-06 17:18:50 +03:00
Benoit Marty b7076a13dc
Merge pull request #7879 from vector-im/feature/bma/still_investigating
Reduce number of crypto database transactions when handling the sync response
2023-01-06 15:16:16 +01:00
Benoit Marty 9768430d5c Fix test compilation issue 2023-01-06 15:11:43 +01:00
Benoit Marty 71bd4f457a Ensure posted events from the ViewModel are consumed (once) by the UI
Inspired from https://github.com/Kotlin/kotlinx.coroutines/issues/3002
2023-01-06 15:11:43 +01:00
Benoit Marty 9c79d23444 Ensure event are not sent if the lifecycle state is not RESUMED 2023-01-06 15:11:43 +01:00
Benoit Marty 0dd1abb926 Rename method 2023-01-06 15:11:43 +01:00
Maxime NATUREL 41bcdd7232
Merge pull request #7867 from vector-im/feature/mna/active-polls-ui
[Poll] Render active polls list of a room (PSG-908)
2023-01-06 14:18:20 +01:00
Maxime NATUREL 85cfa433d9 Using ordinal of enum to render tabs 2023-01-06 14:13:58 +01:00
dependabot[bot] b8da53b3bb
Bump checker from 3.27.0 to 3.29.0 (#7903)
Bumps [checker](https://github.com/typetools/checker-framework) from 3.27.0 to 3.29.0.
- [Release notes](https://github.com/typetools/checker-framework/releases)
- [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/typetools/checker-framework/compare/checker-framework-3.27.0...checker-framework-3.29.0)

---
updated-dependencies:
- dependency-name: org.checkerframework:checker
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-06 11:56:11 +00:00
Onuray Sahin ad30ca8671 Lint fixes. 2023-01-06 14:52:41 +03:00
Onuray Sahin 37f4cf11bd Merge branch 'develop' into feature/ons/render_ended_poll 2023-01-06 13:29:04 +03:00
Florian Renaud 2e95d4f97c
Merge pull request #7899 from vector-im/bugfix/fre/buffering_on_last_chunk
[Voice Broadcast] Stop listening if we reach the last received chunk and there is no last sequence number
2023-01-06 09:10:00 +01:00
Maxime NATUREL f1bd9b2cf3
Merge pull request #7854 from vector-im/fix/mna/info-session-without-crypto-support
[Session manager] Missing info when a session does not support encryption (PSG-1074)
2023-01-05 17:42:08 +01:00
Maxime NATUREL 9b5fda2689 Fix after rebase 2023-01-05 16:38:52 +01:00
Maxime NATUREL a5d076a28a Adding total votes status for ended poll items 2023-01-05 16:38:52 +01:00
Maxime NATUREL 05363dc8ca Adding winner option views for ended poll items 2023-01-05 16:38:52 +01:00
Maxime NATUREL 1cc26449f3 Renaming some ui fields 2023-01-05 16:38:52 +01:00
Maxime NATUREL 3deae1101c Adding extra data for ended poll 2023-01-05 16:38:52 +01:00
Maxime NATUREL cf82486efa Adding mocked data for ended polls 2023-01-05 16:38:52 +01:00
Maxime NATUREL 740591cd38 Updating unit tests 2023-01-05 16:38:52 +01:00
Maxime NATUREL cb45056c1a Mutualizing list fragments and add ended polls tab 2023-01-05 16:38:52 +01:00
Maxime NATUREL 7fc9705f3a Adding importantForAccessibility attribute to icon 2023-01-05 16:37:06 +01:00
Maxime NATUREL 2dab6ed052 Fix horizontal margin of tabs 2023-01-05 15:27:11 +01:00
Maxime NATUREL ff9e78be42 Use classical for loop instead of forEach 2023-01-05 15:20:20 +01:00
Maxime NATUREL d60403545c Renaming of filter enum 2023-01-05 15:09:41 +01:00
jonnyandrew bbb0036647
[Rich text editor] Add list formatting buttons to the rich text editor (#7887) 2023-01-05 13:07:19 +00:00
Benoit Marty 0d2fb8e3d0 Lint: fix KotlinNullnessAnnotation warning 2023-01-05 14:07:12 +01:00
Onuray Sahin f2359ccac2 Implement ended poll indicator. 2023-01-05 14:54:16 +03:00
Florian Renaud 682bb8bde0 VB - Stop listening if we reach the last received chunk and there is no last sequence number 2023-01-05 10:52:22 +01:00
Maxime NATUREL 354554e843 Ignore missing ContentDescription 2023-01-04 16:29:37 +01:00
Maxime NATUREL e82c7afdae Replace usage of colorAccent 2023-01-04 16:29:37 +01:00
Maxime NATUREL 6c0c5e5064 Rename poll item layout to be more generic 2023-01-04 16:29:37 +01:00
Maxime NATUREL bd9c53a96c Show message when list is empty 2023-01-04 16:29:37 +01:00
Maxime NATUREL e0b77936c1 Changing the date format 2023-01-04 16:29:37 +01:00
Maxime NATUREL bc985aa1ef Adding unit tests for ViewModel 2023-01-04 16:29:37 +01:00
Maxime NATUREL 71b7edc6f2 Adding debug log 2023-01-04 16:29:37 +01:00
Maxime NATUREL bf67d2529f Allow access of poll history only in debug variant 2023-01-04 16:29:37 +01:00
Maxime NATUREL 8de86e7480 Render mocked data get from use case 2023-01-04 16:29:37 +01:00
Maxime NATUREL 77d3b7da04 Fix missing id in Epoxy model 2023-01-04 16:29:37 +01:00
Maxime NATUREL f20513eb16 Render the active polls list on fragment 2023-01-04 16:29:37 +01:00
Maxime NATUREL 7b63f891c3 Epoxy controller to render active poll list 2023-01-04 16:29:37 +01:00
Maxime NATUREL 9f97579f9d Epoxy model for active poll 2023-01-04 16:29:37 +01:00
Maxime NATUREL 10133bd20f Setup tab layout when landing on the room polls screen 2023-01-04 16:29:36 +01:00
Maxime NATUREL 7436c2e1f5 Navigate to new empty screen 2023-01-04 16:29:36 +01:00
Maxime NATUREL cba960fbd7 Adding new entry "Poll history" into room profile screen 2023-01-04 16:29:36 +01:00
Maxime NATUREL fa7766f8a6 Fixing missing device without encryption support in the unverified session list 2023-01-04 16:04:18 +01:00
Maxime NATUREL 6fdb1216ba Fixing missing session info when there is no crypto info 2023-01-04 16:04:17 +01:00
Maxime NATUREL 1af712910f Use deviceId as session name when there is no display name 2023-01-04 16:04:17 +01:00
Maxime NATUREL 01429b352a Fix inactivity status when last seen timestamp is null 2023-01-04 16:04:17 +01:00
Maxime NATUREL 36b1c12b81 Fix error reported for usage of some methods from API 33 2023-01-04 15:04:42 +01:00
SpiritCroc 4d04e4260d Rich replies: also render notices formatted
Change-Id: I5cc31ce39348ba07f66b0dc8c3b2658fbdb515a9
2023-01-03 17:08:24 +01:00
Benoit Marty 56986c3a77 Add a way to get the access token from the advances settings. 2023-01-02 21:15:08 +01:00
SpiritCroc dadeadcad4 Merge tag 'v1.5.18' into sc
Change-Id: I4730268dc4327fb16756e73d4dcb428a8c262ec3
2023-01-02 17:57:49 +01:00
Onuray Sahin 89a7d70849 Implement reply preview for poll.end events. 2023-01-02 16:16:23 +03:00
Onuray Sahin 89f91a2ecd Fix unit test. 2023-01-02 14:37:20 +03:00
Onuray Sahin b53615a8d7 Add reply action for poll end events. 2023-01-02 14:36:54 +03:00
bmarty f79c4f3ad1 Sync Emojis 2023-01-02 00:03:13 +00:00
SpiritCroc 740364f733 Merge remote-tracking branch 'deepbluev7/nico/fix-at-room' into sc
Change-Id: I9587d87c60e70c2efc098b7379a6bac9f9c9be26
2022-12-31 08:24:15 +01:00
SpiritCroc 141b46dfc3 Fix clicking on bridge contact opening bridge bot in encrypted chats
Change-Id: I8749244f393639740885c7086a18cd127274baa7
2022-12-30 18:24:25 +01:00
SpiritCroc 25dddf7566 Merge tag 'v1.5.16' into sc
Change-Id: I98c122b95dd3758d41f4845a42ec9ed2371e174f

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
2022-12-30 17:58:06 +01:00
Valere d75d7a3695
Merge pull request #7843 from vector-im/bugfix/nfe/sync_filter_fix
sync filter params moved to matrix config
2022-12-28 11:04:40 +01:00
Onuray Sahin 374445eed6 Update poll layout. 2022-12-26 17:57:04 +03:00
Onuray Sahin 486968fdc2 Render ended poll. 2022-12-26 14:41:38 +03:00
Onuray Sahin f6cabfffd9 Set poll end event type as displayable. 2022-12-23 16:24:10 +03:00
NIkita Fedrunov 32fcdad916 fixed compilation error 2022-12-23 13:19:35 +01:00
NIkita Fedrunov d20121603a sync filter params moved to matrix config 2022-12-23 13:10:27 +01:00
NIkita Fedrunov 2892a5701a Merge branch 'develop' into feature/nfe/app_layout_tests 2022-12-23 12:27:53 +01:00
Onuray Sahin 2ddc3b6d05 Fix indentation. 2022-12-23 13:40:08 +03:00
Onuray Sahin 2085f7f17d Merge branch 'develop' into feature/ons/increase_dm_test_coverage 2022-12-23 13:38:28 +03:00
Yoan Pintas 92ed663068
Replace the player timeline (#7821) 2022-12-22 14:05:43 +00:00
Onuray Sahin a96f2d5771 Add changelog. 2022-12-22 15:39:10 +03:00
Benoit Marty 3c3c44b344
Merge pull request #7818 from vector-im/sync-emojis
Sync Emojis
2022-12-22 12:23:18 +01:00
Onuray Sahin fcac1849c3 Write unit test for toggling ip address visibility. 2022-12-21 17:07:16 +03:00
Onuray Sahin 73e2f02c48 Increase coverage of devices view model. 2022-12-21 14:30:32 +03:00
jonnyandrew 50466792c6
[Rich text editor] Add support for links in the rich text editor (#7746) 2022-12-21 10:40:19 +00:00
SpiritCroc 82eabe0fb6 Tweak init sync / clear cache settings entry
Change-Id: I51d9f701169b67e3e09bbd7d028b5fd8037653a7
2022-12-21 10:00:29 +01:00
SpiritCroc e054828370 Merge tag 'v1.5.14' into sc
Change-Id: Ib0162cc1f66cd563e15a24a2c090cfd18b5250c2
2022-12-21 09:57:40 +01:00
Benoit Marty ff7be665ec Merge branch 'hotfix/1.5.14-bis' into develop 2022-12-20 16:49:31 +01:00
Nikita Fedrunov f4dca572c5
reply to threaded push notification now sent to thread not to main timeline (#7805) 2022-12-20 13:27:39 +01:00
Benoit Marty 95a29b83fe ActiveSessionHolder is not supposed to start syncing. Instead, the MainActivity does it, if necessary.
Fixes a race condition when clearing cache.
2022-12-20 13:12:54 +01:00
Onuray Sahin e95380ac9e
Merge pull request #7798 from vector-im/feature/ons/fix_device_manager_ui
Device Manager UI review fixes (PSG-1102)
2022-12-19 18:03:12 +03:00
Onuray Sahin 2c0d029dea Fix separator UI. 2022-12-19 17:12:07 +03:00
Maxime NATUREL b609c5ca10
Merge pull request #7793 from vector-im/fix/mna/long-press-select-in-other-sessions
[Session Manager] Other sessions list: cannot select/deselect session by a long press when in select mode (PSG-1111)
2022-12-19 14:50:19 +01:00
Maxime NATUREL 8dd2ebf249
Merge pull request #7791 from vector-im/fix/mna/filter-bottom-sheet-content-cut
[Session manager] Other sessions: Filter bottom sheet cut in landscape mode (PSG-1107)
2022-12-19 14:49:07 +01:00
Onuray Sahin f08a3f7966
Merge pull request #7794 from vector-im/feature/ons/fix_current_session_ip_address_visibility
Fix current session ip address visibility (PSG-1109)
2022-12-19 16:33:18 +03:00
Yoan Pintas d17fdbb913
Merge pull request #7816 from vector-im/yostyle/prompt_stop_voicebroadcast
[Voice Broadcast] Prompt the user before ending a live broadcast
2022-12-19 14:28:17 +01:00
Onuray Sahin 9fd6fe321d
Merge pull request #7790 from vector-im/feature/ons/fix_rename_session_keyboard_visibility
Automatically show keyboard after learn more bottom sheet is dismissed (PSG-1105)
2022-12-19 16:21:37 +03:00
Maxime NATUREL ef7b5a4418
Merge pull request #7785 from vector-im/fix/mna/hide-filter-in-selection-mode
[Session manager] Other sessions list: filter option is displayed when selection mode is enabled (PSG-1113)
2022-12-19 14:11:37 +01:00
Maxime NATUREL c7de0523e7
Merge pull request #7796 from vector-im/feature/mna/security-recommendations-tappable
[Session manager] Security recommendations cards: whole view should be tappable (PSG-1117)
2022-12-19 14:09:09 +01:00
Onuray Sahin 61685d3e4a Merge branch 'develop' into feature/ons/fix_current_session_ip_address_visibility 2022-12-19 15:47:51 +03:00
Onuray Sahin dd51293621 Fix unit test. 2022-12-19 15:46:58 +03:00
Onuray Sahin 3f510087d0 Code review fixes. 2022-12-19 14:44:36 +03:00
Onuray Sahin 65d26f180f Fix alignment of content title and description. 2022-12-19 13:27:40 +03:00
Maxime NATUREL 5bde84c059 Better fix for scrollbar padding 2022-12-19 10:53:45 +01:00
Maxime NATUREL 7ea1f65fe3 Fixing padding of the scrollbar and avoid using rtl layout in RadioGroup 2022-12-19 10:19:56 +01:00
bmarty 764eadb696 Sync Emojis 2022-12-19 00:06:05 +00:00
yostyle 74f69b228f Prompt the user before ending a voice broadcast 2022-12-17 21:00:01 +01:00
SpiritCroc 1c335194cf Still show threads as replies when threads are disabled
Change-Id: Id08fd8be12bb7bfc589d21989ae96f9457961d15
2022-12-17 15:17:43 +01:00
SpiritCroc 7a83a44077 Fix threaded message rendering rich reply when they shouldn't
Change-Id: I5a1c1d177d896d203f2420bdd1536dfcbbd460d6
2022-12-17 11:34:52 +01:00
SpiritCroc aa9e0bc627 Add read receipt debugging
Change-Id: I2cd0b5feb23962bc36295380fe3e77346f0ea694
2022-12-17 11:34:39 +01:00
dependabot[bot] 3f3db1abda
Bump lazythreetenbp from 0.12.0 to 0.13.0
Bumps [lazythreetenbp](https://github.com/gabrielittner/lazythreetenbp) from 0.12.0 to 0.13.0.
- [Release notes](https://github.com/gabrielittner/lazythreetenbp/releases)
- [Changelog](https://github.com/gabrielittner/lazythreetenbp/blob/main/CHANGELOG.md)
- [Commits](https://github.com/gabrielittner/lazythreetenbp/compare/0.12.0...0.13.0)

---
updated-dependencies:
- dependency-name: com.gabrielittner.threetenbp:lazythreetenbp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-16 23:01:56 +00:00
SpiritCroc ed3049f04e Update Schildi help link
Change-Id: I56c195734c453b08bbec018b8bbbb8e14af08f75
2022-12-16 22:31:14 +01:00
Maxime NATUREL 8e2d82ea9a Setting margin top of session details header to 32dp 2022-12-16 17:39:03 +01:00
Maxime NATUREL 62f742bf66 Using "Other sessions" title everytime 2022-12-16 17:22:40 +01:00
Onuray Sahin 913fb1e5dc UI review fixes. 2022-12-16 17:07:26 +01:00
Yoan Pintas 14290abfcf
Merge pull request #7806 from vector-im/yostyle/update_live_status
[Voice Broadcast] Update live indicator color
2022-12-16 14:27:28 +01:00
SpiritCroc 1eacd0cca3 Make it harder to not find "initial sync" option in settings
Change-Id: Iff49485ebe036a14bf03e274791275d5ff27d864
2022-12-16 13:00:13 +01:00
SpiritCroc 987ca6dec4 Revert "stop listening timeline collection changes when app is not resumed (#7734)"
This makes the chat view get destroyed onPause, leading to
jump-to-bottom when clicking links, opening threads etc.

This reverts commit cf59c80100.

Change-Id: I56ae7027d0488013251bc88edd0e47a19dead315
2022-12-16 12:59:47 +01:00
yostyle f2d2c0cb27 Update live indicator color 2022-12-16 10:32:50 +01:00
Maxime NATUREL c2d25c8564 Collapsing header in other sessions screen 2022-12-16 09:46:52 +01:00
Maxime NATUREL d7a729740e Adding click listener on the whole custom view 2022-12-15 16:02:56 +01:00
Onuray Sahin ce23b80698 Fix current session ip address visibility. 2022-12-15 17:29:37 +03:00
Onuray Sahin bc9ca3fd12 Revert "Fix ip address visibility in the current session details."
This reverts commit f0dc6e478d.
2022-12-15 17:26:39 +03:00
Onuray Sahin f0dc6e478d Fix ip address visibility in the current session details. 2022-12-15 16:48:32 +03:00
Maxime NATUREL eb31174913 Toggle selection on long press even when in selection mode 2022-12-15 14:39:22 +01:00
Maxime NATUREL a86f2e03cc Make the radiogroup scrollable to better support landscape on small devices 2022-12-15 14:14:48 +01:00
Onuray Sahin cc33c008ba Automatically show keyboard after learn more bottom sheet is dismissed. 2022-12-15 15:50:02 +03:00
Maxime NATUREL dcb8aea292 Hiding the filter icon in top bar when in selection mode 2022-12-15 11:02:59 +01:00
SpiritCroc 330f0cf5cc Merge tag 'v1.5.12' into sc
Change-Id: I4c53d64845ee05ff395e5df436a0739c87798737

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/session/room/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
	vector-app/build.gradle
	vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
	vector-config/src/main/res/values/config-settings.xml
	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/MessageComposerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
2022-12-15 11:01:52 +01:00
Nikita Fedrunov cf3abd6562
thread list loading (#7766) 2022-12-14 18:56:16 +01:00
Yoan Pintas c74ea2dd16
Merge pull request #7719 from vector-im/feature/fre/voice_broadcast_last_message
Voice Broadcast - Update last message in the room list
2022-12-14 17:39:42 +01:00
Nikita Fedrunov 3dadebe505
threads are enabled by default end forced to enabled for existing users (#7775) 2022-12-13 14:02:45 +01:00
SpiritCroc c626100ae1 Disable unnecessary reply fallback processing
We have rich replies!

Change-Id: Ifc5f41471f32e0a60e23f41c7fa9a51f25865d77
2022-12-13 10:43:01 +01:00
Onuray Sahin 250bd9c620
Merge pull request #7754 from vector-im/feature/ons/remove_client_information_account_data
Delete unused client information from account data (PSG-871)
2022-12-13 11:10:41 +03:00
Nikita Fedrunov 4e0c3a97bd
thread message notification should navigate to thread timeline (#7771) 2022-12-12 22:35:09 +01:00
Hugh Nimmo-Smith 0ffc2af679 Update test to work with new state 2022-12-12 17:32:28 +00:00
Hugh Nimmo-Smith f111a84e17 More unit test fix 2022-12-12 16:30:35 +00:00
Hugh Nimmo-Smith 096e52612e More fix up of unit tests 2022-12-12 16:30:35 +00:00
Hugh Nimmo-Smith 643b09a77c Fix up unit tests 2022-12-12 16:30:35 +00:00
Hugh Nimmo-Smith 1437f6d41d Remove unused bad function call 2022-12-12 16:30:35 +00:00
Hugh Nimmo-Smith 1930047ce1 Fix issue of QR not being offered where domain is entered instead of homeserver 2022-12-12 16:30:34 +00:00
Onuray Sahin 8c6c2dd5c2 Code review fixes. 2022-12-12 16:36:40 +03:00
Jorge Martin Espinosa c523e144b8
Rich text editor: improve performance when changing composer mode (#7691)
* Rich text editor: improve performance when changing composer mode

* Add changelog

* Make `MessageComposerMode.Quote` and `Reply` data classes

* Re-arrange code to fix composer not being emptied when sneding a message
2022-12-12 13:52:17 +01:00
Maxime NATUREL 361b0411c7
Merge pull request #7747 from vector-im/fix/mna/verification-request-priority
Verification request is not showing when verify session popup is displayed (PSG-1017)
2022-12-12 09:44:25 +01:00
Onuray Sahin 85a6c8c6f2 Write unit tests for the use case. 2022-12-09 19:53:20 +03:00
Maxime NATUREL dba8aaea16
Merge pull request #7752 from vector-im/fix/mna/wrong-usage-of-stable-fields
Revert usage of stable fields in live location sharing and polls
2022-12-09 17:32:53 +01:00
Onuray Sahin 7a667b513e Execute use case from a better place. 2022-12-09 15:47:28 +03:00
Onuray Sahin 22cce30e35 Create use case to detect and delete unnecessary account data of client information. 2022-12-09 14:53:27 +03:00
Maxime NATUREL be7b49b707
Merge pull request #7736 from vector-im/fix/mna/session-without-crypto-keys
[Session manager] Sessions without encryption support should not prompt to verify (PSG-1004)
2022-12-09 09:52:39 +01:00
Nikita Fedrunov cf59c80100
stop listening timeline collection changes when app is not resumed (#7734) 2022-12-09 09:42:45 +01:00
Maxime NATUREL 220b1d86c0 Reverting usage of some stable fields whereas related MSCs have not landed into the specs yet 2022-12-08 17:42:51 +01:00
Benoit Marty ee737025f2
Merge pull request #7744 from vector-im/feature/bma/quickCrashFix
Fix crash
2022-12-08 16:01:55 +01:00
Maxime NATUREL 63bde230a3 Cancel verification alerts when adding the incoming request alert and when starting the process 2022-12-08 14:40:17 +01:00
Maxime NATUREL df55c84167 Raise priority of incoming verification request alert + cancel existing verification alerts 2022-12-08 14:00:35 +01:00
jonnyandrew de18f37849
[Rich text editor] Add error tracking for rich text editor (#7695) 2022-12-08 11:43:19 +00:00
SpiritCroc 035e1ae7f7 Give replied-to text preview more height
Change-Id: Iceb552d5f73d7860c333e242adfe066a8cf7105e
2022-12-08 10:56:47 +01:00
Benoit Marty a5ab1b4a8b Fix crash `kotlin.UninitializedPropertyAccessException: lateinit property avatarRenderer has not been initialized`. AvatarRenderer is not used here. 2022-12-08 10:34:08 +01:00
Florian Renaud 59859ec02e Prioritize call events against live broadcast 2022-12-07 18:11:52 +01:00
Florian Renaud bb7323a935 Rename some use cases 2022-12-07 18:11:52 +01:00
Florian Renaud 35c528405d Code cleanup 2022-12-07 18:11:52 +01:00
Florian Renaud 7a1dfef6d5 Display a notice in the timeline when a voice broadcast is stopped 2022-12-07 18:11:52 +01:00
Florian Renaud aa5270760e Hide typing events if there is a live voice broadcast 2022-12-07 18:11:51 +01:00
Florian Renaud 69beef4648 Show voice broadcast events in the room list
fix factory
2022-12-07 18:11:51 +01:00
Florian Renaud fdb8743ad3 Create provider package 2022-12-07 18:11:51 +01:00
Maxime NATUREL 23c2682f8d Fixing code style issues 2022-12-07 16:39:51 +01:00
Maxime NATUREL c580090f20
Merge pull request #7707 from vector-im/feature/mna/rename-and-signout-action-current-session
[Session manager] Add actions to rename and signout current session (PSG-885)
2022-12-07 16:16:44 +01:00
Maxime NATUREL 88f7439880 Updating comment to clarify intention 2022-12-07 16:04:27 +01:00
Maxime NATUREL a44c8dfca3 Renaming a method to avoid confusion 2022-12-07 15:10:21 +01:00
Benoit Marty d0b1a7bfd1
Merge pull request #7723 from vector-im/feature/bma/disableNightlyPopup
Disable nightly popup
2022-12-07 15:01:09 +01:00
SpiritCroc 87100a8536 Merge remote-tracking branch 'upstream/develop' into sc
Change-Id: Ifed09540802774e7b1d3f2ab787a7f42f1030b28

Conflicts:
	vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
2022-12-07 14:56:07 +01:00
SpiritCroc f62381a972 Revert "Avoid unifiedpush selection spam"
This reverts commit 509eabfe5c.
2022-12-07 14:40:04 +01:00
Maxime NATUREL f014866d06 Handling the case where device has no CryptoDeviceInfo 2022-12-07 14:34:45 +01:00
Benoit Marty b9eb271aff
Merge pull request #7712 from vector-im/feature/bma/startServiceApi
Use the latest startForeground API
2022-12-06 17:05:07 +01:00
Onuray Sahin f76a6de10d
Merge pull request #7710 from vector-im/feature/ons/fix_unknown_shield_icon_in_room
Fix usage of unknown shield in room summary (PSG-1019)
2022-12-06 17:51:04 +03:00
Maxime NATUREL 6f0a95b828
Merge pull request #7692 from vector-im/feature/mna/listen-notification-account-data
Update notifications setting when m.local_notification_settings.<device-id> event changes for current device (PSG-874)
2022-12-06 14:12:01 +01:00
Benoit Marty 0d12dbbe7e Disable the Nightly popup, user registration (with `updateIfNewReleaseAvailable()`) to get upgrade does not work.
Add a nightly build section in the preferences to manually try to upgrade.
2022-12-06 12:51:46 +01:00