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

7678 Commits

Author SHA1 Message Date
SpiritCroc 961adadbc8 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I07fb96aea925e57f95d16ea92fc92dc1c672c079
 2021-10-27 15:24:57 +02:00
SpiritCroc 9cb746d509 Open room at bottom action if open at unread 
Change-Id: Ia933c5a9f31c4025a34912a82f699e5c5abe8dd3
 2021-10-25 20:17:49 +02:00
SpiritCroc 61140f3698 Merge remote-tracking branch 'weblate/sc' into sc 
Change-Id: I1de6baa5fb75862ad0a9a62ec5ac20612c8750b8
 2021-10-25 19:30:25 +02:00
SpiritCroc 2426cdfb06 Automatic SchildiChat string correction 
Change-Id: Ife8129a743dff016e37df51a8a560a043f2bf58a
 2021-10-25 19:30:05 +02:00
SpiritCroc 65bc997acc Merge tag 'v1.3.5' into sc 
Change-Id: I3e9f85a6228649c1d8a2e886a2b234c59331c619
 2021-10-25 19:29:59 +02:00
SpiritCroc c2f524b7b3 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I3c9e368fe3c46cca14ed47d7ae19bee206aa20ba
 2021-10-25 19:29:50 +02:00
Benoit Marty 8b6e0187d6
Merge pull request #4320 from vector-im/feature/adm/malformed-group-link 
Fixing grouped notification causing malformed url
 2021-10-25 12:20:04 +02:00
