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

16548 Commits

Author SHA1 Message Date
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
Adam Brown f70b2a605c
Merge pull request #5791 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-04-20 10:03:06 +01:00
ericdecanini 90b063f0de Replaces doWithRealm with writeAsync 2022-04-20 10:55:06 +02:00
Adam Brown 73754993a5 Translated using Weblate (Polish) 
Currently translated at 38.5% (22 of 57 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pl/
 2022-04-20 08:37:20 +00:00
Weblate a46630fd05 Merge branch 'origin/develop' into Weblate. 2022-04-20 08:16:01 +00:00
Jozef Gaal 7d4e647b3b Translated using Weblate (Slovak) 
Currently translated at 100.0% (2190 of 2190 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
 2022-04-20 08:15:32 +00:00
ClaireG e0556cd5e6
Crash: open private room by link. Use RoomId instead of the alias. 2022-04-20 09:17:16 +02:00
Zet ebf821011b Translated using Weblate (Arabic) 
Currently translated at 37.6% (825 of 2190 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
 2022-04-19 16:59:37 +00:00
SpiritCroc bb5af3da7f Remove viewpager debug toasts again 
Change-Id: Ib905adf383ca77290320c157f467edd12aca2618
 2022-04-19 10:28:54 +02:00
SpiritCroc ed2b05628a Timeline consistency debug: do not toast -1->-1, these seem rather common as well 
Change-Id: I90bc46dddf0760192221c4936111dd8460046c6c
 2022-04-19 10:28:48 +02:00
SpiritCroc ed891a4445 Use accent color setting for attachments previewer 
Closes https://github.com/SchildiChat/SchildiChat-android/issues/120

Change-Id: Iedcc1808b8408fd82ce8a6ce92c1f0c560b66cc2
 2022-04-19 10:28:44 +02:00
Aris Kotsomitopoulos abe07c73a4
Merge pull request #5775 from vector-im/feature/aris/threads_after_release_experience 
Enhance user experience when home servers do not support threads.
 2022-04-19 10:59:41 +03:00
fedrunov 48680c3e2d
remove spaces feedback from left panel (#5686) 2022-04-19 09:27:17 +02:00
Glandos 765bfd0570 Translated using Weblate (French) 
Currently translated at 100.0% (55 of 55 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
 2022-04-17 12:59:41 +00:00
Jozef Gaal cb577756f9 Translated using Weblate (Slovak) 
Currently translated at 100.0% (2190 of 2190 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
 2022-04-17 12:59:40 +00:00
Suguru Hirahara dc4f11a613 Translated using Weblate (Japanese) 
Currently translated at 98.2% (2151 of 2190 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2022-04-17 12:59:40 +00:00
Glandos fb3e037ed5 Translated using Weblate (French) 
Currently translated at 100.0% (2190 of 2190 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2022-04-17 12:59:38 +00:00