Commit graph

703 commits

Author SHA1 Message Date
SpiritCroc
ac1f10daf3 Automatic upstream merge postprocessing
Change-Id: I6379ec2eb0f06acf06de29d307d2fdb8f7ed93e8
2022-07-09 18:16:38 +02:00
SpiritCroc
204e111c1c Merge tag 'v1.4.27-RC2' into merge-v1.4.27
Change-Id: I6fba3a97a37a4e0a908289272ea9dec2efc85d00

Conflicts:
	.gitignore
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.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/database/helper/ChunkEntityHelper.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.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/TimelineChunk.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.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/session/sync/handler/room/RoomSyncHandler.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/RoomSyncAccountDataHandler.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/database/RealmMigrator.kt
	tmp_sc_fastlane/README.md
	vector-config/src/main/res/values/config.xml
	vector/build.gradle
	vector/src/fdroid/AndroidManifest.xml
	vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/fdroid/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
	vector/src/gplay/AndroidManifest.xml
	vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.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/pushers/VectorMessagingReceiver.kt
	vector/src/main/java/im/vector/app/core/receiver/KeepInternalDistributor.kt
	vector/src/main/java/im/vector/app/core/receiver/OnApplicationUpgradeOrRebootReceiver.kt
	vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiPresenter.kt
	vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnNewMessageCallback.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.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/MergedHeaderItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.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/detail/timeline/url/PreviewUrlView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/ChronologicalRoomComparator.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt
	vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
	vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
	vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushFromPushGateway.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
	vector/src/main/res/xml/vector_settings_notifications.xml
