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
SpiritCroc
8c2b9ec6f4
[merge,WIP] interface'd FooteredTextView
...
Change-Id: I62f09fff7d094ebb3bf6690b17c951e4e48e80c7
2023-02-09 09:30:23 +01: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
Benoit Marty
fa47c4b87e
Ensure storage is computed in background, to not block display of general settings.
2023-02-07 12:34:58 +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
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
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
Florian Renaud
e1086669c7
Merge remote-tracking branch 'origin/develop' into fix-at-room
2023-02-06 09:36:00 +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
yostyle
14d742d504
Not start broadcasting if there is already a live broadcast in the room
2023-02-03 11:59:37 +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
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
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
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
Florian Renaud
15c610f9ad
remove useless code
2023-01-30 12:11:32 +01:00
Florian Renaud
44266bcb67
Increase touch area of the seek bar
2023-01-30 11:17:06 +01:00
Florian Renaud
ff07cad645
Remove useless log
2023-01-30 11:03:11 +01:00
Florian Renaud
05ffadb0ef
Fix playback position on live broadcast
2023-01-30 11:03:11 +01:00
Florian Renaud
a06104534b
Voice Broadcast - use internal playback timer instead of relying on the media player position
2023-01-30 11:03:10 +01:00
Florian Renaud
af67705778
Add optional initial time parameter in CountUpTimer
2023-01-30 11:03:10 +01:00
Benoit Marty
5de386c3c9
Ensure we never call posthog.identify
if user did not consent, because it sends request <server>/decide/?v=2
to the analytic server.
2023-01-30 10:49:36 +01:00