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

10751 Commits

Author SHA1 Message Date
SpiritCroc 19402f54a6 [merge] Fix fdroid variant compile / remove unused imports 
Change-Id: Ib7d0c4095bb549b54d83ad3d1ef4c23bc0ebc736
 2022-05-06 09:24:29 +02:00
SpiritCroc bed3051812 Automatic SchildiChat string correction 
Change-Id: I6db6443c31a7052293ae4df4e60c0694d1e38c26
 2022-05-05 17:41:29 +02:00
SpiritCroc 4617d2d698 Merge tag 'v1.4.14' into sc 
v1.4.14

Change-Id: I3667009380f1e35ce05c75c3769e62e3446212db

Conflicts:
	.editorconfig
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.kt
	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/room/send/LocalEchoEventFactory.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/database/RealmMigrator.kt
	vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/VectorApplication.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/receiver/BackgroundSyncStarter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.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/SpaceSummaryController.kt
 2022-05-05 17:41:26 +02:00
SpiritCroc 2a87ebe3e8 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Iceff48cf6d67ca6e84bc04e9a5d94d81cb339932
 2022-05-05 14:26:49 +02:00
SpiritCroc 92fe0a5a29 Rageshake: re-enable can_contact switch 
Follow-ups may be useful for some kind of reports

Change-Id: Id2a42ce771f1ed355b896e5e8f8ad61e61670d8b
 2022-05-05 13:28:26 +02:00
SpiritCroc 3e2fdd0784 Inline images: use isMxcUrl() 
Change-Id: Ie85c5597e714b48dc5bcd3ac69abb5161b4fa640
 2022-05-05 13:28:12 +02:00
ganfra 00ad9ccc2a
Merge pull request #5935 from vector-im/feature/fga/fix_weblate_lint 
Feature/fga/fix weblate lint
 2022-05-04 19:07:16 +02:00
Benoit Marty 330d802079
Merge pull request #5907 from vector-im/feature/bma/currentTimeMillis 
Use Clock interface
 2022-05-04 18:27:04 +02:00
ganfra f2c35adb60 Fix TODO on strings 2022-05-04 18:19:03 +02:00
Benoit Marty a11c0b7ea1
Merge pull request #5885 from chagai95/patch-2 
don't pause timer when call is held
 2022-05-04 18:09:11 +02:00
