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

11962 Commits

Author SHA1 Message Date
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
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
Benoit Marty 7f96bf623f Merge branch 'release/1.3.4' into main 2021-10-20 10:44:44 +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
Jeff Huang 1d831b3a1b Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2021-10-19 15:25:41 +00:00
random 16a8cf6d51 Translated using Weblate (Italian) 
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/it/
 2021-10-19 15:25:40 +00:00
Jeff Huang 497d053c5d 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-19 15:25:39 +00:00
LinAGKar 803d145892 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-19 15:25:39 +00:00
Viacheslav Raskulin bda95fcc5e Translated using Weblate (Russian) 
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/ru/
 2021-10-19 15:25:39 +00:00
random 5cb55cb0d3 Translated using Weblate (Italian) 
Currently translated at 99.8% (2669 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2021-10-19 15:25:38 +00:00
Linerly 61c64a872d 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-19 15:25:38 +00:00
Benoit Marty 86b7fe67ac
Merge pull request #4268 from vector-im/feature/bma/improve_part 
A few changes on the slash command
 2021-10-19 17:01:25 +02:00
Benoit Marty ab0e707ea6
Merge pull request #4229 from vector-im/feature/adm/decrypt-event-dummy-keys-fallback-crash 
Catching EnsureOlmSessionsForDevicesAction errors
 2021-10-19 16:13:34 +02:00
Benoit Marty 4626199761 Slash commands: popDraft() only in case of success, and display a loading dialog during processing 2021-10-19 13:56:38 +02:00
Benoit Marty 364654b685 Fix crash on slash commands Exceptions 2021-10-19 12:33:47 +02:00
Benoit Marty fe2ba28441 Implement /part command, with or without parameter 2021-10-19 11:55:09 +02:00
Benoit Marty f5eaf2f05f Align wording with Element Web 2021-10-19 11:35:49 +02:00
Aris Kotsomitopoulos aea22201c3
Feature/aris/issue 465 scrub exif data (#4248) 
Implement ImageExifTagRemover to scrub user sensitive data while sending original size photos
- Return a not scrubbed file when there is an exception while scrubbing the jpeg file
- Improve error handling on image compression
 2021-10-18 21:20:03 +00:00
Benoit Marty 2a47acc68a
Merge pull request #4236 from vector-im/feature/adm/fixing-home-menu-options 
Fixing developer sync options always displaying
 2021-10-18 18:19:20 +02:00
Adam Brown c8a8d2e0bf applying a retry when attempting to fetch one time keys, tries to catch flaky network conditions 2021-10-18 16:15:07 +01:00
Adam Brown ca79e87e00 applying a retry when attempting to send dummy payload to device 2021-10-18 16:13:22 +01:00
Besnik Bleta 1c119c2c5d Translated using Weblate (Albanian) 
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/sq/
 2021-10-18 01:25:54 +00:00
Linerly 6cb254e743 Translated using Weblate (Indonesian) 
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/id/
 2021-10-18 01:25:53 +00:00
Danial Behzadi 87bd145e8e Translated using Weblate (Persian) 
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/fa/
 2021-10-18 01:25:52 +00:00
Priit Jõerüüt 4a1f1a9fa5 Translated using Weblate (Estonian) 
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/et/
 2021-10-18 01:25:51 +00:00
sr093906 022452cd45 Translated using Weblate (Chinese (Simplified)) 
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/zh_Hans/
 2021-10-18 01:25:50 +00:00
Ihor Hordiichuk f8850f5eb8 Translated using Weblate (Ukrainian) 
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/uk/
 2021-10-18 01:25:49 +00:00
LinAGKar 5a82981944 Translated using Weblate (Swedish) 
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/sv/
 2021-10-18 01:25:48 +00:00
Nikita Epifanov 28ccfbdc0d Translated using Weblate (Russian) 
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/ru/
 2021-10-18 01:25:47 +00:00
lvre 99bb0f994f Translated using Weblate (Portuguese (Brazil)) 
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/pt_BR/
 2021-10-18 01:25:46 +00:00
Szimszon 964937db98 Translated using Weblate (Hungarian) 
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/hu/
 2021-10-18 01:25:45 +00:00
sr093906 be874d9927 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-18 01:25:44 +00:00
LinAGKar 68591f3ddd 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-18 01:25:43 +00:00
joshua b83a96e1c1 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-18 01:25:43 +00:00
Besnik Bleta 41167cdc23 Translated using Weblate (Albanian) 
Currently translated at 99.3% (2655 of 2672 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
 2021-10-18 01:25:41 +00:00
Nikita Epifanov 9b1b35084c Translated using Weblate (Russian) 
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/ru/
 2021-10-18 01:25:41 +00:00