Commit Graph

25 Commits

Author SHA1 Message Date
SpiritCroc befb402dbe Merge remote-tracking branch 'cintek/pin_messages' into sc
Fixes https://github.com/SchildiChat/SchildiChat-android/issues/202

@SpiritCroc edit:
- change some merge-unfriendly things, e.g.
    - indention
    - strings_sc.xml
    - don't touch what shouldn't be touched
- add icon license to third party
- add FEATURES.md entry

Conflicts:
	library/ui-strings/src/main/res/values/strings.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
	vector-config/src/main/res/values/config-settings.xml
	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/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt

Change-Id: I490e42d50276edce3e7b099a11dba90d040d0dc0
2023-08-02 19:41:24 +02:00
SpiritCroc 7e318f7d61 FEATURES.md: MSC4027-compatible
Change-Id: I9186f5fb3c095cd09b3602d334e302f16d67212f
2023-06-12 17:23:23 +02:00
SpiritCroc 62cb8c70d3 FEATURES.md: add MSC number for image reaction rendering
Change-Id: I2d1561aec1573f79a9fd151ee2aebd61e015e921
2023-05-09 14:32:53 +02:00
CicadaCinema d37eaa3f73
add back newline and credit myself for the newly added feature 2023-05-06 10:15:28 +01:00
CicadaCinema 23279ba3cd
document fallback TURN server feature 2023-04-29 13:57:57 +01:00
SpiritCroc 41c6fe5cb4 FEATURES.md: UnifiedPush has been included upstream for a while
Change-Id: Ib2ceabb38613925d1a99e33999657dd82e6764b5
2023-04-23 10:59:16 +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
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 80edce3d6c Escape @room in reply fallback to avoid unintentional pings
Closes https://github.com/SchildiChat/SchildiChat-android/issues/178

Change-Id: I8a545dd80d29802d1b35b0315fca89125c997f15
2023-03-09 10:54:03 +01:00
SpiritCroc 50a4983449 FEATURES.md: Add missed emote sending
Change-Id: I59891a20fc5d25b3cb11409bc1b06027c372f549
2022-12-27 08:39:36 +01:00
SpiritCroc 58dd1dedc9 Render MSC2530 captions
Change-Id: I10f875121e90102a0518d9bd39d87b3daa68ef2e
2022-11-10 14:00:26 +01:00
SpiritCroc bc1f3cb24d Merge tag 'v1.4.36' into merge-v1.4.36
Change-Id: I6fa1182a07b7b8ad507124fad3a8971ac38f2ac5

Conflicts:
	library/ui-strings/src/main/res/values-bg/strings_sc.xml
	library/ui-strings/src/main/res/values-cs/strings_sc.xml
	library/ui-strings/src/main/res/values-de/strings_sc.xml
	library/ui-strings/src/main/res/values-de/strings_sc_donottranslate.xml
	library/ui-strings/src/main/res/values-es/strings_sc.xml
	library/ui-strings/src/main/res/values-et/strings_sc.xml
	library/ui-strings/src/main/res/values-eu/strings_sc.xml
	library/ui-strings/src/main/res/values-fa/strings_sc.xml
	library/ui-strings/src/main/res/values-fr/strings_sc.xml
	library/ui-strings/src/main/res/values-hu/strings_sc.xml
	library/ui-strings/src/main/res/values-it/strings_sc.xml
	library/ui-strings/src/main/res/values-nb-rNO/strings_sc.xml
	library/ui-strings/src/main/res/values-nl/strings_sc.xml
	library/ui-strings/src/main/res/values-pl/strings_sc.xml
	library/ui-strings/src/main/res/values-pt-rBR/strings_sc.xml
	library/ui-strings/src/main/res/values-ro/strings_sc.xml
	library/ui-strings/src/main/res/values-ru/strings_sc.xml
	library/ui-strings/src/main/res/values-sk/strings_sc.xml
	library/ui-strings/src/main/res/values-sv/strings_sc.xml
	library/ui-strings/src/main/res/values-tr/strings_sc.xml
	library/ui-strings/src/main/res/values-vi/strings_sc.xml
	library/ui-strings/src/main/res/values-zh-rCN/strings_sc.xml
	library/ui-strings/src/main/res/values-zh-rTW/strings_sc.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
	vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher_sc.xml
	vector-app/src/main/res/mipmap-hdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-hdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-mdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-mdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xhdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_sc.png
	vector/build.gradle
	vector/src/fdroid/java/im/vector/app/fdroid/receiver/KeepInternalDistributor.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
	vector/src/main/java/im/vector/app/core/pushers/KeepInternalDistributor.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorPushHandler.kt
	vector/src/main/java/im/vector/app/core/receiver/KeepInternalDistributor.kt
	vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/grouplist/NewHomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.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/item/MessageImageVideoItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
	vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomItem.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt
	vector/src/main/res/xml/vector_settings_labs.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
