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

14779 Commits

Author SHA1 Message Date
Yoan Pintas 07e06957ef
Prompt the user when the invited MatrixId is not recognized (#8483) 2023-06-05 20:02:11 +00:00
SpiritCroc f440628208 Merge tag 'v1.6.2' into sc 
Change-Id: I7a9ebbae6df28044a8fa308fe34241dbd1d8b8ae

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
 2023-06-05 14:59:06 +02:00
dependabot[bot] 7f8a19f194
Bump org.checkerframework:checker from 3.34.0 to 3.35.0 (#8497) 2023-06-02 09:59:16 +00:00
Valere 2f1a7b76ad
Merge pull request #8485 from vector-im/feature/bca/fix_anrs 
Make cryptoDevice calls suspendable
 2023-06-01 16:36:29 +02:00
Benoit Marty f741c4e7d9
Merge pull request #8463 from vector-im/dla/feature/always_allow_signout 
Always allow users sign out
 2023-06-01 14:55:39 +02:00
valere 7e6376bf90 remove log 2023-05-31 15:14:28 +02:00
valere 8c1938987b Code review 2023-05-31 12:18:27 +02:00
valere dc969f502a ktlint 2023-05-31 10:55:56 +02:00
valere 2d335c1307 fix unit test 2023-05-31 10:42:46 +02:00
valere 268cbb83cd Make cryptoDevice calls suspendable 2023-05-30 23:47:50 +02:00
Alex Maras 24b18847b5
Fix animated webp playback (#8120) 
* fix: add webp as playable image type

* fix: make glide transformations optional to prevent rendering webp throwing exception

* fix: stop marking webp as playable by default

* fix: play animated Webp in attachment view

* feat: autoplay webp if autoplay is enabled

---------

Signed-off-by: Alex Maras <dev@alexmaras.com>
Co-authored-by: Jorge Martín <jorgem@element.io>
 2023-05-26 17:03:24 +02:00
Chris Smith 37429c277b Show correct details when a poll is ended. 
Previously, the "end poll" timeline item always showed the title
and options from the start event, regardless of whether any edits
had been made.

Now we show the latest edit, if available, falling back to the
original otherwise.
 2023-05-26 12:06:41 +01:00
SpiritCroc 9614f5994d Merge tag 'v1.6.1' into sc 
Change-Id: If1da0c145abfecd01df1384bedc794d2dd4d6bef

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
 2023-05-25 12:03:56 +02:00
Benoit Marty 997c9dd917 Ensure signout service is always use even if users want to ignore sigout error from the server. The SDK is doing more cleanup. 2023-05-25 10:38:08 +02:00
Benoit Marty cff9fbd008
Merge pull request #8439 from vector-im/yostyle/fix_crash_on_start_verification 
Allow stateloss on verification dialogfragment
 2023-05-25 09:36:40 +02:00
dependabot[bot] d5d5c9009b
Bump io.element.android:wysiwyg from 1.2.2 to 2.2.1 (#8464) 
* Bump io.element.android:wysiwyg from 1.2.2 to 2.2.1

Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 1.2.2 to 2.2.1.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/1.2.2...2.2.1)

---
updated-dependencies:
- dependency-name: io.element.android:wysiwyg
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

* Fix compilation

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: jonnyandrew <jonnya@element.io>
 2023-05-24 10:14:22 +00:00
Valere 6da05a3804
Merge pull request #8462 from vector-im/feature/bca/fix_8445 
Special text for re-verification after update
 2023-05-24 10:10:52 +02:00
Valere 9f3255dd78
Merge pull request #8458 from vector-im/feature/bca/remove_legacy_per_device_verif 
Remove legacy manually verify specific other device
 2023-05-24 01:09:29 +02:00
valere bb59a758cf code review 2023-05-24 00:06:36 +02:00
David Langley cee6ec5939 Always allow users sign out 
- Updates the dialog with a more helpful error message for the user, letting them know what happens if they logout without informing the homeserver.
 2023-05-23 16:51:26 +01:00
valere 27f9be5eda Special text for re-verification after update 2023-05-23 13:08:14 +02:00
valere 2ea6cdba6f Fix app non responsive 2023-05-23 08:30:58 +02:00
valere 517af968e6 Remove legacy manually verify specific other device 2023-05-22 22:26:26 +02:00
SpiritCroc d9c1ec588d Merge tag 'v1.6.0' into sc 
v1.6.0

Change-Id: Iaca4b437bc5a267c40b83a87a98eb7761dae345b

Conflicts:
	library/ui-styles/src/main/res/values/styles_app_bar_layout.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector-app/build.gradle
	vector/src/main/java/im/vector/app/core/di/ConfigurationModule.kt
	vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeController.kt
	vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt
	vector/src/main/res/layout/dialog_disclaimer_content.xml
	vector/src/main/res/xml/vector_settings_help_about.xml
 2023-05-22 14:19:46 +02:00
jonnyandrew 3157a35b74
Add autocomplete to plain text composer 2023-05-18 13:09:35 +01:00
jonnyandrew 29d8845792
Add slash commands to rich text editor 2023-05-18 13:09:34 +01:00
jonnyandrew 2d1dcd34c0
Add mentions to rich text editor 2023-05-18 13:09:26 +01:00
yostyle dadad3501b Allow stateloss on verification dialogfragment 2023-05-17 11:10:42 +02:00
SpiritCroc 1b8cef9678 Fix live location render crash for Android < 7 
Bring back proper implementation from 9ef870b927, probably gone due to mismerge?

Change-Id: I198488e57d9b800cee303373372b1fd165ddf7f1
 2023-05-16 14:41:36 +02:00
Valere c9ed3abc36
Merge pull request #8436 from vector-im/feature/bca/update_analytics 
Add sentry config for rust crypto
 2023-05-15 21:44:02 +02:00
Benoit Marty 7c3ecec92a
Merge pull request #8426 from vector-im/feature/bma/a11yFixes 
A11y fixes
 2023-05-15 16:28:35 +02:00
valere eba31a7216 Add sentry config for rust crypto 
update posthog url
 2023-05-15 11:29:49 +02:00
bmarty 1fdb31d4c6 Sync Emojis 2023-05-15 00:03:30 +00:00
Valere b2cde3f9d6
Merge pull request #8390 from vector-im/feature/bma/crypto_rust_default 
Rust Crypto SDK is now the default, and the build will replace the existing application
 2023-05-11 14:52:26 +02:00
Benoit Marty f9f341e0ed
Merge pull request #8410 from vector-im/feature/bma/fixCrashes 
Fix crashes
 2023-05-11 14:51:33 +02:00
valere b2a21f7cc8 Add user property for rust to help analytics 2023-05-11 10:48:51 +02:00
valere 1a1f6810e2 Fix missing implem 2023-05-11 10:48:28 +02:00
Benoit Marty 7a65a51ee1 Attempt to give accessibility focus to the first item of the RecyclerView when the recycler view is updated (screen change), to improve screen reader behavior. 2023-05-10 18:45:25 +02:00
Benoit Marty 20fedc87fe Remove dead code 2023-05-10 17:51:40 +02:00
Benoit Marty db76cd5899 Give accessibility focus to title of bottom sheet, which can be updated asynchronously. 2023-05-10 17:27:39 +02:00
Benoit Marty 6c942a7575 Give accessibility focus to the alerts. 2023-05-10 17:00:07 +02:00
Benoit Marty 71a2a4d31a a11y: add custom action to be able to close the alert. 2023-05-10 16:43:54 +02:00
Benoit Marty fe3a41e4e9 Improve accessibility for avatar of users, rooms and spaces. 2023-05-10 14:49:05 +02:00
Benoit Marty c8fbb88511 Let the focus go to the room list and the actions at the bottom, useful when navigating with the keyboard. 2023-05-10 13:39:18 +02:00
Yoan Pintas 36b1e9b5e4
Replace matrix ids by displayname in notice events (#8395) 2023-05-10 08:30:21 +00:00
Benoit Marty eb1d361066 Fix other wrong usage of `repeatOnLifecycle` 2023-05-09 14:03:08 +02:00
Benoit Marty 9569c34324 Do not repeat the recovery setup. 
Should fix issue reported at https://github.com/vector-im/element-android/pull/8165#issuecomment-1533212264
 2023-05-09 13:50:45 +02:00
Benoit Marty 8b7601029b Fix crash when entering to "Protect access" screen. 2023-05-09 13:46:49 +02:00
valere 257ca26a8e unused resources 2023-05-08 00:08:57 +02:00
Benoit Marty 622aa88f86 Remove LegacySessionImporter, and the dialog which explains that Riot is now Element. 2023-05-05 16:04:30 +02:00
dependabot[bot] 9fbf34f7e5
Bump org.jetbrains.kotlin:kotlin-reflect from 1.8.10 to 1.8.21 
Bumps [org.jetbrains.kotlin:kotlin-reflect](https://github.com/JetBrains/kotlin) from 1.8.10 to 1.8.21.
- [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.8.10...v1.8.21)

---
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-05-05 09:09:58 +00:00
Benoit Marty b5f1ecf9e0
Merge pull request #8325 from networkException/free-style-cropping 
Enable free style cropping for camera and gallery images
 2023-05-05 10:35:51 +02:00
Benoit Marty 09e1d4d97a
Merge pull request #8327 from tulir/emoji-variation-selectors 
Add variation selector 16 to all applicable emojis
 2023-05-05 10:28:30 +02:00
Benoit Marty 613dc3d7fa Fix crash when starting app with no available network. 2023-05-04 12:02:09 +02:00
Yoan Pintas f3faed0ffd
Update sound on vb network error (#8389) 2023-05-04 08:19:44 +00:00
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
Alexey Nechaev 28da02c583 Fixes #7758: Fixed JWT token for Jitsi openidtoken-jwt authentication 
Signed-off-by: Alexey Nechaev <seysane@yahoo.com>
 2023-04-22 19:31:24 +03: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
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