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

16845 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
11194546a7 [TMP] Automatic upstream merge preparation 
Change-Id: I3d17203abc4c7c8b681ba3d23483f76d3b5c2caa
 2022-05-05 14:26:49 +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
a5b007f147 Merge branch 'release/1.4.14' into main 2022-05-05 11:30:59 +02:00
ganfra
9420d309a5 Add changes 2022-05-05 10:38:49 +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
ganfra
de531a17d9
Merge pull request #5931 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-05-04 17:15:52 +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
Benoit Marty
78af67ee7e Changelog 2022-05-04 12:33:26 +02:00
Adam Brown
1d59f69a57
Merge pull request #5909 from vector-im/defect/adm/crash-when-processing-call-events 
Fixes crash when accepting VOIP calls
 2022-05-04 11:16:51 +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
dcc20bbfeb
Merge pull request #5854 from vector-im/feature/bma/small_fixies 
Documentation update
 2022-05-04 11:57:19 +02: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
2ff6604555
Merge pull request #5890 from vector-im/feature/bma/another_cleanup 
This is not necessary to map the EventId
 2022-05-04 10:47:05 +02:00
Benoit Marty
12d7cee687
Merge pull request #5924 from vector-im/feature/bma/space_fix 
Space list crash fix
 2022-05-04 10:41:40 +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
Benoit Marty
1e3ad30422
Merge pull request #5920 from vector-im/dependabot/gradle/org.jlleitschuh.gradle.ktlint-10.3.0 
Bump org.jlleitschuh.gradle.ktlint from 10.2.1 to 10.3.0
 2022-05-04 09:31:57 +02:00
Maxime NATUREL
63119ca2a3
Merge pull request #5912 from vector-im/fix/mna/issue-5855-response-state-event 
[SDK] Add missing return type in RoomApi.sendStateEvent()
 2022-05-04 09:25:49 +02:00
SpiritCroc
8158fff0f7 Still need to link empty chunks to glue everything together 
Change-Id: Ic037db94d044c7271fe2f016a58c153945b73615
 2022-05-04 08:03:15 +02:00
dependabot[bot]
f771a22161
Bump org.jlleitschuh.gradle.ktlint from 10.2.1 to 10.3.0 
Bumps org.jlleitschuh.gradle.ktlint from 10.2.1 to 10.3.0.

---
updated-dependencies:
- dependency-name: org.jlleitschuh.gradle.ktlint
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-03 23:06:53 +00:00
anoloth
00cc8decdb Translated using Weblate (Lao) 
Currently translated at 100.0% (57 of 57 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/lo/
 2022-05-03 23:00:31 +00: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
John Doe
3e9636e0d3 Translated using Weblate (Spanish) 
Currently translated at 64.9% (37 of 57 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/es/
 2022-05-03 22:59:46 +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
Maxime NATUREL
3b022eee83 Adding return type description in doc of StateService 2022-05-03 15:20:06 +02:00
Maxime NATUREL
e5bb7ae5cd Return the created eventId in methods to send state events 2022-05-03 15:06:04 +02:00
Benoit Marty
2f0e4e4f3d changelog 2022-05-03 15:02:34 +02:00