mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-27 03:18:33 +03:00
Code Issues Projects Releases Packages Wiki Activity
12044 commits 7 branches 124 tags 230 MiB
Commit graph

12044 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Glandos
7aa860b1fa Translated using Weblate (French) 
Currently translated at 100.0% (34 of 34 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
 2021-10-22 07:59:55 +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
c1b1d855d4 Don't put DM in spaces based on user memberships 
Change-Id: I0dcd369a76f86e86d8d194db3ba133fae615a45a
 2021-10-22 09:21:51 +02:00
SpiritCroc
c8d9e69c40 Fix presence theming 
Change-Id: Ief37c2a6c3d1ed7270ec0a69da122b56614a2adf
 2021-10-22 09:18:59 +02:00
Benoit Marty
c212c2ec50
Merge pull request #4306 from vector-im/feature/aris/improve_edittext_pr_4281 
feature/aris/improve_edittext_pr_4281
 2021-10-21 20:20:37 +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
5d83211995 Automatic upstream merge postprocessing 
Change-Id: Iae698de2ab9d37e10f4ad845d3e28f047bc69df3
 2021-10-21 17:42:29 +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
969fa9fb26 [TMP] Automatic upstream merge preparation 
Change-Id: I40d5b4920f7f5f8e75167ae3382d585b8a5d38aa
 2021-10-21 16:27:34 +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
Benoit Marty
486e769287
Merge pull request #4284 from vector-im/feature/fga/fix_mic_button_visibility 
Fix  voice message record button wrong visibility
 2021-10-21 12:39:50 +02: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
7f96bf623f Merge branch 'release/1.3.4' into main 2021-10-20 10:44:44 +02:00
Benoit Marty
86d4d13d50 Merge branch 'release/1.3.4' into develop 2021-10-20 10:44:41 +02:00
Benoit Marty
d5f2a6179d Fastlane change 2021-10-20 10:44:20 +02:00
Benoit Marty
e536e1c785 Run towncrier 2021-10-20 10:42:12 +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
Benoit Marty
8954b1bb22
Merge pull request #4272 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-10-20 09:04:44 +02:00
Weblate
cf5fca082d Merge branch 'origin/develop' into Weblate. 2021-10-20 06:28:17 +00:00
Kiel
c7fa40fd46 Translated using Weblate (English (United Kingdom)) 
Currently translated at 0.7% (21 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/en_GB/
 2021-10-20 06:28:08 +00:00
DUCKCHI
d764bb659f Translated using Weblate (Korean) 
Currently translated at 48.3% (1292 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ko/
 2021-10-20 06:28:06 +00:00
Benoit Marty
ac44cd4401
Merge pull request #4270 from vector-im/feature/bma/small_cleanup 
small cleanup
 2021-10-19 21:08:09 +02:00
Benoit Marty
85983562fa No need to add explicit dependencies on stdlib, this is added by the gradle plugin since 1.4 
https://kotlinlang.org/docs/whatsnew14.html#dependency-on-the-standard-library-added-by-default
 2021-10-19 19:06:27 +02:00
Benoit Marty
97464969ea Small formatting 2021-10-19 19:04:32 +02:00
Benoit Marty
89e8e5ca31
Merge pull request #4269 from vector-im/feature/bma/required_signature 
Make MegolmBackupAuthData.signatures optional for robustness
 2021-10-19 18:47:35 +02:00
Benoit Marty
097694f6ef Make MegolmBackupAuthData.signatures optional for robustness 2021-10-19 17:31:51 +02:00
waclaw66
c056dc27ca Translated using Weblate (Czech) 
Currently translated at 100.0% (34 of 34 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
 2021-10-19 15:25:42 +00:00