mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-18 07:11:58 +03:00
Code Issues Projects Releases Packages Wiki Activity
24194 commits 7 branches 122 tags 229 MiB
Commit graph

14398 commits

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