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

11207 Commits

Author SHA1 Message Date
SpiritCroc f97549073e Increment version 
Change-Id: If37db85f2d3e0affd140961f9efc87c8440c5033
 2021-09-18 20:38:14 +02:00
SpiritCroc 6ec4f1bb1a Merge remote-tracking branch 'weblate/sc' into sc 
Change-Id: I0d98fa27615da35eb9067bb7cd094d63d9e64d63
 2021-09-18 20:29:43 +02:00
SpiritCroc 756529e565 Revert "Use Java 11 source code" 
This seems to break device compatibility with a ZTE Blade L3, Android
5.0.2, stock ROM - even though the Google Play Developer Console views
the device as supported.

Not sure how long we want to stick to Java 8, but we should at least
give everyone who had v1.2.0 installed the chance to get to v1.2.2, to
get a version with the recent security vulerability fix.

This reverts commit 80f23f1f3c.

Change-Id: If599d9154e9385a33f10b6df17469cd86deccb7b
 2021-09-18 20:26:29 +02:00
Vib 01d996d51a Translated using Weblate (Romanian) 
Currently translated at 84.5% (93 of 110 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/ro/
 2021-09-18 20:23:30 +02:00
su-ex 46637dd2f4 Translated using Weblate (German) 
Currently translated at 78.1% (86 of 110 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/de/
 2021-09-18 20:23:30 +02:00
waclaw66 45a18ff16b Translated using Weblate (Czech) 
Currently translated at 100.0% (110 of 110 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
 2021-09-18 20:23:30 +02:00
Vib 11fe938641 Translated using Weblate (Romanian) 
Currently translated at 84.7% (89 of 105 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/ro/
 2021-09-18 20:23:30 +02:00
Vib 3da78cfe87 Added translation using Weblate (Romanian) 2021-09-18 20:23:30 +02:00
RandomItalianGuy 30e3d52828 Translated using Weblate (Italian) 
Currently translated at 11.4% (12 of 105 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/it/
 2021-09-18 20:23:30 +02:00
dc7ia f070a389f7 Translated using Weblate (Swedish) 
Currently translated at 93.3% (98 of 105 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/sv/
 2021-09-18 20:23:29 +02:00
waclaw66 6f21586ae7 Translated using Weblate (Czech) 
Currently translated at 100.0% (105 of 105 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
 2021-09-18 20:23:29 +02:00
RandomItalianGuy dd36ac2324 Added translation using Weblate (Italian) 2021-09-18 20:23:29 +02:00
dc7ia 88874e1823 Added translation using Weblate (Swedish) 2021-09-18 20:23:29 +02:00
SpiritCroc d4a3e3828c Make caching of mxid-based colors theme-friendly 
Change-Id: I09b811c2cf1131914ab025c4a4fb5d4da74e3d88
 2021-09-16 17:12:23 +02:00
SpiritCroc 8005f44768 Add option to force allow background sync in addition to push 
Change-Id: I545475f1f8b36a43712613493173c9a6638cc7f6
 2021-09-16 10:45:48 +02:00
SpiritCroc adfa2b36af UP: Setting to force re-register UP 
Also move all notification settings to notification settings

Change-Id: I8eee2d289e67e16b61542930a55706bb29b361af
 2021-09-16 10:21:03 +02:00
SpiritCroc d87c03c505 Theme mxid-based username colors 
TODO for follow-up commit: same for mxid-based room colors (maybe with
an extra setting?)

Change-Id: I827bd967e615f20e12f205c0ae5b24a777e90d45
 2021-09-16 09:04:13 +02:00
S1m fbfacc68a4 Unifiedpush: Add default notification if none 
Avoid a crash
 2021-09-15 10:17:32 +02:00
SpiritCroc 61662b9774 Troubleshoot FCM: this should not be a format string right now 
Change-Id: Ifff301e55530c2f14c0a54b6e909f199e1706717
 2021-09-14 10:00:29 +02:00
SpiritCroc b96f150dd0 Add labs setting to use UP endpoint as gateway directly 
Change-Id: I8117a4bd15d67703d15be20023146dec8ceec07f
 2021-09-14 09:57:26 +02:00
SpiritCroc c38ece586e Increment version 
Change-Id: I70c18491f03854898fa9989add666530dbc0b668
 2021-09-13 16:20:06 +02:00
SpiritCroc ddceeaff0d Automatic SchildiChat string correction 
Change-Id: I9447b4a54567537195c0bf814e8d001a438ccd2f
 2021-09-13 15:37:58 +02:00
SpiritCroc 99549b0827 Automatic upstream merge postprocessing 
Change-Id: Ie0be3b5c124ab589b52fa585e9e330f8c906bd6a
 2021-09-13 15:37:57 +02:00
SpiritCroc 741ac9f3f6 Merge tag 'v1.2.2' into sc 
Change-Id: Icda1859305bac1e48f3d1889282a23049dd83c29
 2021-09-13 15:37:54 +02:00
Benoit Marty bcbe8d3144 Merge branch 'hotfix/1.2.2' into main 2021-09-13 15:26:16 +02:00
Benoit Marty cccf812906 Version++ (1.2.2) 2021-09-13 15:25:56 +02:00
Valere 8d2f95d5db Store device key in SharedSessionEntity 
Code review changes


Fix database migraiton


Fix wrong self assignement + comment
 2021-09-13 15:25:30 +02:00
SpiritCroc b084febf96 [TMP] Automatic upstream merge preparation 
Change-Id: I49e0bface447e2900d1133a5b14895591a99887c
 2021-09-13 14:18:47 +02:00
SpiritCroc 70b8b3a22f Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I831bc3b9509ded5c8bea671810a2c067e8c1f984
 2021-09-13 14:18:47 +02:00
SpiritCroc 4f1cde6c07 Add some secret setting 
Change-Id: I8f43d720c556389555128da07e8c6571afea13c3
 2021-09-11 11:16:37 +02:00
SpiritCroc 8a8ad86806 Drawer notif count badge: use total count 
Upstream decided to only count notifications for other spaces than the
currently selected one for the drawer icon. This however leads to
notification counts multiplying for rooms present in multiple spaces.
Instead, it's more useful to just show the total notification count,
without doing any kind of space-based filtering.

Fixes https://github.com/SchildiChat/SchildiChat-android/issues/79

Change-Id: I2a76d4fbc768b36470d9183741f57a5f834d374a
 2021-09-11 10:22:23 +02:00
SpiritCroc 4803fbbc05 merge_helpers.sh: Allow restoring upstream files deleted downstream 
Change-Id: Ib02d37f4c5e2414b04e5fdf6006e6e3c13f4827a
 2021-09-11 10:01:11 +02:00
SpiritCroc 75a9c748af Hide secure backup "backing up keys" banner 
Change-Id: I432561ac30d70509c38e07e8ed3ea4cecb9fe4b2
 2021-09-11 10:00:46 +02:00
SpiritCroc 9d25264a19 Merge remote-tracking branch 'p1gp1g/unifiedpush' into sc 
Change-Id: I3c3bd1405fad1eba0974e65f089dcbdd4c152671
 2021-09-11 09:41:59 +02:00
SpiritCroc 1b8874e8cb Expose and theme some upstream colors concerning video conferences 
Change-Id: I8ed960c119c2b87a9e8af0bce60bbf60034f5a61
 2021-09-10 12:26:56 +02:00
SpiritCroc dc2f9f883e Increase gradle/java heap size to fix fdroid build 
Change-Id: I28b682acf672eef7438fbc74d2aa697258f6c6e7
 2021-09-09 16:36:29 +02:00
SpiritCroc 3be0b85dcf Actually, this is 1.2.1 now 
Change-Id: I13a84dc84c37892cf5d18c549bc305f9a6b1e7ce
 2021-09-09 16:21:19 +02:00
SpiritCroc d9db4fffb2 Make new notification mode radio items look nicer 
Change-Id: I5ce2373a7b855da74d4a29f595171644bb3d5ae0
 2021-09-09 14:30:26 +02:00
SpiritCroc 4b241a00a3 Refactor power-level based display name color updates 
Use similar mechanism as recently added for isDirect changes.

Change-Id: Ida304ae2cc2fbe85cc4b47cb32d6c343cd5e2bd6
 2021-09-09 12:48:41 +02:00
SpiritCroc f4d8f78ac7 Fix timeline rebuild on DM state change 
Needs slightly different handling after
50a042683b "Architecture: get rid of RoomSummariesHolder as it can lead to errors"

Change-Id: I1d34ca5058d93a73dc26c3b2fee7f8a296ec4880
 2021-09-09 12:12:31 +02:00
SpiritCroc 25b11084f4 Merge branch 'merge_v1.2.1' into sc 
Change-Id: I003540479c02eae32fdeee7230ef11e5d373e9b0
 2021-09-09 11:30:00 +02:00
SpiritCroc ca40676070 Automatic SchildiChat string correction 
Change-Id: Ie159d8065491758645b608d097daee74e61d1000
 2021-09-09 10:59:34 +02:00
SpiritCroc 4d3f0d734e Automatic upstream merge postprocessing 
Change-Id: I4ba951dbf6b6d874ac22d3f22f84bebb03f5e8bc
 2021-09-09 10:59:33 +02:00
SpiritCroc 11093ee015 Add back unifiedpush strings, but to SC strings 
Change-Id: Idea333c040aaf761d080e2ca15f463549da94efa
 2021-09-09 10:55:42 +02:00
SpiritCroc 133579d066 Merge tag 'v1.2.1' into sc 
Change-Id: I7446b0a3b8f2bbeee76e337e78eb722cbd05ef2a

Conflicts:
	build.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.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/list/actions/RoomListQuickActionsEpoxyController.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
 2021-09-09 10:51:12 +02:00
SpiritCroc fc2775d86a Fix Fastfile 
Change-Id: Id98dd7c3f1e56775a88a4401407e518265250d95
 2021-09-09 10:16:11 +02:00
SpiritCroc 3b85ab988b [TMP] Automatic upstream merge preparation 
Change-Id: I2893c4d5476417ed6eb7d0c7ec3bf7b68338a8f3
 2021-09-09 09:41:38 +02:00
SpiritCroc 99ada07157 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ibfce6aea9c9404a43e9adc6de365626ad4d43e5e
 2021-09-09 09:41:38 +02:00
SpiritCroc 832f0e0e5b Increment version 
Change-Id: Ia225fd512fb1bccd7a2277a2e6f423c8f7ef8969
 2021-09-09 09:39:24 +02:00
SpiritCroc e05e8086ac Merge remote-tracking branch 'weblate/sc' into sc 
Change-Id: I9c8799d9134d422275587cce76b6003a213d57aa
 2021-09-09 09:37:46 +02:00