mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-21 00:32:09 +03:00
Code Issues Projects Releases Packages Wiki Activity
16564 commits 7 branches 123 tags 230 MiB
Commit graph

16564 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
11194546a7 [TMP] Automatic upstream merge preparation 
Change-Id: I3d17203abc4c7c8b681ba3d23483f76d3b5c2caa
 2022-05-05 14:26:49 +02:00
SpiritCroc
2a87ebe3e8 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Iceff48cf6d67ca6e84bc04e9a5d94d81cb339932
 2022-05-05 14:26:49 +02:00
SpiritCroc
92fe0a5a29 Rageshake: re-enable can_contact switch 
Follow-ups may be useful for some kind of reports

Change-Id: Id2a42ce771f1ed355b896e5e8f8ad61e61670d8b
 2022-05-05 13:28:26 +02:00
SpiritCroc
3e2fdd0784 Inline images: use isMxcUrl() 
Change-Id: Ie85c5597e714b48dc5bcd3ac69abb5161b4fa640
 2022-05-05 13:28:12 +02:00
SpiritCroc
8158fff0f7 Still need to link empty chunks to glue everything together 
Change-Id: Ic037db94d044c7271fe2f016a58c153945b73615
 2022-05-04 08:03:15 +02:00
SpiritCroc
099bf5a016 Fix stuck timeline for new messages 
Change-Id: Id560898844438d88194a7211cac6d4db9853bceb
 2022-04-29 15:30:14 +02:00
SpiritCroc
afe9c47086 Do not link in pagination direction for events at start of chunk 
If we link chunks in pagination direction, and discard all events after
that, we assume that we reached a point in the chunk that is already
covered by a different chunk.
If we however haven't seen any new events in that chunk yet, chances are
this is the wrong direction we are linking. So in this case, better just
skip related events and continue processing later events - making sure
we don't lose new events and don't link in the wrong direction.

Note we could also enforce links into the opposite direction in this case.
Since in the cases I observed so far, such link already existed, so I
think this is probably not necessary.

Change-Id: Ia4d2fd87188b9757ed68416e883c3fb489cdfa6e
 2022-04-29 15:29:36 +02:00
SpiritCroc
bda09aa03f Do not delete events from the last forward chunk 
We get end up with missing messages by the combination of
- deleting the last forward chunk when receiving a new one
- not adding events to a chunk that are already found in another chunk

Accordingly, when using chunk tokens to load more messages, those
messages that were not added to a chunk due to a /sync chunk will get
lost. More thorough steps to reproduce:

- Receive e.g. 30 new messages while offline
- Use /sync in the room overview, this will fetch the latest 10 events
- Open a chat in the past before the latest unread messages
- Scroll down a little, in order to fill the message gap and load all
  unread messages
- Close the chat
- Receive another e.g. 60 messages while offline
- Re-open the chat at some time in the past, before the latest 70
  messages
  => messages from the old /sync chunk will be missing

Change-Id: Ia3f2d2715a3edfd0b3fe5c3d48a02ade4ea49c4d
 2022-04-29 15:29:03 +02:00
SpiritCroc
99053e8467 Support inline images in the timeline 
Change-Id: I4af76058b400e9a0bf7c10e4ad98b7c7fb5015c1
 2022-04-29 15:28:02 +02:00
SpiritCroc
9a8efb0ef8 Increment version 
Change-Id: I3a73a0e2d2956d2e7bdc8efa5a308e89f6411bb7
 2022-04-29 09:50:04 +02:00