Adam Brown 325e78106e
fixing strange ide extract 2021-10-25 10:51:40 +01:00
waclaw66 fa01e7257e Translated using Weblate (Czech) 
Currently translated at 100.0% (117 of 117 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
 2021-10-23 12:06:31 +02:00
Adam Brown 06b3cc3f4b filters the unique notification uris from the link handling 
- fixes malformed url errors appearing for uri we only create to force uniqueness in the notifications
 2021-10-22 18:29:53 +01:00
SpiritCroc 5182c2760e Merge remote-tracking branch 'upstream/develop' into sc 
Change-Id: Ie246642fb6346f4a8838878a18135add6786a9b5
 2021-10-22 16:18:34 +02:00
ganfra a82a5c9b32 Fix unread marker not showing #4313 2021-10-22 15:19:39 +02:00
SpiritCroc 8171a85657 Merge remote-tracking branch 'upstream/develop' into sc 
Change-Id: Ia092f493aa3e3ad509eb7876e19fc773b40cc233
 2021-10-22 11:16:40 +02:00
waclaw66 afdbb6f438 Translated using Weblate (Czech) 
Currently translated at 100.0% (115 of 115 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
 2021-10-22 11:10:27 +02:00
Nikita Epifanov b07542e653 Translated using Weblate (Russian) 
Currently translated at 100.0% (113 of 113 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/ru/
 2021-10-22 11:10:27 +02:00
twann 3628a5cd9e Translated using Weblate (French) 
Currently translated at 82.3% (93 of 113 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/fr/
 2021-10-22 11:10:27 +02:00
Linerly c081218671 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (113 of 113 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/id/
 2021-10-22 11:10:26 +02:00
Linerly 67bf92c984 Added translation using Weblate (Indonesian) 2021-10-22 11:10:26 +02:00
SpiritCroc 923c80125e Add setting to put DM in spaces based on user memberships 
Change-Id: If202f640b2061423167cc8fc205781ab48ea4793
 2021-10-22 11:09:06 +02:00
SpiritCroc a6f809c613 Refactor SC SDK preferences 
- Fix message preview setting
- Fixes some issue with chats being marked as unread
- Prepare for more SDK preferences

Change-Id: I7522624175c00ddf32c1bbec2a985ff34eb8d317
 2021-10-22 10:50:20 +02:00
Weblate f75de0b2b7 Merge branch 'origin/develop' into Weblate. 2021-10-22 08:00:00 +00:00
Jeff Huang dcda43fc93 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2021-10-22 07:59:54 +00:00
sr093906 de320e671e Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2021-10-22 07:59:54 +00:00
LinAGKar 5a3d1fb7ec Translated using Weblate (Swedish) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2021-10-22 07:59:54 +00:00
lvre 2ddedf49d4 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2021-10-22 07:59:54 +00:00
Linerly df5c05fc1f Translated using Weblate (Indonesian) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2021-10-22 07:59:53 +00:00
Szimszon 2b0933139a Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2021-10-22 07:59:53 +00:00
Glandos 3993a45825 Translated using Weblate (French) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2021-10-22 07:59:53 +00:00
Priit Jõerüüt b83566c1c0 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2021-10-22 07:59:53 +00:00
waclaw66 bc137af0e2 Translated using Weblate (Czech) 
Currently translated at 100.0% (2672 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2021-10-22 07:59:52 +00:00
SpiritCroc c8d9e69c40 Fix presence theming 
Change-Id: Ief37c2a6c3d1ed7270ec0a69da122b56614a2adf
 2021-10-22 09:18:59 +02:00
ariskotsomitopoulos 9d5f84b86a Linter fixes 2021-10-21 20:02:21 +03:00
ariskotsomitopoulos d6d46d1c21 Avoid using setRawInputType 2021-10-21 19:41:35 +03:00
SpiritCroc 675dfda7bc Keep screen on during voice recording 
Fixes https://github.com/SchildiChat/SchildiChat-android/issues/91

Change-Id: I95b6e7dd4cc55a50f7fdb2fead33afcc57b86628
 2021-10-21 18:12:15 +02:00
SpiritCroc be4ba1aabc Make "jump to bottom on send" a setting 
Closes https://github.com/SchildiChat/SchildiChat-android/issues/94

Change-Id: I785dd13f4b40f495ae6ac1cea4d3f8af33ffe883
 2021-10-21 17:59:45 +02:00
SpiritCroc 5526485814 Automatic SchildiChat string correction 
Change-Id: I8c717f3a37806553bc01ce7ed7d38171c9cf999e
 2021-10-21 17:42:31 +02:00
SpiritCroc 978056e01f Merge tag 'v1.3.4' into sc 
Conflicts:
	dependencies.gradle
	gradle.properties
	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/sync/parsing/RoomSyncAccountDataHandler.kt
	vector/build.gradle
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/timeline/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt

Parts of conflict resolution taken from

    commit 3302ab563ea549684f1e7d7604da01d6856c8d8d
    Merge: 06f52832b 1f74bc986
    Author: S1m <git@sgougeon.fr>
    Date:   Fri Oct 15 09:36:46 2021 +0200

        Merge remote-tracking branch 'upstream/develop' into unifiedpush

Change-Id: I25ad98c59df8b8057147260d790eb2a86d6a6e9b
 2021-10-21 17:31:11 +02:00
Benoit Marty a7d5c6a437
Merge pull request #4281 from vector-im/feature/aris/broken_edittext_4276 
Fix Broken EditText when using FromEditTextItem
 2021-10-21 17:28:41 +02:00
Benoit Marty eb54eef595
Merge pull request #4296 from vector-im/feature/fga/fix_jsonviewer 
Fix crash when clicking on ViewEvent source actions
 2021-10-21 17:24:21 +02:00
ariskotsomitopoulos beab9ab8f1 Refactored for clarity 2021-10-21 17:43:01 +03:00
ganfra d41ff50097 Fix crash when clicking on ViewEvent source actions #4279 2021-10-21 16:34:20 +02:00
SpiritCroc a3d1e3abcd Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ia154ec0db3fd14eb89cae6e75c5dbe652278c8b1
 2021-10-21 16:27:33 +02:00
ariskotsomitopoulos dc230f1c30 Refactor to handle more cases 2021-10-21 14:31:50 +03:00
ganfra d33daaf799 Fix voice message record button wrong visibility #4283 2021-10-21 11:35:08 +02:00
ariskotsomitopoulos 3ea7b37df3 Improve imeOptions 2021-10-21 01:54:45 +03:00
ariskotsomitopoulos b3f6b5e142 Fix Broken EditText when using FromEditTextItem 2021-10-21 01:46:05 +03:00
Benoit Marty 7c9c4ecf5f Version++ 2021-10-20 10:49:40 +02:00
Benoit Marty 367795ee24 Fix crash reported by the PlayStore, for release 1.3.4 
I did not find a way to reproduce, but this change should add some safety
 2021-10-20 09:29:15 +02:00
Benoit Marty 628ccdc328 Add English - GB to the list of languages 2021-10-20 09:16:56 +02:00
Weblate cf5fca082d Merge branch 'origin/develop' into Weblate. 2021-10-20 06:28:17 +00:00