SpiritCroc
2756877d5b
Revert "[TMP] Get widgets / stickers working again"
...
This reverts commit c47b9ee64d
.
2023-04-05 11:15:39 +02:00
SpiritCroc
1e3b77824e
Fix crash caused by empty span when removing leading newlines
...
Change-Id: I9045bf1314b15d3672d1837bca29fa4af4c0fdbd
2023-04-05 10:25:10 +02:00
SpiritCroc
f4e9559eca
In threads, reply fallback shouldn't cause stickers to render as bubble
...
Change-Id: I9539c77520e2d1563c3e782d649c2868e08ad81a
2023-04-01 16:23:45 +02:00
SpiritCroc
5f787db4f1
Send-as-sticker button for sticker-enabled custom emotes
...
Add some primitive support for sending MSC2545 stickers, at least for
stickers that also support sending as custom emote.
Also, this introduces support to sending stickers as reply this way 🎉
Change-Id: I85b245c2c40b9662342459e50285c081d37f324b
2023-04-01 16:15:22 +02:00
SpiritCroc
1d0686d82d
Properly ellipsize autocompletion headers
...
For example for long emote/sticker pack names
Change-Id: I7f1bd44ad6b70dfdd25825b1156d40bcee2e3df8
2023-04-01 11:11:57 +02:00
SpiritCroc
cf7a93b5bb
Tweak bug report screen for internal builds
...
I always get confused by the missing switch, so just disable it instead
of hiding.
Change-Id: I894be7dd9d5e50e793960f16ee8b04df20effc41
2023-03-27 11:54:30 +02:00
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
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
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
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