Hiajen
15f27000bd Translated using Weblate (German) 
Currently translated at 83.7% (124 of 148 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/de/
 2022-04-27 10:36:28 +02:00
SpiritCroc
d82c4bedee Fix user override color when coloring by mxid 
Change-Id: I1f583a2f26fb5d3481b43abb33fee83e0ef573ee
 2022-04-27 10:33:30 +02:00
SpiritCroc
07537bbc63 [merge] Fix root space filter for home pager 
Change-Id: Ibc539a5b044049cca929db42a7bcff51327c2e8d
 2022-04-26 18:09:44 +02:00
SpiritCroc
2316328631 Switch to upstream MessageAudioItem 
Change-Id: Ie58f9894e66d0366e3fe49a0e13752b1e55235e7
 2022-04-26 17:51:35 +02:00
SpiritCroc
130fe7f887 Revert "Update room previews once we have decryption keys" 
Upstream implemented this now as well (differently).
This reverts commit 0d6eda56f5

Change-Id: I74a59ed3e9baf8122c506b4af66a9d1809720600
 2022-04-26 17:51:35 +02:00
SpiritCroc
c5e69cf35a Automatic SchildiChat string correction 
Change-Id: I7fddd07e7905e751f4f697708ce80371dccbef5b
 2022-04-26 17:51:35 +02:00
SpiritCroc
9dba0689e3 Automatic upstream merge postprocessing 
Change-Id: I59eaeaadcbec25a8e3e97ac0df4989731e1eefa0
 2022-04-26 17:51:35 +02:00
SpiritCroc
e450d4e9ce Merge tag 'v1.4.13' into sc 
Change-Id: I308735bb5d47ae39a73437926180f563cc1a7391
 2022-04-26 17:46:15 +02:00
SpiritCroc
fec5193ec6 [TMP] Automatic upstream merge preparation 
Change-Id: I19f122ebca5575b42c24e3b6757b44bfdb6526d6
 2022-04-26 15:31:18 +02:00
SpiritCroc
619eed6541 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I341a471e3ea4c101fed5fe275df55b0645bac846
 2022-04-26 15:31:18 +02:00
Benoit Marty
6059b71015 Merge branch 'hotfix/1.4.13' into main 2022-04-26 11:47:11 +02:00
Benoit Marty
6b5822e3d5 fastlane (same content than for 1.4.12) 2022-04-26 11:35:43 +02:00
Benoit Marty
ebcab189f2 towncrier 2022-04-26 11:31:51 +02:00
Benoit Marty
da656ac470 Changelog 2022-04-26 11:30:53 +02:00
Benoit Marty
b2f9d6778a Version hotfix 1.4.13 2022-04-26 11:29:40 +02:00
Benoit Marty
c542619525 We do not need to observe the user here 2022-04-25 18:31:30 +02:00
Benoit Marty
abdfd9deee Format 2022-04-25 18:29:49 +02:00
Benoit Marty
d2eca739f4 Apply suggestion 2022-04-25 17:55:31 +02:00
Benoit Marty
fb736281f0 Rename val 2022-04-25 17:49:50 +02:00
Benoit Marty
cd06ba656a Ensure getRootSpaceSummaries() is not called on the main thread. 2022-04-25 16:10:17 +02:00
SpiritCroc
693cff349f Disable sync status tracking 
That one is only used for analytics that SchildiChat doesn't use.
Furthermore, this causes UI lag somehow.

Change-Id: Ic5c4cfea5dd617c9e172f5b3dd217ef9d9b9d4bb
 2022-04-25 12:27:02 +02:00
SpiritCroc
34ff27307e Update HomeDetailViewModel root spaces logic 
To recent changes in SpaceListViewModel

Change-Id: I4c8a4c07333dd2aeeb5532055913be506c33d59b
 2022-04-24 13:36:58 +02:00
SpiritCroc
448e62b6dd Home pager: only listen to unique state changes 
Change-Id: I1c7a91ce39636e70279874bc9c66b80ab7bbead6
 2022-04-24 13:20:12 +02:00
SpiritCroc
f072ce0787 [merge] .editorconfig: crlf sucks 
Change-Id: Icef61650fcecfccc18845a0454e3a52557d786c7
 2022-04-24 11:53:18 +02:00
SpiritCroc
ed3c26aac6 Revert "Home pager: avoid re-applying space id that we persisted onPause" 
This doesn't work.

This reverts commit 23f4f72ba3.

Change-Id: Ia1d1769deef4fbb9ae8e19ee91e931ac2f859570
 2022-04-24 11:22:58 +02:00
SpiritCroc
b444fb8b53 Automatic SchildiChat string correction 
Change-Id: I4d1ea7a1f4131b56485256098341164d1f8dba6e
 2022-04-24 11:15:57 +02:00
SpiritCroc
a4890457e7 Automatic upstream merge postprocessing 
Change-Id: I90adddf6afb6bd838c7c9b8b70dda654e0247b6d
 2022-04-24 11:15:56 +02:00
SpiritCroc
d44cb85dc7 Merge tag 'v1.4.12' into sc 
Change-Id: I499d1a654345d59b01881da90e8f5b529ef4dfd2

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.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/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/res/layout/item_space_beta_header.xml
 2022-04-24 11:15:52 +02:00
SpiritCroc
589ce215de [TMP] Automatic upstream merge preparation 
Change-Id: I889085ec4626c8bad3c6eeb4aba0b9d57799d6f2
 2022-04-24 10:47:15 +02:00
SpiritCroc
af73df3ed4 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I06c0936f3ec8e0ec1b2c5c8de2127b0f4ab7b037
 2022-04-24 10:47:15 +02:00
SpiritCroc
30db09cea3 Split existing timeline loops 
Change-Id: I116b77df62601138da35efee9dc2ab40a8f32856
 2022-04-24 10:46:45 +02:00
SpiritCroc
fe4ec79214 Attempt to prevent timeline loops 
This doesn't fix existing loops, and I'm not sure if this will lead to
missing messages (but probably still better than timeline looping...?).

Change-Id: I9c14da58736d61b89d09458168eb2d33e9f21d80
 2022-04-24 10:46:45 +02:00
SpiritCroc
b3599aac23 Put redactions into bubbles, no matter what the original type was 
Change-Id: I6b7e424a29b1f8eb54862fc0a58102dcfaa8642c
 2022-04-24 10:46:45 +02:00
SpiritCroc
06ab920ef8 Unread marker: follow accent color 
Change-Id: I9fe33ed237146105297ebac26afa4bce279152ff
 2022-04-24 10:46:45 +02:00
SpiritCroc
51aec8551b Use Schildi-blue for notifications, unread marker, links 
Change-Id: I84eff79001020ceba6c4eb42e36093d25b09330c
 2022-04-24 10:46:45 +02:00
Adam Brown
3a9bacd7a8 Merge branch 'release/v1.4.12' 2022-04-20 14:44:43 +01:00
Adam Brown
903c402cf5 generating changelog 2022-04-20 14:08:58 +01:00
Adam Brown
7c7822a28a
Merge pull request #5792 from vector-im/bugfix/eric/realm-write-async 
Replaces monarchy.doWithRealm with monarchy.awaitTransaction
 2022-04-20 12:48:05 +01:00
Adam Brown
518a7585ab
Merge pull request #5793 from vector-im/feature/adm/weblate_1_4_14 
Weblate 1.4.14
 2022-04-20 11:30:39 +01:00
ericdecanini
8eab24c53d Replaces writeAsync with awaitTransaction 2022-04-20 11:10:01 +02:00