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
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
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
ganfra
8abae6f917
Use executeTransactionAwait (need realm refresh in this case)
2022-07-07 09:40:54 +01:00
Adam Brown
2cbb5306f9
generating 1.4.27 changelog and updating version
2022-07-06 16:11:11 +01:00
Adam Brown
310c4b4a24
Fixing crash when sharing plain text, such as a url
2022-07-06 15:20:43 +01:00
ganfra
6f74f28561
Fix crashes when opening Thread ( #6463 )
2022-07-06 15:19:40 +01:00
ganfra
6b8bbf2574
Timeline: fix validation of timeline event changes
2022-07-06 15:19:26 +01:00
Benoit Marty
41a3a07bf6
Fix ConcurrentModificationException on BackgroundDetectionObserver
2022-07-06 15:18:52 +01:00
Cadence Ember
05b3929b40
New call ringtone
...
The previous ringtone is bad and this new one is good.
Since many of Android's sounds are managed by the system, this sound
is only played while waiting for an outgoing call to connect.
The new sound is created by Ana Gelez who has graciously agreed
to distribute the ringtones under the terms of the Apache License.
https://github.com/matrix-org/matrix-react-sdk/pull/4500/files
2022-07-04 22:29:26 +12:00
ganfra
fcc1838aed
Merge branch 'release/v1.4.26' into main
2022-06-30 16:40:06 +02:00
ganfra
a9d704f273
Update CHANGES
2022-06-30 16:35:37 +02:00
ganfra
2b629f130f
Merge pull request #6428 from vector-im/feature/fga/fix_weblate
...
Feature/fga/fix weblate
2022-06-30 15:18:10 +02:00
ganfra
88346ffc68
Weblate: also clean trads
2022-06-30 14:36:52 +02:00
Benoit Marty
6608264d15
Merge pull request #6424 from vector-im/feature/bma/release_recipe
...
Replace 5 manual steps to 1 command line step
2022-06-30 14:24:14 +02:00
ganfra
4bdde101b8
Clean the TODO delete (UnusedResource not compatible with string template)
2022-06-30 12:26:51 +02:00
ganfra
6f38f9c2e6
Merge pull request #6427 from RiotTranslateBot/weblate-element-android-element-app
...
Translations update from Weblate
2022-06-30 11:55:32 +02:00
Weblate
53a8098caa
Merge branch 'origin/develop' into Weblate.
2022-06-30 09:34:40 +00:00
Benoit Marty
1556e5d078
Replace 5 manual steps to 1 command line step
2022-06-30 10:23:34 +02:00
Benoit Marty
8da88f9263
Merge pull request #6417 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.51
...
Bump libphonenumber from 8.12.50 to 8.12.51
2022-06-30 09:07:47 +02:00
ganfra
778269f831
Merge pull request #6410 from vector-im/feature/fga/load_room_members_by_chunk
...
Feature/fga/load room members by chunk
2022-06-30 08:56:43 +02:00
dependabot[bot]
5a02bca442
Bump libphonenumber from 8.12.50 to 8.12.51
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.50 to 8.12.51.
- [Release notes](https://github.com/google/libphonenumber/releases )
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md )
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.50...v8.12.51 )
---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-06-29 23:09:57 +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
LinAGKar
fabb345107
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (2239 of 2239 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
2022-06-29 19:32:19 +00:00
Nui Harime
45cb013e1a
Translated using Weblate (Russian)
...
Currently translated at 99.7% (2233 of 2239 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
2022-06-29 19:32:19 +00:00
ganfra
b446ceded8
LoadRoomMember: fix presence
2022-06-29 19:01:23 +02:00
Onuray Sahin
abea68557b
Merge pull request #6350 from vector-im/feature/ons/promote_live_location_labs_flag
...
Promote live location labs flag [PSF-959]
2022-06-29 15:26:39 +03:00
Benoit Marty
ce718d9370
Merge pull request #6408 from vector-im/dependabot/gradle/com.facebook.soloader-soloader-0.10.4
...
Bump soloader from 0.10.3 to 0.10.4
2022-06-29 13:20:40 +02:00
ganfra
1a33f6e094
Merge branch 'develop' into feature/fga/load_room_members_by_chunk
2022-06-29 11:45:52 +02:00
ganfra
7d349bdfc3
Cleanup
2022-06-29 11:38:15 +02:00
ganfra
9233007d97
LoadRoomMembers: add changelog
2022-06-29 11:37:15 +02:00
ganfra
61c5bbc444
LoadRoomMembers: handle room member event a bit more efficiently
2022-06-29 11:35:31 +02:00
ganfra
63f0cce561
LoadRoomMembers: exclude Membership.Leave
2022-06-29 11:34:43 +02:00
ganfra
3a216759a1
LoadRoomMembers: divide by chunk
2022-06-29 11:32:38 +02:00
dependabot[bot]
bbe3613aa6
Bump soloader from 0.10.3 to 0.10.4
...
Bumps [soloader](https://github.com/facebook/soloader ) from 0.10.3 to 0.10.4.
- [Release notes](https://github.com/facebook/soloader/releases )
- [Commits](https://github.com/facebook/soloader/compare/v0.10.3...v0.10.4 )
---
updated-dependencies:
- dependency-name: com.facebook.soloader:soloader
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-06-29 08:33:21 +00:00
Benoit Marty
2a32a780cf
Merge pull request #6399 from vector-im/feature/bma/flipper_version
...
Avoid multiple PR from Dependabot when Flipper is upgraded.
2022-06-29 10:32:24 +02:00
Benoit Marty
ec65267750
Merge pull request #6403 from vector-im/feature/bma/ci_no_daemon
...
Try no daemon on CI
2022-06-29 10:32:05 +02:00
Maxime NATUREL
e7a68907f9
Merge pull request #6365 from vector-im/feature/mna/start-lls-from-other-device
...
[Location sharing] - Stop any active live before starting a new one (PSF-942)
2022-06-29 09:47:26 +02:00
Maxime NATUREL
d112f860a2
Merge pull request #6356 from vector-im/fix/mna/stop-lls-from-other-device
...
[Location sharing] - Make stop of a live from another device possible (PSF-1060)
2022-06-29 09:45:44 +02:00
Adam Brown
1a986e7437
Merge pull request #6385 from vector-im/dependabot/gradle/com.autonomousapps.dependency-analysis-1.9.0
...
Bump com.autonomousapps.dependency-analysis from 1.8.0 to 1.9.0
2022-06-28 19:16:25 +01:00