Commit Graph

14614 Commits

Author SHA1 Message Date
SpiritCroc 236c44a5a5 Easier access to more custom emotes
- Expand button
- More emotes by default

Change-Id: Id18f0b36099465d83156fcee2d3b016f299402f4
2023-03-25 13:53:58 +01:00
dependabot[bot] 483879c5ef
Bump com.gabrielittner.threetenbp:lazythreetenbp from 0.13.0 to 0.14.0 (#8275)
Bumps [com.gabrielittner.threetenbp:lazythreetenbp](https://github.com/gabrielittner/lazythreetenbp) from 0.13.0 to 0.14.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.13.0...0.14.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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-24 09:28:28 +01:00
Yoan Pintas 54457c1633
Truncated message in the pills (#8260) 2023-03-23 08:01:11 +00:00
dependabot[bot] 68f05e0687
Bump androidx.emoji2:emoji2 from 1.2.0 to 1.3.0 (#8266)
Bumps androidx.emoji2:emoji2 from 1.2.0 to 1.3.0.

---
updated-dependencies:
- dependency-name: androidx.emoji2:emoji2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-23 08:18:03 +01:00
Yoan Pintas 9fd1a22e10
Pillify permalinks (#8242) 2023-03-21 21:31:45 +00:00
Benoit Marty b85a06422c
Merge pull request #8235 from ByeongsuPark/feature/bspark/bugfix-8210-removejitsiwidgetview-rtl-support
Add RTL support to RemoveJitsiWidgetView
2023-03-21 10:54:51 +01:00
bmarty 93f3174050 Sync Emojis 2023-03-20 00:03:22 +00:00
Benoit Marty 7857339f54 Fix test 2023-03-16 09:47:45 +01:00
valere 065ee1d2f5 cleaning 2023-03-14 12:07:39 +01:00
valere 5f069264d0 Ignore some test in tust. Added some supports flags 2023-03-14 09:57:58 +01:00
Benoit Marty 6a3f5a50d9 Create Posthog instance only whe user consent is given, to avoid pinging Posthog server at startup when consent is not given.
Note that feature flag will not work, but for now they are not used.
All the `?.takeIf { userConsent == true }` could be removed with this change, but let's keep them for safety...
2023-03-13 10:33:18 +01:00
Dannie 577986001a Add RTL support to RemoveJitsiWidgetView
Signed-off-by: Byeongsu Park <byeongsu@soongsil.ac.kr>
2023-03-11 17:59:16 +09:00
valere 5f185c51e7 Merge branch 'develop' into feature/bca/rust_flavor 2023-03-09 18:21:41 +01:00
Benoit Marty 27ed0fe13f
Merge pull request #8208 from jdauphant/patch-1
Remove hardcoded color on save button
2023-03-09 15:06:19 +01:00
SpiritCroc 4147b06d08 [merge] Fix build
Change-Id: I05a3dbb9e136f30c429bcc67670bb9411f6476a7
2023-03-08 20:38:16 +01:00
SpiritCroc 19881a9f70 Merge tag 'v1.5.28' into sc
Change-Id: Ic5e1c79d3c39476375bf795bb7a1abb67c664f94

Conflicts:
	dependencies.gradle
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerLayout.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt
	vector/src/main/res/layout/item_timeline_event_text_message_rich_stub.xml
2023-03-08 20:27:57 +01:00
dependabot[bot] ea6279ee89
Bump fragment from 1.6.0-alpha04 to 1.6.0-alpha06 (#8165)
* Bump fragment from 1.6.0-alpha04 to 1.6.0-alpha06

Bumps `fragment` from 1.6.0-alpha04 to 1.6.0-alpha06.

Updates `androidx.fragment:fragment-ktx` from 1.6.0-alpha04 to 1.6.0-alpha06

Updates `androidx.fragment:fragment-testing` from 1.6.0-alpha04 to 1.6.0-alpha06

Updates `androidx.fragment:fragment-testing-manifest` from 1.6.0-alpha04 to 1.6.0-alpha06

---
updated-dependencies:
- dependency-name: androidx.fragment:fragment-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.fragment:fragment-testing
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.fragment:fragment-testing-manifest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* Replace deprecated methods

* Fix tests

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: yostyle <y.pintas@gmail.com>
2023-03-08 17:58:08 +01:00
ganfra fc796154ea
Merge pull request #8193 from vector-im/feature/bma/certList
Be able to let the user trust several Fingerprints during login flow.
2023-03-08 11:53:43 +01:00
dependabot[bot] 7c23776ea1
Bump org.checkerframework:checker from 3.30.0 to 3.32.0 (#8197)
Bumps [org.checkerframework:checker](https://github.com/typetools/checker-framework) from 3.30.0 to 3.32.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.30.0...checker-framework-3.32.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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-07 15:53:34 +00:00
Florian Renaud 39c702f41b
Merge pull request #8170 from vector-im/feature/fre/apply_push_rules_after_decryption
Reapply push rules on the decrypted event source (PSG-1146)
2023-03-07 10:39:48 +01:00
Yoan Pintas 94675b9f85
create encrypted DM for user invite by email (#8172)
Co-authored-by: jonnyandrew <jonny.andrew@protonmail.com>
2023-03-06 22:05:43 +00:00
jonnyandrew 29f2bf25fc
Extend workaround for extra new lines in timeline (#8187)
* Extend workaround for extra new lines in timeline

Closes vector-im/element-android#8179

Caused by noties/Markwon#423

* Refactor

Co-authored-by: Yoan Pintas <y.pintas@gmail.com>

---------

Co-authored-by: Yoan Pintas <y.pintas@gmail.com>
2023-03-06 16:03:53 +00:00
Benoit Marty 8595bd2be8 Fix compilation issue. 2023-03-06 15:50:39 +01:00
SpiritCroc e4e4e0a388 Support rendering emote pack display name
Change-Id: I93b422f3931128dd75de8ee570c56976a93702c8
2023-03-06 11:28:05 +01:00
SpiritCroc e3a7ef911e Allow custom emote packs with state keys
Fixes https://github.com/SchildiChat/SchildiChat-android/issues/184

Change-Id: I79ede7f9b45ff762b367c4b5cd048987e4f25515
2023-03-06 10:32:16 +01:00
Florian Renaud 21c7fc3d0a Merge remote-tracking branch 'origin/develop' into feature/fre/apply_push_rules_after_decryption 2023-03-06 09:11:48 +01:00
bmarty a6211a1da3 Sync analytics plan 2023-03-06 00:03:43 +00:00
Julien DAUPHANT 6b516cf6b2
Remove hardcoded color on save button 2023-03-04 22:14:25 +01:00
SpiritCroc 5081f665ea Include some experimental settings in rageshakes
Change-Id: I23e313089409df88518446720bdf69a6f112de4b
2023-03-04 15:45:27 +01:00
SpiritCroc 16f7cb4b8d Prefer caption over generic text for image/video message previews
Change-Id: I0cfbae4df14b7f8327e56afd152f0e1fffb93c45
2023-03-04 15:44:57 +01:00
Benoit Marty 4f64b20bca
Merge pull request #8176 from vector-im/dependabot/gradle/org.maplibre.gl-android-sdk-10.0.2
Bump org.maplibre.gl:android-sdk from 9.6.0 to 10.0.2
2023-03-03 11:17:17 +01:00
Yoan Pintas 446ed24bea
Update room member shields behavior (#8195) 2023-03-03 09:28:50 +00:00
jonnyandrew 7dd15af6d3
[Rich text editor] Add ability to insert GIFs from keyboard (#8185)
Closes vector-im/verticals-internal#21
2023-03-02 15:48:36 +00:00
Florian Renaud 4146b5511a Merge develop into feature/fre/apply_push_rules_after_decryption 2023-03-02 15:03:22 +01:00
Benoit Marty 5988a6374b
Merge pull request #8101 from vector-im/dependabot/gradle/androidx.browser-browser-1.5.0
Bump androidx.browser:browser from 1.4.0 to 1.5.0
2023-03-02 13:59:59 +01:00
Benoit Marty 182aa2a9ca Fix API break. 2023-03-02 12:30:44 +01:00
Benoit Marty 448374fc58 Be able to let the user trust several Fingerprints during login flow.
It was the case before, see `LoginViewModel.handleUserAcceptCertificate(...)`
2023-03-01 21:18:46 +01:00
Maxime NATUREL c54de67e03 Increase line spacing of the empty title in poll list screen 2023-03-01 10:29:14 +01:00
Maxime NATUREL 05c16dd09a Reducing size of the empty title in poll list screen 2023-03-01 10:08:22 +01:00
SpiritCroc bad9fdd8ad Fix url preview picture alignment without text
Change-Id: I8f0651e8b9d9430cff80702c1bf88bf8fea8f7b7
2023-02-28 15:23:44 +01:00
SpiritCroc 7c43d951fb Merge remote-tracking branch 'Sinofine/bubble-scale' into sc
Change-Id: I8d1ec00d90280bdfa107ec25b6ca691169b00ba5
2023-02-28 15:05:41 +01:00
Sinofine Lotusie 772421f20d fix image scaling of no bubble mode 2023-02-27 17:28:01 +08:00
jonnyandrew 39d9591b26
[Rich text editor] Fix code appearance (#8171)
Code does not use the correct theme colour when the theme is manually
selected in the app settings.

https://github.com/vector-im/verticals-internal/issues/23
2023-02-27 09:24:56 +00:00
Maxime NATUREL a6f7302350
Merge pull request #8159 from vector-im/feature/mna/aggregated-unread-indicator
Add aggregated unread indicator for spaces in the new layout
2023-02-24 09:56:54 +01:00
Florian Renaud 9d7758c9e3 Reuse event.supportsNotification extension 2023-02-24 09:26:50 +01:00
Maxime NATUREL ef38ba033f
Merge pull request #8169 from vector-im/dependabot/gradle/com.posthog.android-posthog-2.0.3
Bump com.posthog.android:posthog from 2.0.2 to 2.0.3
2023-02-24 09:12:57 +01:00
dependabot[bot] a331d907ce
Bump com.posthog.android:posthog from 2.0.2 to 2.0.3
Bumps [com.posthog.android:posthog](https://github.com/PostHog/posthog-android) from 2.0.2 to 2.0.3.
- [Release notes](https://github.com/PostHog/posthog-android/releases)
- [Changelog](https://github.com/PostHog/posthog-android/blob/master/CHANGELOG.md)
- [Commits](https://github.com/PostHog/posthog-android/compare/2.0.2...2.0.3)

---
updated-dependencies:
- dependency-name: com.posthog.android:posthog
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-23 23:58:26 +00:00
Maxime NATUREL 53d03335ab Remove unused import 2023-02-23 14:18:21 +01:00
Florian Renaud 6649297ea0 restore onSessionStarted method call 2023-02-23 14:01:49 +01:00
Maxime NATUREL 2bd0126523 Extracting logic to compute the badge state into a usecase 2023-02-23 13:59:32 +01:00
SpiritCroc 476f60bd04 [merge] Fix initial send button color
Change-Id: I0361ab015bb4f8e1a31c92dcdbc2dec7cc52fb31
2023-02-23 12:18:45 +01:00
SpiritCroc 38c8e30541 Merge tag 'v1.5.26' into sc
Change-Id: Ie54ce4c15b4b95f7ecb4419f421762d7c57c5c2d

Conflicts:
	dependencies.gradle
	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/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/res/drawable/ic_composer_rich_text_editor_close.xml
	vector/src/main/res/drawable/ic_composer_rich_text_editor_edit.xml
	vector/src/main/res/drawable/ic_rich_composer_add.xml
	vector/src/main/res/drawable/ic_rich_composer_send.xml
2023-02-23 11:55:21 +01:00
SpiritCroc 702142f62f Revert "Revert "stop listening timeline collection changes when app is not resumed (#7734)""
Upstream fix incoming

This reverts commit 987ca6dec4.

Change-Id: I3cec506b84cf1e469133df5276640d099e3c33de
2023-02-23 11:29:12 +01:00
Maxime NATUREL f782a31592 Fix unit tests 2023-02-23 10:15:34 +01:00
Florian Renaud cd648a0b50 Fix unit tests 2023-02-23 09:24:14 +01:00
Florian Renaud 13866c62bf Refresh push rules settings on account data changes 2023-02-23 09:24:14 +01:00
Florian Renaud 8f56f9de46 update doc 2023-02-23 09:24:14 +01:00
Florian Renaud 84ccd30ab7 Fix wrong import 2023-02-23 09:24:13 +01:00
Florian Renaud 0d28b3a860 Handle errors when updating push rules 2023-02-23 09:24:13 +01:00
Maxime NATUREL 8861b36aba Make the setting visible when using old app layout 2023-02-22 16:09:37 +01:00
Maxime NATUREL af4ab41851 Highlight the badge when there is pending space invite 2023-02-22 15:04:14 +01:00
Maxime NATUREL 18c7f0d894 Remove unused import 2023-02-22 14:39:44 +01:00
Maxime NATUREL b78da9824d Adding unit tests for NewHomeDetailViewModel 2023-02-22 14:38:35 +01:00
Maxime NATUREL e8c95551c1 Adding unit tests for GetNotificationCountForSpacesUseCase 2023-02-22 14:19:21 +01:00
Maxime NATUREL a509da54e8 Adding unit tests for GetSpacesUseCase 2023-02-22 11:58:26 +01:00
Maxime NATUREL c74cdb9540 Observe the spaces invites 2023-02-22 10:44:55 +01:00
dependabot[bot] e9a2cf4834
Bump com.posthog.android:posthog from 2.0.1 to 2.0.2 (#8155)
Bumps [com.posthog.android:posthog](https://github.com/PostHog/posthog-android) from 2.0.1 to 2.0.2.
- [Release notes](https://github.com/PostHog/posthog-android/releases)
- [Changelog](https://github.com/PostHog/posthog-android/blob/master/CHANGELOG.md)
- [Commits](https://github.com/PostHog/posthog-android/compare/2.0.1...2.0.2)

---
updated-dependencies:
- dependency-name: com.posthog.android:posthog
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-22 08:44:53 +01:00
Maxime NATUREL c36869cd03 Adding knowledge of pending space invites 2023-02-21 17:57:23 +01:00
Maxime NATUREL 0e8a2254f8 Listen for spaces notification count to refresh the badge 2023-02-21 17:44:31 +01:00
Maxime NATUREL b1b35599b0 Use case to compute the notification counter for spaces 2023-02-21 16:28:30 +01:00
Maxime NATUREL 597081e9a8 Adding unread counter badge view 2023-02-21 15:22:08 +01:00
ganfra 84cb6e74f2 Fix always jumps to the bottom of the timeline #8090 2023-02-21 11:47:09 +01:00
Maxime NATUREL 6bd150d4cd
Merge pull request #8144 from vector-im/feature/mna/user-location-in-loc-sharing
[Location sharing] Show own location in map views
2023-02-20 16:34:37 +01:00
Maxime NATUREL a0bab98af9 Use dispatcher provider instead of hardcoded dispatcher 2023-02-20 10:22:10 +01:00
Maxime NATUREL 27046ed1a6 Fixing code style issue 2023-02-20 09:23:09 +01:00
SpiritCroc 9521814f32 Support webp rendering in the timeline
Change-Id: I701cc96bdc466e1de961222e30d25289a159557e
2023-02-19 10:10:42 +01:00
Maxime NATUREL aa805dceca Mutualizing some code 2023-02-17 17:15:56 +01:00
Maxime NATUREL df2c3e7c07 Check if location tracking is started before starting it 2023-02-17 17:02:05 +01:00
Maxime NATUREL 25ca598414 Adding some unit tests 2023-02-17 16:41:03 +01:00
Benoit Marty 386814eac4
Merge pull request #8142 from vector-im/yostyle/fix_sendbutton_color
Remove hardcoded color on send button
2023-02-17 15:53:11 +01:00
Maxime NATUREL b5af6f5a0f Render user location pin on the live location sharing map preview 2023-02-17 15:31:30 +01:00
Maxime NATUREL de50577ac3
Merge pull request #8136 from vector-im/fix/mna/poll-end-while-no-poll-start
[Poll] Improve rendering of poll end message when poll start event isn't available (PSG-1157)
2023-02-17 13:51:50 +01:00
Florian Renaud 7d16c86f37
Merge pull request #8130 from vector-im/feature/fre/poll_sync_push_rules_after_creation
[Poll] Synchronize polls and message push rules after creation (PSG-1137)
2023-02-17 13:46:13 +01:00
Florian Renaud 8bf46b136a Fix broken test 2023-02-17 12:12:55 +01:00
yostyle 835e1f5a4b Remove hardcoded color on send button 2023-02-17 11:17:49 +01:00
Florian Renaud dcd43d6e7f Move push rule ids extensions to vector module 2023-02-17 10:14:33 +01:00
Florian Renaud f887acd854
Merge pull request #8114 from vector-im/feature/fre/poll_new_push_rules
[Poll] Synchronize polls push rules with message push rules (PSG-954)
2023-02-17 10:03:53 +01:00
SpiritCroc 3b25e212b3 Use an actual background color for voice message broadcasts
Change-Id: If6339b8fd9112273d226b4545af62e23b285cb04
2023-02-17 09:35:16 +01:00
SpiritCroc 3333ca8f0c Fix crash of voice broadcast in sc bubble layout
Change-Id: I98561fc79acec42168afd7145fa1df3a5dc2e59c
2023-02-17 09:32:28 +01:00
Maxime NATUREL f676a65544 Show locate button only when current user is not sharing live location 2023-02-16 17:51:54 +01:00
Maxime NATUREL 8eff831382 Adding locate button view on the map for live location preview 2023-02-16 17:34:47 +01:00
Maxime NATUREL 81cb0d40c6 Updating the pin for user location 2023-02-16 16:47:02 +01:00
Maxime NATUREL a4211d8482 Rendering the user location pin 2023-02-16 16:12:28 +01:00
Maxime NATUREL d23636900f Adding button to get user current location in static location sharing preview 2023-02-16 15:32:02 +01:00
Maxime NATUREL e8f37dc916 Special rendering for poll end event when poll start is not available 2023-02-15 10:36:02 +01:00
Florian Renaud 5bb78c995e Add unit test for UpdatePushRulesIfNeededUseCaseTest 2023-02-14 17:56:30 +01:00
Florian Renaud 1f4c098d8b Synchronize polls and message push rules after creation 2023-02-14 17:56:30 +01:00
Florian Renaud 0a0ad2d91e Add todo 2023-02-14 17:54:27 +01:00
Florian Renaud 2cb1ea95dc Allow notifications for poll end event 2023-02-14 17:52:23 +01:00
Florian Renaud 6aa4eb5e04 Fix lint issues 2023-02-14 17:52:23 +01:00
Florian Renaud 25d49806cc Improve view events and add unit tests 2023-02-14 17:52:22 +01:00
Florian Renaud 71455706cb Sync poll rules with messages rule 2023-02-14 17:52:22 +01:00
Florian Renaud 1c47983a99 Rename notification settings objects 2023-02-14 17:52:22 +01:00
Florian Renaud 40119733b9 Add ViewModel for push rules settings fragment 2023-02-14 17:52:22 +01:00
Maxime NATUREL 552af673ff
Merge pull request #8069 from vector-im/feature/mna/poll-history-details
[Poll] History list: details screen of a poll (PSG-1041, PSG-1151)
2023-02-13 17:47:54 +01:00
SpiritCroc c35224f538 Debugging: Only show read receipt thread when showing duplicate receipts
The new pref is better suitable for controling visibility here.

Change-Id: I76cff0282bd2ac562dc5f0ed0ca51f629c63360e
2023-02-11 14:35:09 +01:00
SpiritCroc 98b98c069d [merge] Fix room summary preview mismerge
Change-Id: I7a1511fc0c6adc1a98cea4a0517835efae83e069
2023-02-11 08:36:41 +01:00
SpiritCroc 6a2f318c1d [merge] Fix removing reply fallbacks before rendering
Change-Id: Id3427fdcdd5be1715ca31bfe1764544a4f08d80d
2023-02-11 08:33:05 +01:00
SpiritCroc a48ce4b18c [TESTING] Fight duplicate read markers in main timeline, pt.2
- Make my read-marker experiments backwards-compatible, by introducing a
  new artificial marker
- Fix sometimes the marker going missing, by not deduplicating read
  markers, then filtering out the other one because duplicates didn't
  respect the thread id
Needs an initial sync to fully apply.

Change-Id: Id02ae19d03077016cbeb8d9a8fd5130d77931b2d
2023-02-10 16:04:26 +01:00
Florian Renaud 1f5df94c37 Reorganize notification packages 2023-02-10 15:54:38 +01:00
SpiritCroc 254393152d [merge] Fix build and get footered rich editor styled textView to work
Change-Id: I75876d563760caec76673372ff560cbd17577f45
2023-02-10 12:07:42 +01:00
Hugh Nimmo-Smith 10a1ea033b Merge branch 'develop' into hughns/msc3824-oidc-aware 2023-02-09 09:53:26 +00:00
SpiritCroc 8c2b9ec6f4 [merge,WIP] interface'd FooteredTextView
Change-Id: I62f09fff7d094ebb3bf6690b17c951e4e48e80c7
2023-02-09 09:30:23 +01:00
dependabot[bot] 35b7860ec2
Bump androidx.browser:browser from 1.4.0 to 1.5.0
Bumps androidx.browser:browser from 1.4.0 to 1.5.0.

---
updated-dependencies:
- dependency-name: androidx.browser:browser
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-08 23:03:07 +00:00
jonnyandrew d922126f4b
[Rich text editor] Add code block, quote and list indentation actions (#8045)
* Add remaining rich text editor actions

* Render code blocks in the timeline

* Hide indentation buttons when not in a list
2023-02-08 17:47:22 +00:00
SpiritCroc 51274af2fe Merge tag 'v1.5.24' into sc
Change-Id: I3eda119f38061c31595d9087f6067b269b87d8d1

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
2023-02-08 13:08:42 +01:00
Benoit Marty f8283e44ba
Merge pull request #8087 from ByeongsuPark/feature/bspark/bugfix-7928-next-button-disabled
Fix the next button disable issue after visiting homeserver screen
2023-02-07 18:19:13 +01:00
Benoit Marty 0971a28532
Merge pull request #8057 from vector-im/yostyle/vb_utd
Let the user know when we are not able to decrypt the voice broadcast…
2023-02-07 18:16:34 +01:00
Benoit Marty 4226296990 Get Event from cache without using a `Room` 2023-02-07 14:52:12 +01:00
ByeongsuPark 6e44f52c4a Fix the next button disable issue after visiting homeserver screen
Signed-off-by: byeongsu@soongsil.ac.kr <byeongsu@soongsil.ac.kr>
2023-02-07 22:45:59 +09:00
Benoit Marty 5b5cbf52b2
Merge pull request #7971 from vector-im/dependabot/gradle/paparazzi-1.2.0
Bump paparazzi from 1.1.0 to 1.2.0
2023-02-07 14:35:21 +01:00
Benoit Marty ba7ee68b24
Merge pull request #8032 from vector-im/jmartinesp/fix/rte-cant-select-text-in-plain-text-mode
Fix: cannot select text in plain text mode in Rich Text Editor
2023-02-07 14:33:11 +01:00
Benoit Marty 4ba84ddc82
Merge pull request #8064 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-reflect-1.8.10
Bump org.jetbrains.kotlin:kotlin-reflect from 1.8.0 to 1.8.10
2023-02-07 14:30:50 +01:00
valere 6064cfd5c1 Fix tests 2023-02-07 12:58:31 +01:00
Benoit Marty fa47c4b87e Ensure storage is computed in background, to not block display of general settings. 2023-02-07 12:34:58 +01:00
valere a70e3c2533 Merge branch 'develop' into feature/bca/rust_flavor 2023-02-07 11:36:11 +01:00
Florian Renaud 86ec975f99 Remove outdated todo 2023-02-07 10:39:47 +01:00
SpiritCroc cd9a3b9be2 [TEST] Fight duplicate read markers in main timeline
Let synced null and main markers both update the main marker.
Looks like desktop does the same:
7158a99a1c/src/sync-accumulator.ts (L459-L460)

Change-Id: Ic4bf8b4d947fdd9882a3da053ac2b93747f1f20a
2023-02-07 09:30:27 +01:00
valere 6edde6a6b9 Ensure secureBackupRequired is enforced 2023-02-07 09:27:18 +01:00
Florian Renaud cdb350c104 Add unit tests for GetTimelineEventUseCase 2023-02-07 09:22:54 +01:00
Florian Renaud 1215a1a319 Add unit tests for VoteToPollUseCase 2023-02-07 09:22:41 +01:00
Florian Renaud 48641769d9
Merge pull request #6457 from deepbluev7/nico/fix-at-room
Implement the current spec for event match conditions
2023-02-06 14:33:33 +01:00
Florian Renaud fb4cceb476
Merge pull request #8058 from vector-im/misc/fre/count_up_timer
Improve CountUpTimer ticks precision
2023-02-06 12:15:12 +01:00
valere 8b28e7ba54 quick cleaning 2023-02-06 11:44:39 +01:00
Florian Renaud 43ecb63b17 Remove trailing space 2023-02-06 11:27:16 +01:00
Florian Renaud 912c37e3ff Reset elapsed time on stop action and add a start method to the CountUpTimer 2023-02-06 10:36:40 +01:00
valere b48e6f5d71 Merge branch 'develop' into feature/bca/rust_flavor 2023-02-06 10:29:00 +01:00
Florian Renaud e1086669c7 Merge remote-tracking branch 'origin/develop' into fix-at-room 2023-02-06 09:36:00 +01:00
valere c0fb4e88cd quality 2023-02-06 09:24:56 +01:00
SpiritCroc 3cff12c9b1 Fix Schildi variants causing unnecessary long verification text
Change-Id: I03dcf865f7f3db7cd40ab3a79cea7b7200f47a1a
2023-02-04 14:44:28 +01:00
Benoit Marty b7f5fdd32f
Merge pull request #8065 from vector-im/dependabot/gradle/org.checkerframework-checker-3.30.0
Bump org.checkerframework:checker from 3.29.0 to 3.30.0
2023-02-03 18:07:42 +01:00
Maxime NATUREL b12908476d Adding runCatching in VoteToPollUseCase 2023-02-03 18:01:56 +01:00
Maxime NATUREL 0a2b1f8ad1 Adding unit tests for RoomPollDetailMapper 2023-02-03 18:01:09 +01:00
Maxime NATUREL 055ed35fa6 Reducing line count by removing some line breaks 2023-02-03 17:30:00 +01:00
Maxime NATUREL a55698c5f4 Adding unit tests for RoomPollDetailViewModel 2023-02-03 17:27:16 +01:00
Maxime NATUREL 9584eb496a Adding unit tests for GetEndedPollEventIdUseCase 2023-02-03 12:02:56 +01:00
yostyle 14d742d504 Not start broadcasting if there is already a live broadcast in the room 2023-02-03 11:59:37 +01:00
valere e53fbaa11d Fix false positive empty roomlist 2023-02-03 11:50:17 +01:00
Maxime NATUREL beecd8366b Adding unit tests for ViewNavigators 2023-02-03 11:39:01 +01:00
valere 6f859c9ca6 Fix disable MSC3061 lab for rust crypto 2023-02-03 10:59:47 +01:00
Maxime NATUREL b75787a4f4 Adding creation date field 2023-02-03 10:31:36 +01:00
Maxime NATUREL 2ee079fe79 Remove unused import 2023-02-03 09:55:43 +01:00
Maxime NATUREL ba81b39baf Revert some changes in test package 2023-02-03 09:37:00 +01:00
valere 704e14c6a4 Fix QR code signaling 2023-02-03 00:10:05 +01:00
dependabot[bot] cfd598b3dd
Bump org.checkerframework:checker from 3.29.0 to 3.30.0
Bumps [org.checkerframework:checker](https://github.com/typetools/checker-framework) from 3.29.0 to 3.30.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.29.0...checker-framework-3.30.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>
2023-02-02 23:04:17 +00:00
dependabot[bot] a8be83917a
Bump org.jetbrains.kotlin:kotlin-reflect from 1.8.0 to 1.8.10
Bumps [org.jetbrains.kotlin:kotlin-reflect](https://github.com/JetBrains/kotlin) from 1.8.0 to 1.8.10.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.8.10/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.0...v1.8.10)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-02 23:03:38 +00:00
Maxime NATUREL 416f013c05 Updating existing unit tests 2023-02-02 17:55:55 +01:00
Maxime NATUREL fb5fe9bc1d Enable the poll history in release mode 2023-02-02 17:55:55 +01:00
Maxime NATUREL d84eca6a9a Removing unused ViewEvent class 2023-02-02 17:55:55 +01:00
Maxime NATUREL 384e7f674d Adding go to timeline event button 2023-02-02 17:55:55 +01:00
Maxime NATUREL eaa9cc740e Make the title set at the creation of the screen 2023-02-02 17:55:55 +01:00
Maxime NATUREL f855a36022 Adding vote action from details screen 2023-02-02 17:55:55 +01:00
Maxime NATUREL 922b8092ac Render only winner options in past poll list 2023-02-02 17:55:55 +01:00
Maxime NATUREL d3df58c607 Render the details of the poll 2023-02-02 17:55:54 +01:00
Maxime NATUREL afe036dd9d Observe timeline event of the selected poll 2023-02-02 17:55:54 +01:00
Maxime NATUREL 60d3ae6cc5 Removing new added fields in PollSummary 2023-02-02 17:55:54 +01:00
Maxime NATUREL 753875ba0c Creating subpackage ui 2023-02-02 17:55:54 +01:00
Maxime NATUREL 2ce15a1923 Set empty toolbar by default 2023-02-02 17:55:54 +01:00
Maxime NATUREL fb44562824 Using navigator and new activity for the new screen 2023-02-02 17:55:54 +01:00
Onuray Sahin 429a71964d Create separate view model for poll detail. 2023-02-02 17:55:54 +01:00
Onuray Sahin 9d43846b9b Implement new view state. 2023-02-02 17:55:54 +01:00
Onuray Sahin ec4226b5d3 Render poll detail. 2023-02-02 17:55:54 +01:00
Onuray Sahin b86f6a41bd Open poll detail screen. 2023-02-02 17:55:54 +01:00
Onuray Sahin c9dc570f83 Navigate to poll detail fragment. 2023-02-02 17:55:54 +01:00
Onuray Sahin 783596723e Implement poll detail layout. 2023-02-02 17:55:54 +01:00
valere d4fdf7ea80 strict mode report 2023-02-02 16:24:14 +01:00
yostyle e7f3cf6d57 Fix PR comments 2023-02-02 11:28:20 +01:00
yostyle 369c0f166d Let the user know when we are not able to decrypt the voice broadcast chunks 2023-02-01 17:28:42 +01:00
Maxime NATUREL ebd35bdd88
Merge pull request #7969 from vector-im/feature/ons/fix_poll_end_reply
Show poll question when rendering reply to a poll end event (PSG-1133)
2023-02-01 11:22:39 +01:00
Maxime NATUREL 48393ee5d1 Fixing some previews for end poll events 2023-02-01 10:17:38 +01:00
Maxime NATUREL 7683b8325c Updating unit tests 2023-02-01 09:40:56 +01:00
Maxime NATUREL 58201851ad Avoid nested when in ProcessBodyOfReplyToEventUseCase 2023-01-31 17:37:47 +01:00
Florian Renaud 9a31aa3b91 Move clock to core-utils module 2023-01-31 16:45:48 +01:00
Maxime NATUREL 9f4c595d9d
Merge pull request #8039 from vector-im/dependabot/gradle/com.posthog.android-posthog-2.0.1
Bump com.posthog.android:posthog from 2.0.0 to 2.0.1
2023-01-31 15:56:37 +01:00
valere b10a27d4dd Fix concat adapter stable Ids 2023-01-31 14:57:33 +01:00
valere 98f1c6d87f Fix unverified popup for own device
See issue on rust sdk for not having own device has locally trusted
2023-01-31 14:57:16 +01:00
Florian Renaud bb8ebb73bf
Merge pull request #8042 from vector-im/bugfix/fre/vb_move_last_message_behind_labs
[Voice Broadcast] Move the live broadcast computation in the room list behind the lab flag
2023-01-31 11:51:14 +01:00
Florian Renaud ca37cc5cd3
Merge pull request #8012 from vector-im/bugfix/fre/fix_vb_scrubbing
[Voice Broadcast] Use internal playback timer to compute the playback position
2023-01-31 11:19:43 +01:00
Florian Renaud 2152c1d7ba Do not compute live broadcast on last message if the feature is disabled in the lab 2023-01-31 11:02:00 +01:00
Florian Renaud f74c7fa997 Handle the potential offset on the chunk position used by the media player 2023-01-31 10:14:28 +01:00
dependabot[bot] af26b10ee2
Bump com.posthog.android:posthog from 2.0.0 to 2.0.1
Bumps [com.posthog.android:posthog](https://github.com/PostHog/posthog-android) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/PostHog/posthog-android/releases)
- [Changelog](https://github.com/PostHog/posthog-android/blob/master/CHANGELOG.md)
- [Commits](https://github.com/PostHog/posthog-android/compare/2.0.0...2.0.1)

---
updated-dependencies:
- dependency-name: com.posthog.android:posthog
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-30 23:13:55 +00:00
jonnyandrew 00f9c362da
[Rich text editor] Add inline code to rich text editor (#8011)
Also:
- Fixes https://github.com/vector-im/element-android/issues/7975
- See https://github.com/noties/Markwon/issues/423
2023-01-30 17:35:29 +00:00
Benoit Marty 156f4f71f9
Merge pull request #8031 from vector-im/feature/bma/fixPosthog
Do not send any request to Posthog if no consent is provided.
2023-01-30 17:11:30 +01:00
Florian Renaud 66e8b5bf7a Remove useless Flow observation 2023-01-30 17:04:27 +01:00
valere 4dee5d2366 Merge branch 'develop' into feature/bca/rust_flavor 2023-01-30 16:46:54 +01:00
Florian Renaud a0ab6de85a Do not enter in error state in case of cancellation exception 2023-01-30 15:21:47 +01:00
Florian Renaud 3ce757ee4b Remove useless code since CountUpTimer notify on pause and stop 2023-01-30 14:26:34 +01:00
Benoit Marty 307ac4060e Posthog: fix test. User consent must be provided to touch Posthog API. 2023-01-30 14:17:16 +01:00
Benoit Marty c8277e2d43 Posthog: flush queue before optin out. 2023-01-30 12:22:31 +01:00
Jorge Martín d5bd05d0bb Fix: cannot select text in plain text mode in Rich Text Editor 2023-01-30 12:13:09 +01:00