ganfra ed7343e897 Weblate: fix string with param 2022-05-04 18:06:05 +02:00
Benoit Marty 2fb5f423a5 Rename val 2022-05-04 17:52:32 +02:00
Benoit Marty 3ecde755e0 Rename val 2022-05-04 17:51:14 +02:00
Benoit Marty 2d98cbd915 Rename `now` to more explicit `currentTimeMillis` 2022-05-04 17:48:36 +02:00
Benoit Marty 09e628f227
Merge branch 'develop' into feature/bma/currentTimeMillis 2022-05-04 17:43:03 +02:00
Weblate 5cdea33418 Merge branch 'origin/develop' into Weblate. 2022-05-04 14:39:20 +00:00
chanthajohn keoviengkhone f7d006c13b Translated using Weblate (Lao) 
Currently translated at 95.2% (2112 of 2217 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lo/
 2022-05-04 14:30:54 +00:00
Benoit Marty 9c558f1f15
Merge pull request #5928 from vector-im/bugfix/adm/login-in-other 
Fixing sign in via Other needing registration to be enabled
 2022-05-04 14:09:40 +02:00
Adam Brown f42e6c0a3c fixing sign in needing registration to be enabled 
- caused by the sign in flow using the registration homeserver validation, fixed by posting the sign in mode event directly
 2022-05-04 11:36:36 +01:00
Adam Brown 76a285e655
Merge pull request #5926 from vector-im/bugfix/adm/konfetti-crash 
Crash - Konfetti API 21/22 crash
 2022-05-04 11:16:31 +01:00
Benoit Marty 5076b2cdbd
Merge pull request #5858 from vector-im/feature/bma/room_api 
Room now exposes methods to get the various Services
 2022-05-04 11:55:04 +02:00
Adam Brown 9fd56f0b5c fixes konfetti crashing api 21/22 devices due to the View lifecycle being different 
-  https://github.com/DanielMartinus/Konfetti/issues/297
 2022-05-04 10:31:33 +01:00
Benoit Marty b5a0c944d1
Merge pull request #5869 from vector-im/feature/mna/PSF-884-live-location-aggregation 
[Live location sharing] Improve aggregation process of events
 2022-05-04 11:11:39 +02:00
Benoit Marty 70c1310794 Ensure space invite are not displayed twice and cannot be selected as current space 2022-05-04 10:07:08 +02:00
Benoit Marty 4889295361 Tentative fix for rageshake 37765 2022-05-04 10:07:08 +02:00
Benoit Marty 97702317dd Rename var 2022-05-04 10:07:08 +02:00
Benoit Marty 29dc114d1a Format the file 2022-05-04 10:07:08 +02:00
anoloth 5ea4c0f8c9 Translated using Weblate (Lao) 
Currently translated at 59.0% (1309 of 2217 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lo/
 2022-05-03 23:00:29 +00:00
chanthajohn keoviengkhone c444a0bf67 Translated using Weblate (Lao) 
Currently translated at 59.0% (1309 of 2217 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lo/
 2022-05-03 23:00:29 +00:00
alejandro a96e8455e8 Translated using Weblate (Spanish) 
Currently translated at 99.7% (2211 of 2217 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es/
 2022-05-03 22:59:45 +00:00
Russell Davies bc51ff051e Translated using Weblate (Spanish) 
Currently translated at 99.7% (2211 of 2217 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es/
 2022-05-03 22:59:45 +00:00
John Doe 6a2507e477 Translated using Weblate (Spanish) 
Currently translated at 99.7% (2211 of 2217 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es/
 2022-05-03 22:59:45 +00:00
Benoit Marty 8602cbba7a Fix test 2022-05-03 17:43:00 +02:00
fedrunov 9f520d4e8a
track room open and room join analytics events (#5696) 2022-05-03 16:11:40 +02:00
Benoit Marty cdcaf93fc7 Fix F-Droid build 2022-05-03 15:02:34 +02:00
Benoit Marty 40d3203297 Use Clock interface app side 2022-05-03 15:02:34 +02:00
Benoit Marty 45526c0e3a Use Clock (SDK API change) 2022-05-03 15:02:34 +02:00
Benoit Marty 8dd87321da
Merge pull request #5866 from vector-im/feature/bma/fix_sanity_test 
Fix sanity test
 2022-05-03 15:02:04 +02:00
Adam Brown 0325754d12
Merge pull request #5884 from vector-im/sync-analytics-plan 
Sync analytics plan
 2022-05-03 09:18:29 +01:00
anoloth 38e652de8d Translated using Weblate (Lao) 
Currently translated at 26.9% (597 of 2217 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lo/
 2022-05-02 15:53:23 +00:00
chanthajohn keoviengkhone 837f49cebf Translated using Weblate (Lao) 
Currently translated at 26.9% (597 of 2217 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lo/
 2022-05-02 15:53:22 +00:00
Valere f57e20c73c make grace period configurable and reduce test duration 2022-05-02 17:19:08 +02:00
Maxime NATUREL a27569770b Renaming timestamp fields 2022-05-02 11:10:36 +02:00
Valere d0bff5000c Fix UISIDetector grace period bug 2022-05-02 10:10:29 +02:00
chagai95 5f1aad76e6
don't pause timer when call is held 
This is also the way it is implemented in web and the correct way
 2022-05-02 09:11:47 +02:00
anoloth 99765bbcfd Added translation using Weblate (Lao) 2022-05-02 06:14:27 +00:00
bmarty cd6807d9b2 Sync analytics plan 2022-05-02 00:03:56 +00:00
John Doe 5fecb1cb97 Translated using Weblate (Spanish) 
Currently translated at 95.2% (2111 of 2217 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es/
 2022-05-01 21:10:37 +00:00
Kominak Halalu 6e984ef68b Translated using Weblate (Bengali) 
Currently translated at 0.1% (1 of 2217 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/bn/
 2022-04-30 14:59:41 +00:00
huangguiniab 9e4278a893 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 93.2% (2068 of 2217 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2022-04-30 14:59:41 +00:00