2022-07-09 18:16:33 +02:00
SpiritCroc
41af64c8e6 [TMP] Automatic upstream merge preparation
Change-Id: Ic181c1c7674686fc24f1e9da6765a4295598098a
2022-07-09 10:05:27 +02:00
Adam Brown
2cbb5306f9 generating 1.4.27 changelog and updating version 2022-07-06 16:11:11 +01:00
ganfra
a9d704f273 Update CHANGES 2022-06-30 16:35:37 +02:00
Weblate
53a8098caa Merge branch 'origin/develop' into Weblate. 2022-06-30 09:34:40 +00:00
random
a903a19d2d Translated using Weblate (Italian)
Currently translated at 100.0% (64 of 64 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
2022-06-29 19:32:22 +00:00
LinAGKar
fb2505fcfe Translated using Weblate (Swedish)
Currently translated at 100.0% (64 of 64 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
2022-06-29 19:32:21 +00:00
Benoit Marty
95969253b5 Prepare hotfix 1.4.25 2022-06-27 14:50:05 +02:00
Noômen Ben Hassin
5c64724bf8 Translated using Weblate (Italian)
Currently translated at 95.3% (61 of 64 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
2022-06-27 02:32:24 +00:00
Ihor Hordiichuk
b956615a23 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (64 of 64 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
2022-06-27 02:32:22 +00:00
Glandos
20d96eda85 Translated using Weblate (French)
Currently translated at 100.0% (64 of 64 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
2022-06-25 11:32:18 +00:00
Adam Brown
8ada26529a updating version for 1.4.24 hotfix
- is a hotfix for 1.4.22
2022-06-22 12:37:17 +01:00
Adam Brown
9ddded4996 generating 1.4.23 changelog 2022-06-21 14:56:33 +01:00
SpiritCroc
07e4581021 Increment version
Change-Id: Idb782d175f5e306af91b57290cea16bc1dbc0d26
2022-06-17 13:25:29 +02:00
Linerly
7dbe472e79 Translated using Weblate (Indonesian)
Currently translated at 100.0% (64 of 64 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/id/
2022-06-16 04:32:25 +00:00
waclaw66
135d879038 Translated using Weblate (Czech)
Currently translated at 100.0% (64 of 64 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
2022-06-16 04:32:24 +00:00
Jeff Huang
49b8c6f946 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (64 of 64 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
2022-06-16 04:32:22 +00:00
Danial Behzadi
42272c7067 Translated using Weblate (Persian)
Currently translated at 100.0% (64 of 64 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
2022-06-16 04:32:21 +00:00
Priit Jõerüüt
baefec80a0 Translated using Weblate (Estonian)
Currently translated at 100.0% (64 of 64 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
2022-06-16 04:32:20 +00:00
Ihor Hordiichuk
9577be02bc Translated using Weblate (Ukrainian)
Currently translated at 100.0% (64 of 64 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
2022-06-16 04:32:19 +00:00
Jozef Gaal
34e4a082c2 Translated using Weblate (Slovak)
Currently translated at 100.0% (64 of 64 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sk/
2022-06-16 04:32:18 +00:00
lvre
73f3f68eff Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (64 of 64 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
2022-06-16 04:32:17 +00:00
Adam Brown
8cee066ba3 generating 1.4.22 changelog 2022-06-14 15:11:33 +01:00
Adam Brown
10eebff8a6 updating generated fastlane readme 2022-06-14 12:45:52 +01:00
Weblate
ba0c7abfc5 Merge branch 'origin/develop' into Weblate. 2022-06-14 09:56:35 +00:00
SpiritCroc
5bce0e1300 Automatic upstream merge postprocessing
Change-Id: Id7304f3ef6101969915853b88b0a06a596548295
2022-06-14 10:14:05 +02:00
SpiritCroc
ff65f2d704 Merge tag 'v1.4.20' into sc
Change-Id: I8d93dd3caa86ff7c68aacbd037dca60591ec254c
2022-06-14 10:06:37 +02:00
SpiritCroc
4778d7cb5b [TMP] Automatic upstream merge preparation
Change-Id: Icf897adc9be76c7d19e4ee8bd1369c6532d0852d
2022-06-14 10:05:26 +02:00
Yaron Shahrabani
e08a78b396 Translated using Weblate (Hebrew)
Currently translated at 9.8% (6 of 61 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/he/
2022-06-13 12:32:13 +00:00
Benoit Marty
4fa8e70276 Prepare hotfix 1.4.20 2022-06-13 12:37:39 +02:00
rebok dev
890cc72ea3 Translated using Weblate (Polish)
Currently translated at 77.0% (47 of 61 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pl/
2022-06-09 13:32:12 +00:00
Benoit Marty
b2f67f971b Prepare v1.4.19 2022-06-07 15:11:46 +02:00
Glandos
7acd917a2f Translated using Weblate (French)
Currently translated at 100.0% (61 of 61 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
2022-06-07 08:32:36 +00:00
Linerly
89b2753c7d Translated using Weblate (Indonesian)
Currently translated at 100.0% (61 of 61 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/id/
2022-06-02 09:32:40 +00:00
waclaw66
cb2562da08 Translated using Weblate (Czech)
Currently translated at 100.0% (61 of 61 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
2022-06-02 09:32:39 +00:00
Jeff Huang
0e7167d2c7 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (61 of 61 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
2022-06-02 09:32:37 +00:00
Danial Behzadi
b85e17ad1a Translated using Weblate (Persian)
Currently translated at 100.0% (61 of 61 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
2022-06-02 09:32:36 +00:00
random
bcd5269414 Translated using Weblate (Italian)
Currently translated at 100.0% (61 of 61 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
2022-06-02 09:32:34 +00:00
Priit Jõerüüt
98938251ee Translated using Weblate (Estonian)
Currently translated at 100.0% (61 of 61 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
2022-06-02 09:32:33 +00:00
Ihor Hordiichuk
5fb801b480 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (61 of 61 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
2022-06-02 09:32:31 +00:00
LinAGKar
dbed8eb8e7 Translated using Weblate (Swedish)
Currently translated at 100.0% (61 of 61 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
2022-06-02 09:32:29 +00:00
Jozef Gaal
f75be10bd3 Translated using Weblate (Slovak)
Currently translated at 100.0% (61 of 61 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sk/
2022-06-02 09:32:27 +00:00
lvre
f036bb653e Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (61 of 61 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
2022-06-02 09:32:26 +00:00
Benoit Marty
bd970505f1 Fastlane 2022-05-31 17:56:19 +02:00
Benoit Marty
19fa2f273d Rename folder to please the PlayStore. 2022-05-31 16:47:59 +02:00
Weblate
7f59efb876 Merge branch 'origin/develop' into Weblate. 2022-05-31 08:04:30 +00:00
Anderson Ivanovich
ddd9749177 Translated using Weblate (Tamil)
Currently translated at 5.0% (3 of 60 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ta/
2022-05-27 08:32:07 +00:00
SpiritCroc
086d9c08ff Increment version
Change-Id: If221cd37b10e6510ce1bc9f65de9b44c27951e70
2022-05-27 09:17:20 +02:00
Glandos
897d28bb03 Translated using Weblate (French)
Currently translated at 100.0% (60 of 60 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
2022-05-26 07:32:13 +00:00