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

11179 Commits

Author SHA1 Message Date
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
Niels Bouma b0d444a381 Translated using Weblate (Dutch) 
Currently translated at 100.0% (90 of 90 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/nl/
 2021-09-09 09:36:45 +02:00
pixelcode 41dcb7cc83 Translated using Weblate (German) 
Currently translated at 95.5% (86 of 90 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/de/
 2021-09-09 09:36:45 +02:00
SpiritCroc 452a641a39 Merge remote-tracking branch 'weblate/sc' into sc 
Change-Id: Ibc1289c38d5bf9229ad00dd39ae194a1417bb842
 2021-09-09 09:36:01 +02:00
Benoit Marty ed2c21781a Merge branch 'release/1.2.1' into main 2021-09-08 19:14:28 +02:00
Benoit Marty 13d379badf Create changelog for fastlane 2021-09-08 17:56:01 +02:00
Benoit Marty e72bc699e9 Fix issue in link 2021-09-08 17:53:13 +02:00
Benoit Marty 5169a8ed10 Run towncrier 2021-09-08 17:52:11 +02:00
Benoit Marty b47ecf0271 rename file 2021-09-08 17:51:11 +02:00
Benoit Marty 2239d710db Handle missing descriptions for SQ 2021-09-08 17:30:02 +02:00
Benoit Marty fcd72fd9e3
Merge pull request #3991 from vector-im/feature/fga/fix_memory_leak_room_detail 
Fix memory leak on RoomDetailFragment
 2021-09-08 17:28:26 +02:00
ganfra 3119de42fb Fix memory leak on RoomDetailFragment 2021-09-08 16:47:53 +02:00
Benoit Marty 5c86eb0877
Merge pull request #3988 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-09-08 16:09:42 +02:00
Weblate 5e9be4860d Merge branch 'origin/develop' into Weblate. 2021-09-08 13:44:59 +00:00
Besnik Bleta 478802d60e Translated using Weblate (Albanian) 
Currently translated at 3.4% (1 of 29 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sq/
 2021-09-08 13:44:35 +00:00
Le Dang Trung f1fe9d83fe Translated using Weblate (Vietnamese) 
Currently translated at 34.9% (914 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
 2021-09-08 13:44:35 +00:00
Ihor Hordiichuk b8f896d914 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (29 of 29 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
 2021-09-08 13:44:19 +00:00
Ihor Hordiichuk 081206db1c Translated using Weblate (Ukrainian) 
Currently translated at 81.3% (2126 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-09-08 13:44:18 +00:00
Niels Bouma efe03ec681 Translated using Weblate (Dutch) 
Currently translated at 51.4% (1345 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
 2021-09-08 13:44:12 +00:00
Fjoerfoks 7baf407e13 Translated using Weblate (Frisian) 
Currently translated at 33.8% (884 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fy/
 2021-09-08 13:44:09 +00:00
waclaw66 0f5007f0ba Translated using Weblate (Czech) 
Currently translated at 100.0% (2615 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2021-09-08 13:44:07 +00:00
Benoit Marty 88bb845910
Merge pull request #3984 from vector-im/feature/ons/fix_voice_message_rendering 
Fix rendering voice message if the waveform data is corrupted
 2021-09-08 15:21:33 +02:00
Onuray Sahin 3bd392a55d Code review fixes. 2021-09-08 13:44:52 +03:00
Onuray Sahin 1df867f345 Fix rendering voice message if the waveform data is corrupted. 2021-09-08 13:20:56 +03:00
Niels Bouma ad81164b38 Translated using Weblate (Dutch) 
Currently translated at 100.0% (90 of 90 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/nl/
 2021-09-07 15:06:18 +02:00
Ihor Hordiichuk a139eb71e1 Translated using Weblate (Ukrainian) 
Currently translated at 78.6% (2056 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-09-07 12:04:31 +00:00
strix aluco ce5a45ea31 Translated using Weblate (Ukrainian) 
Currently translated at 78.6% (2056 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-09-07 12:04:31 +00:00
Ihor Hordiichuk a9f345b694 Translated using Weblate (Ukrainian) 
Currently translated at 78.6% (2056 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-09-07 12:02:30 +00:00
strix aluco 18ddf649ba Translated using Weblate (Ukrainian) 
Currently translated at 78.6% (2056 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-09-07 12:02:03 +00:00