Commit graph

14784 commits

Author SHA1 Message Date
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