Commit graph

19296 commits

Author SHA1 Message Date
Benoit Marty
1fd0fe504d Format file 2022-07-11 12:37:35 +02:00
Florian Renaud
68bd55fef5 Merge branch 'develop' into feature/fre/start_dm_on_first_msg
* develop: (156 commits)
  adding test case for showing html entities are processed
  adding tests around the event html rendering - the test helper is a little hacky in order to covert the spans to something human readable
  removing extra line
  adding changelog entry
  overriding the default list handler with an implementation that takes into account the initial starting position
  trigger CI
  Use executeTransactionAwait (need realm refresh in this case)
  Bump flipper from 0.152.0 to 0.153.0
  Use executeTransactionAwait (need realm refresh in this case)
  generating 1.4.27 changelog and updating version
  Fixing crash when sharing plain text, such as a url
  Fix crashes when opening Thread (#6463)
  Timeline: fix validation of timeline event changes
  Fix ConcurrentModificationException on BackgroundDetectionObserver
  Fix crashes when opening Thread (#6463)
  suppressing unused string resource
  Changelog
  Fix ConcurrentModificationException on BackgroundDetectionObserver
  Fix typo
  adding changelog entry
  ...
2022-07-11 12:03:24 +02:00
Cadence Ember
1572e73ba7 Fix HTML entities being displayed in messages
Initially reported in #6445. Fixes #6445.
This was a regression from #6357.

The fix is to enable Markwon's HTML entities processor.

Change-Id: I65588d6df24257851490161f4672f7461e6e5fc1
2022-07-10 17:08:13 +02:00
SpiritCroc
b165b40d70 Fix cut display names in bubbles
Fix guessing text width for bold text

Change-Id: I61d0421c1c159eb92b675166b9cbf6a4f1f609bc
2022-07-10 17:08:13 +02:00
SpiritCroc
81f0bf2a29 Increase expanded read receipts back to 5
Change-Id: I41833c23f345688bd17b2c70cbc1390d1ec8e95b
2022-07-10 17:08:13 +02:00
SpiritCroc
2179720ad5 [merge] Fix compact read receipt layout with SC bubbles
Change-Id: I7b2c1877e819a6c7a1dd7ff9404d652f17b2b878
2022-07-10 17:07:56 +02:00
SpiritCroc
c6dcaaead9 [merge] Clean up manifest leftovers from old UP implementation
Change-Id: If2a09118a830e3f930c9548d6573ed8679fc6752
2022-07-10 09:40:40 +02:00
SpiritCroc
1fdc67b47d [merge] Catch voice recorder crash on SDK 21
Better broken voice recording, than chats broken completely

Change-Id: I768c75c4853badb692ca4ab1bff3ead18fb91e05
2022-07-09 22:08:39 +02:00
SpiritCroc
a6953afc1e [merge] Disable flipper on sdk 21 to fix crash
Change-Id: I64286edca783ac83ee3531d8017e1d7209e51867
2022-07-09 21:49:15 +02:00
LinAGKar
38904cc021 Translated using Weblate (Swedish)
Currently translated at 100.0% (68 of 68 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
2022-07-09 19:32:26 +00:00
Ihor Hordiichuk
b7b1a96bc2 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (2260 of 2260 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
2022-07-09 19:32:25 +00:00
LinAGKar
b9b261a3a3 Translated using Weblate (Swedish)
Currently translated at 100.0% (2260 of 2260 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
2022-07-09 19:32:25 +00:00
Johan Smits
40949aaf7e Translated using Weblate (Dutch)
Currently translated at 100.0% (2260 of 2260 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
2022-07-09 19:32:23 +00:00
Mya Rohit
94567510ca Translated using Weblate (Bulgarian)
Currently translated at 66.6% (1507 of 2260 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/bg/
2022-07-09 19:32:22 +00:00
SpiritCroc
9ef870b927 [merge] Live location theming
Change-Id: Ia10af41b946cb5913ce6805095354d23ac3ca251
2022-07-09 21:20:25 +02:00
SpiritCroc
f96495ddbb [merge] Make live location finished message look better
Change-Id: Ie7a24e27ed048309f6168d54083a21b16e70f0b1
2022-07-09 20:17:43 +02:00
SpiritCroc
06a7154abf [merge] Cleanup leftovers from old timeline fixes
Upstream redid some timeline chunk handling, which should make these
useless

Change-Id: I14f19ecba0bc093261cb2779135ff8c744439e12
2022-07-09 19:51:18 +02:00
SpiritCroc
8df78e41ff Automatic SchildiChat string correction
Change-Id: I8361ea4c1e72a25bb1260eac322f2dc02e416e43
2022-07-09 18:16:39 +02:00
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
joshua
e5c0cacda9 Translated using Weblate (Swedish)
Currently translated at 100.0% (160 of 160 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/sv/
2022-07-09 16:05:25 +02:00
Hiajen
641541f660 Translated using Weblate (German)
Currently translated at 96.2% (154 of 160 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/de/
2022-07-09 16:05:25 +02:00
Kim Brose
946c32cdcb Translated using Weblate (German)
Currently translated at 96.2% (154 of 160 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/de/
2022-07-09 16:05:25 +02:00
metezd
5f476ac987 Translated using Weblate (Turkish)
Currently translated at 100.0% (160 of 160 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/tr/
2022-07-09 16:05:25 +02:00
metezd
a546e4bffc Added translation using Weblate (Turkish) 2022-07-09 16:05:25 +02:00
SpiritCroc
41af64c8e6 [TMP] Automatic upstream merge preparation
Change-Id: Ic181c1c7674686fc24f1e9da6765a4295598098a
2022-07-09 10:05:27 +02:00
SpiritCroc
9ab32a685e Automatic revert to unchanged upstream strings, pt.1
Change-Id: Iaf08c80500e594518e4a45f701550ab5b749adc4
2022-07-09 10:05:27 +02:00
SpiritCroc
ff6fa87acd Merge remote-tracking branch 'cloudrac3r/new-call-ringtone' into sc
Change-Id: Id4bd8074e4a7197a8f5500b6519cb24d48ead31c
2022-07-09 10:01:19 +02:00
Adam Brown
5a378383f5
Merge pull request #6454 from vector-im/feature/adm/ftue-edit-server-bug
FTUE - Homeserver edits not updating the selected server UI
2022-07-08 11:35:17 +01:00
Adam Brown
bdc370474e migrating the previous orphaned rooms settings in order to fix the inconsistent value
- only uses the previous value if the key exists, otherwise we end up defaulting to true instead of false (which the preferences screen expects)
- manually deletes the key after migrating the value
2022-07-08 11:20:49 +01:00
Adam Brown
6a2a69ada6
Merge pull request #6418 from vector-im/dependabot/gradle/lifecycle-2.5.0
Bump lifecycle from 2.4.1 to 2.5.0
2022-07-08 10:00:18 +01:00
Adam Brown
cf22a76742
Merge pull request #6473 from vector-im/feature/adm/list-initial-value
Fixing numbered lists always starting from 1
2022-07-08 09:13:30 +01:00
Nikita Epifanov
dc1ac779f1 Translated using Weblate (Russian)
Currently translated at 100.0% (68 of 68 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ru/
2022-07-07 20:32:24 +00:00
Nikita Epifanov
6acd37e457 Translated using Weblate (Russian)
Currently translated at 100.0% (2260 of 2260 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
2022-07-07 20:32:22 +00:00
Priit Jõerüüt
07f2d9b449 Translated using Weblate (Estonian)
Currently translated at 99.6% (2252 of 2260 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
2022-07-07 20:32:21 +00:00
Benoit Marty
dd5c343269 io.element.android:opusencoder:1.0.1 2022-07-07 20:34:27 +02:00
Benoit Marty
9a059ead44 Add a VectorFeatures to force usage of the library OpusEncoder 2022-07-07 18:29:02 +02:00
Benoit Marty
95f4d88461 Do not alter the app name for the nightly, and finally use initWith release to avoid too many copy paste. 2022-07-07 17:45:18 +02:00
Benoit Marty
64871e3681 Add documentation about nightly build. 2022-07-07 17:40:48 +02:00
Adam Brown
ead8cec4a6 adding test case for showing html entities are processed 2022-07-07 13:54:42 +01:00
Adam Brown
cfb1e09d64 adding tests around the event html rendering
- the test helper is a little hacky in order to covert the spans to something human readable
2022-07-07 13:47:42 +01:00
Adam Brown
a0f86d270b removing extra line 2022-07-07 13:47:42 +01:00
Adam Brown
ff2fc3e0a7 adding changelog entry 2022-07-07 13:47:42 +01:00
Adam Brown
d904ebbd70 overriding the default list handler with an implementation that takes into account the initial starting position 2022-07-07 13:47:42 +01:00
ericdecanini
051f925f0e Adds MigrateSessionTo032Test 2022-07-07 13:03:58 +01:00
Adam Brown
1ba986d45a trigger CI 2022-07-07 12:29:42 +01:00
Adam Brown
8a68b31f1b Merge branch '1.4.27-RC2' into develop 2022-07-07 11:29:49 +01:00
Benoit Marty
1659ca001d
Merge pull request #6491 from vector-im/dependabot/gradle/flipper-0.153.0
Bump flipper from 0.152.0 to 0.153.0
2022-07-07 12:28:10 +02:00
Adam Brown
7f1bcacd97 Merge branch 'hotfix/v1.4.27' into develop 2022-07-07 11:26:59 +01:00
Adam Brown
67d5289f01
Merge pull request #6462 from vector-im/feature/fga/fix_6461
Timeline: fix validation of timeline event changes
2022-07-07 11:25:33 +01:00