2022-09-10 15:24:40 +02:00
SpiritCroc 77ca4c801d FEATURES.md: upstream reverted onlyAlertOnce behavior, but we have a setting
Change-Id: I81f98b9d34b9fac08dc05c758adbad028fb20484
2022-05-18 10:19:40 +02:00
SpiritCroc 9444642254 Allow sending freeform reactions
Change-Id: I1f2a6fb14cd16b22543c7bf1b4f0a3dc813ae7a7
2022-05-13 22:33:25 +02:00
SpiritCroc 42ac513da4 FEATURES.md: Synapse moved MSC2654 behind experimental flag
https: //github.com/matrix-org/synapse/commit/bebf994ee804ef63ce16801c6694713fcd685320
Change-Id: Icdb86a8d8ba24648723c126b1d9346a4622ffa66
2022-05-12 20:27:58 +02:00
SpiritCroc a96d27cb81 Floating date
Closes https://github.com/SchildiChat/SchildiChat-android/issues/41

Change-Id: I0eb9c6c3800309be40a1f5bc0c4420bd4066c098
2022-05-11 21:50:58 +02:00
SpiritCroc 85a26ae8be Render image reactions (MSC3746)
Some notes:
- Doesn't re-parse reactions already in the db to add the url field - so
  may need an initial sync for those.
- Since some clients don't really follow MSC3746, as in: they don't use
  the url field, but instead only write and check the key if it is an
  mxc-url, support those as well.
- Accordingly, initial sync is likely not required for those reactions
  I've seen in the wild so far, as it's common to use the mxc url also
  as key.

Change-Id: Ib1c50315425494986fa2e794d165658220a4f342
2022-05-11 21:50:49 +02:00
SpiritCroc 99053e8467 Support inline images in the timeline
Change-Id: I4af76058b400e9a0bf7c10e4ad98b7c7fb5015c1
2022-04-29 15:28:02 +02:00
SpiritCroc 3f0920cc23 Option to open chat without reading
Change-Id: I039bc78ef12975ebd384680f0c2634a8776e0398
2022-03-22 09:48:58 +01:00
SpiritCroc 31c01c98de Possibility to hide start call buttons from the toolbar
Change-Id: Ica35e0dfd6b82beb90754dd5997fa0d756d816a5
2022-03-15 20:20:21 +01:00
SpiritCroc 5bdb6a5dfd Setting whether chat notifications should repeatedly alert
Closes https://github.com/SchildiChat/SchildiChat-android/issues/111

Change-Id: I4c963caabdb10fa601799d3cb3fed2ad96d3d54c
2022-03-15 20:07:35 +01:00
SpiritCroc 03863a9585 Update FEATURES.md
Change-Id: I0d3678219babe3e53e4af296b564d9de29615904
2022-03-15 09:01:07 +01:00
SpiritCroc 783212961c Sticker picker: pass dark/light theme
Change-Id: I3c0152cab2d991c4439c10834a06b4c2753510e1
2021-01-19 19:46:30 +01:00
SpiritCroc be9eaca775 Minor FEATURES.md phrasing change
Change-Id: I2cd5b0fe9029a3dceaa00531b35e1e818e0ce71b
2021-01-19 11:04:11 +01:00
SpiritCroc 7d50a8e172 Add FEATURES.md
Closes https://github.com/SchildiChat/SchildiChat-android/issues/40.

Change-Id: I744b1a7d5cb39a747ae17744f9a258a628a2c878
2021-01-18 17:52:36 +01:00