filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,934 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

14571 Commits

Author SHA1 Message Date
SpiritCroc acf7d374b9 Render MSC2530 captions in notifications 
Change-Id: I0de1c61ded81fe6fc8ef79ec6effc42aca693dc6
 2023-05-03 20:20:05 +02:00
Benoit Marty aaa6e7255c
Merge pull request #8385 from vector-im/dependabot/gradle/org.checkerframework-checker-3.34.0 
Bump org.checkerframework:checker from 3.33.0 to 3.34.0
 2023-05-03 14:18:35 +02:00
Valere 92c37f3bb2
Merge pull request #8364 from vector-im/feature/bca/expose_rust_crate_version 
Expose rust version in settings and RS
 2023-05-03 12:50:37 +02:00
Benoit Marty 6c80a38c4a
Merge pull request #8383 from vector-im/feature/bma/jitsi8 
Upgrade jitsi to version 8.1.1
 2023-05-03 09:27:55 +02:00
dependabot[bot] 492115d702
Bump org.checkerframework:checker from 3.33.0 to 3.34.0 
Bumps [org.checkerframework:checker](https://github.com/typetools/checker-framework) from 3.33.0 to 3.34.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.33.0...checker-framework-3.34.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-05-02 23:58:54 +00:00
Yoan Pintas 9347de3fad
Improve message rendering when editing (#8377) 2023-05-02 13:28:31 +00:00
Yoan Pintas 8ca0381e9b
Add an audio alert when the voice broadcast recording is automatically paused (#8382) 2023-05-02 13:27:43 +00:00
Benoit Marty e34958b814 Jitsi 8.1.1 is now API 24+ 2023-05-02 14:38:40 +02:00
Benoit Marty 48f4ad412f Jitsi 8.1.1 2023-05-02 14:38:40 +02:00
SpiritCroc de1cd864cf Make autocompletion a bit more compact 
- Less standard emojis shown by default
- Smaller section titles

Change-Id: Ia79d7370253108a7866628013d8c4f89ba8327a3
 2023-05-02 13:18:33 +02:00
SpiritCroc 0faa712f23 Fix possible emoji-autocompletion crash 
Thread: main, Exception: java.lang.ClassCastException: im.vector.app.features.autocomplete.AutocompleteHeaderItem$Holder cannot be cast to im.vector.app.features.autocomplete.emoji.AutocompleteEmojiItem$Holder
at im.vector.app.features.autocomplete.emoji.AutocompleteEmojiItem_.handlePreBind(AutocompleteEmojiItem_.java:1)
at com.airbnb.epoxy.BaseEpoxyAdapter.onBindViewHolder(BaseEpoxyAdapter.java:22)
at com.airbnb.epoxy.BaseEpoxyAdapter.onBindViewHolder(BaseEpoxyAdapter.java:3)
at androidx.recyclerview.widget.RecyclerView$Adapter.bindViewHolder(RecyclerView.java:43)
at androidx.recyclerview.widget.RecyclerView$Recycler.tryBindViewHolderByDeadline(RecyclerView.java:59)
at androidx.recyclerview.widget.RecyclerView$Recycler.tryGetViewHolderForPositionByDeadline(RecyclerView.java:974)
at androidx.recyclerview.widget.RecyclerView$Recycler.getViewForPosition(RecyclerView.java:6)
at androidx.recyclerview.widget.LinearLayoutManager$LayoutState.next(LinearLayoutManager.java:54)
at androidx.recyclerview.widget.LinearLayoutManager.layoutChunk(LinearLayoutManager.java:1)
at androidx.recyclerview.widget.LinearLayoutManager.fill(LinearLayoutManager.java:54)
at androidx.recyclerview.widget.LinearLayoutManager.onLayoutChildren(LinearLayoutManager.java:400)
at androidx.recyclerview.widget.RecyclerView.dispatchLayoutStep2(RecyclerView.java:67)
at androidx.recyclerview.widget.RecyclerView.dispatchLayout(RecyclerView.java:135)
at androidx.recyclerview.widget.RecyclerView.onLayout(RecyclerView.java:8)

Change-Id: I4d4919c35babea2606a06b3e99b5c3b3ce08e95d
 2023-05-02 13:18:20 +02:00
jonnyandrew e37fe1f8f5
Allow custom push gateway to use non-default port (#8376) 2023-05-02 10:05:15 +00:00
SpiritCroc aa34c108b5 Labs: setting to clear highlighted message on scroll 
Change-Id: If07012f29159bb10cbd90f410955b49684891945
 2023-04-25 14:15:47 +02:00
valere 3705e14851 Expose rust version in settings and RS 2023-04-25 13:31:15 +02:00
SpiritCroc 0cc0a191bc Merge remote-tracking branch 'CicadaCinema/fallback-turn-server' into sc 
Change-Id: I07acecb8587ee3bdf6b2eef1e130ffd578739416

Conflicts:
	vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
	vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/res/xml/vector_settings_voice_video.xml
 2023-04-24 12:02:18 +02:00
SpiritCroc 9435780036 Fix long freeform reactions moving out sender from reaction info 
Change-Id: Ic41b17546f6f0f52a6dfdb800788560788ec1d37
 2023-04-23 10:59:16 +02:00
valere 1cc3f194e4 rust/native analytics E2E errors 2023-04-20 16:58:04 +02:00
SpiritCroc b88a41aaa8 Fix (upstream) crash for protected access settings 
java.lang.IllegalStateException: Can't access the Fragment View's LifecycleOwner when getView() is null i.e., before onCreateView() or after onDestroyView()
	at androidx.fragment.app.Fragment.getViewLifecycleOwner(Fragment.java:10)
	at im.vector.app.features.settings.VectorSettingsPinFragment.refreshPinCodeStatus(VectorSettingsPinFragment.kt:1)
	at im.vector.app.features.settings.VectorSettingsPinFragment.bindPref(VectorSettingsPinFragment.kt:1)
	at im.vector.app.features.settings.VectorSettingsBaseFragment.onCreatePreferences(VectorSettingsBaseFragment.kt:8)
	at androidx.preference.PreferenceFragmentCompat.onCreate(PreferenceFragmentCompat.java:74)
	at androidx.fragment.app.Fragment.performCreate(Fragment.java:22)
	at androidx.fragment.app.FragmentStateManager.create(FragmentStateManager.java:52)
	at androidx.fragment.app.FragmentStateManager.moveToExpectedState(FragmentStateManager.java:149)
	at androidx.fragment.app.FragmentManager.executeOpsTogether(FragmentManager.java:1135)
	at androidx.fragment.app.FragmentManager.removeRedundantOperationsAndExecute(FragmentManager.java:82)
	at androidx.fragment.app.FragmentManager.execPendingActions(FragmentManager.java:74)
	at androidx.fragment.app.FragmentManager$5.run(FragmentManager.java:4)
	at android.os.Handler.handleCallback(Handler.java:938)
	at android.os.Handler.dispatchMessage(Handler.java:99)
	at android.os.Looper.loop(Looper.java:236)
	at android.app.ActivityThread.main(ActivityThread.java:7876)
	at java.lang.reflect.Method.invoke(Native Method)
	at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:656)
	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:967)

Change-Id: Iac3e08d95338417f69ee71ce0b185b825b9b0333
 2023-04-20 11:19:12 +02:00
SpiritCroc acdf419768 Merge tag 'v1.5.32' into sc 
Note: mainly conflicts in differing implementations to fix duplicate
read receipts.

After a quick glance at the upstream implementation, my first impression
is that we likely want to keep our downstream implementation:
- Better performance by checking for the more recent receipt in the SDK
  upon receipt receival, instead on rendering the timeline
- null seems to always map to main, which caused us jumping receipts in
  the past, which we have addressed by now

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.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/timeline/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/html/PillsPostProcessor.kt

Change-Id: I47ae2afe5fcbe77a4fec69374d83821b94a431de
 2023-04-20 10:53:09 +02:00
valere b2c7f05a10 Merge branch 'develop' into feature/bca/rust_flavor 2023-04-20 09:51:17 +02:00
SpiritCroc 799279eb5d Do not ellipsize message previews due to trailing newline 
Change-Id: I8e6a43f6599e209f40e676a8bdb1754fb6a6e93e
 2023-04-19 17:09:45 +02:00
ganfra 0143cf7ea8 Changelog for version 1.5.32 2023-04-19 16:15:35 +02:00
SpiritCroc f16a7edf51 Sticker room summary preview: prefer sticker body like on desktop 
Change-Id: If3dda509b1acddccf44b3e3267f098de3ee35611
 2023-04-15 10:42:04 +02:00
valere 0e503503d2 Merge branch 'develop' into feature/bca/rust_flavor 2023-04-13 15:49:20 +02:00
Tulir Asokan df9579d7d2 Sync Emojis 2023-04-12 21:44:03 +03:00
Yoan Pintas 110b5cfcb4
Add pills for permalink supported hosts (#8324) 2023-04-12 12:35:01 +00:00
Yoan Pintas fb837fed5a
Keep screen on while recording voicebroadcast (#8313) 2023-04-12 13:55:20 +02:00
Yoan Pintas 99aa9493d6
Update read marker when we go back in live (#8306) 2023-04-12 07:18:02 +00:00
networkException 7fff7a453d
Enable free style cropping for camera and gallery images 
This feature was disabled in 3ac2296464.

Resolves #2356

Signed-off-by: networkException <git@nwex.de>
 2023-04-11 22:47:04 +02:00
SpiritCroc 9e0ec534d5 [merge] More appropriate pill size for downstream text size 
https://developer.android.com/reference/com/google/android/material/chip/ChipDrawable

Change-Id: Ib21bb1426547c8a49f55e2ecd836f83d9dfe1654
 2023-04-11 17:27:21 +02:00
valere 4ecbf87cda unused flow 2023-04-07 14:09:25 +02:00
SpiritCroc 89750f74a4 Ensure unique IDs across all emoji autocompletion types 
Change-Id: I522eaf4fb8af214ff9b6a0ac744093cbe6b8b6e4
 2023-04-07 12:40:46 +02:00
SpiritCroc cb593ebb14 Move standard emojis to top of autocompletion 
Now that we can limit emojis per category while allowing to expand them,
makes sense to show standard emojis on top, above custom emotes,
especially when users have lots of emotes.

Change-Id: I822cc091bf595795fa08fef32f0737073a43163a
 2023-04-07 12:38:10 +02:00
valere 3e1b59d062 Merge branch 'develop' into feature/bca/rust_flavor 2023-04-06 08:53:20 +02:00
Florian Renaud 9490ddf53f
Merge pull request #8301 from vector-im/dependabot/gradle/org.checkerframework-checker-3.33.0 
Bump org.checkerframework:checker from 3.32.0 to 3.33.0
 2023-04-06 08:48:32 +02:00
Florian Renaud 90160a9681
Merge pull request #8304 from vector-im/dependabot/gradle/com.gabrielittner.threetenbp-lazythreetenbp-0.16.0 
Bump com.gabrielittner.threetenbp:lazythreetenbp from 0.14.0 to 0.16.0
 2023-04-05 18:01:58 +02:00
Benoit Marty 673c59b3f8
Merge pull request #8310 from vector-im/feature/fga/fix_multiple_read_receipts 
Fix multiple read receipts for the same user in timeline #7882
 2023-04-05 17:56:11 +02:00
Benoit Marty ac65934454
Merge pull request #8298 from vector-im/sync-emojis 
Sync Emojis
 2023-04-05 17:55:38 +02:00
SpiritCroc 5ea7f03e25 Fix FooteredTextView measurements for overlong pill spans 
Together with https://github.com/vector-im/element-android/pull/8260,
fixes https://github.com/SchildiChat/SchildiChat-android/issues/28

Change-Id: I3c11d1ec89383330fedb4a958d70e89047915024
 2023-04-05 15:03:28 +02:00
ganfra fe69d8e3fa Fix multiple read receipts for the same user in timeline #7882 2023-04-05 13:08:12 +02:00
valere b45b90dcdf Fix verification bottomsheet not updating 2023-04-05 12:12:40 +02:00
SpiritCroc 965ba93de4 Merge tag 'v1.5.30' into sc 
Version 1.5.30

Change-Id: I732e9fe05182e53968eab1d03f99dabdc148fed9

Conflicts:
	dependencies.gradle
	dependencies_groups.gradle
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt
	vector/src/main/res/drawable/ic_composer_rich_text_save.xml
 2023-04-05 11:28:26 +02:00
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
Yoan Pintas da5a3eaad8
Jump to unread marker instead of first unread message (#8305) 2023-04-04 12:50:49 +00:00
dependabot[bot] dcf0541fe0
Bump com.gabrielittner.threetenbp:lazythreetenbp from 0.14.0 to 0.16.0 
Bumps [com.gabrielittner.threetenbp:lazythreetenbp](https://github.com/gabrielittner/lazythreetenbp) from 0.14.0 to 0.16.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.14.0...0.16.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>
 2023-04-04 00:02:23 +00:00
dependabot[bot] 8480c41c3d
Bump org.checkerframework:checker from 3.32.0 to 3.33.0 
Bumps [org.checkerframework:checker](https://github.com/typetools/checker-framework) from 3.32.0 to 3.33.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.32.0...checker-framework-3.33.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-04-03 23:58:28 +00:00
Jorge Martín 2830459b6a Fix crash when re-enabling analytics. 2023-04-03 11:30:14 +02:00
bmarty acf92908cc Sync Emojis 2023-04-03 00:03:19 +00: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
ganfra ac65defe56 Replace Terms and Conditions with Acceptable Use Policy. 2023-03-30 20:41:05 +02:00
Yoan Pintas 93cd197c78
Fix custom sticker url loading (#8290) 2023-03-30 09:34:42 +00:00
Yoan Pintas ed121c051b
Add user completion for matrix ids (#8271) 2023-03-30 08:04:59 +00:00
valere 927f7757cd Merge branch 'develop' into feature/bca/rust_flavor 2023-03-28 17:17:35 +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
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