SpiritCroc
dec61e7a35
Merge tag 'v1.4.28' into merge-v1.4.28
...
Change-Id: I623898b2034f132f23d2ac2dfeedb02fee16cd10
Conflicts:
fastlane/README.md
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.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/action/MessageActionsViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.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/RoomListViewState.kt
vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
2022-07-17 18:52:55 +02:00
Adam Brown
257f41dbf1
Merge pull request #6471 from vector-im/feature/adm/sharing-tests
...
Adding tests around the share intent handling
2022-07-13 10:12:09 +01:00
Florian Renaud
fca4df3522
Revert "Ensure that Realm is up to date before returning the roomId"
...
This reverts commit 8a5a47c6a5
2022-07-11 16:44:32 +02:00
Florian Renaud
fdb9ed80d4
Change method visibility
2022-07-11 16:22:49 +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
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
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
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
Adam Brown
3e770f9efa
Merge pull request #6474 from vector-im/feature/fga/fix_6463
...
Fix crashes when opening Thread (#6463 )
2022-07-07 11:12:28 +01:00
ganfra
8abae6f917
Use executeTransactionAwait (need realm refresh in this case)
2022-07-07 09:40:54 +01:00
ganfra
19fc97ba0f
Use executeTransactionAwait (need realm refresh in this case)
2022-07-06 19:33:34 +02:00
Adam Brown
2cbb5306f9
generating 1.4.27 changelog and updating version
2022-07-06 16:11:11 +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
Adam Brown
169ac9d0a0
updating the known SDK mimetypes and making use of them for the intent switches
2022-07-06 12:06:17 +01:00
ganfra
0743140973
Fix crashes when opening Thread ( #6463 )
2022-07-05 17:00:01 +02:00
Benoit Marty
b847d8cf36
Fix ConcurrentModificationException on BackgroundDetectionObserver
2022-07-05 12:06:49 +02:00
ganfra
f58ba13ef0
Timeline: fix validation of timeline event changes
2022-07-05 10:41:22 +02:00
Florian Renaud
414dc52f7d
Fix copyright date
2022-07-04 18:03:43 +02:00
Florian Renaud
2b6bfc1ebc
Create local events using local echo
2022-07-04 18:00:30 +02:00
Florian Renaud
e89bb0eea7
Set local room members as loaded
2022-07-04 17:53:21 +02:00
Florian Renaud
0d9cd2b3a3
Delete local room related entities with cascade
2022-07-04 17:47:48 +02:00
Florian Renaud
f4b50f1e0f
Fix logs when deleting local room
2022-07-04 17:41:00 +02:00
Florian Renaud
8a5a47c6a5
Ensure that Realm is up to date before returning the roomId
2022-07-04 17:38:32 +02:00
Valere
8dc57fe2f0
Merge pull request #5853 from vector-im/feature/aris/crypto_share_room_keys_past_messages
...
Share Megolm session keys when inviting a new user
2022-07-01 17:33:43 +02:00
Eric Decanini
bdb49f5946
Merge pull request #5398 from vector-im/bugfix/eric/softlogout-ux-broken
...
Fixes broken SoftLogout UX for homeservers that support both Password and SSO
2022-07-01 15:52:48 +01:00
Valere
d281f9dde5
use XXX not TODO
2022-07-01 16:07:03 +02:00
Maxime NATUREL
d5b375e82b
Merge pull request #6414 from vector-im/feature/mna/reply-to-lls
...
[Location sharing] - Reply action on a live message (PSG-343)
2022-07-01 16:03:02 +02:00
Valere
6fd99dc302
resist ConnectivityManager$TooManyRequestsException
2022-07-01 15:56:03 +02:00
Valere
90a4e71b06
update flacky test
2022-07-01 14:30:21 +02:00
Maxime NATUREL
f5e33ca980
Fix unit tests
2022-07-01 14:27:10 +02:00
Valere
08cb6de83d
Fix migration
2022-07-01 11:08:35 +02:00
Florian Renaud
0dad4cb02a
Set current ts for local events age
2022-07-01 09:57:45 +02:00
Valere
fb5f0cbd00
Fix test compilation
2022-07-01 09:43:17 +02:00
Valere
e7322e8524
outdated configuration
2022-07-01 09:43:17 +02:00
Valere
5a67c39c7f
reuse code for test
2022-07-01 09:43:17 +02:00
Valere
a885ff5e47
Fix test
2022-07-01 09:43:17 +02:00
Valere
b0907de582
Fix migration
2022-07-01 09:43:17 +02:00
Valere
ddd82441bd
kdoc
2022-07-01 09:43:17 +02:00
Valere
8e829c6aad
Add lab flag and more tests
2022-07-01 09:43:17 +02:00
Valere
d9fb58fbcb
Fix tests
2022-07-01 09:42:31 +02:00
Valere
f64adeba7f
fix bad sender key export
2022-07-01 09:42:31 +02:00
Valere
34145f0374
post rebase fix
2022-07-01 09:42:31 +02:00
ariskotsomitopoulos
df241dbdb8
Fix broken unit test
2022-07-01 09:42:31 +02:00
ariskotsomitopoulos
010cf540b6
Fix broken unit test
2022-07-01 09:42:31 +02:00
ariskotsomitopoulos
55fdff4242
Resolve merge conflicts
2022-07-01 09:42:31 +02:00
ariskotsomitopoulos
d3a516b05d
Enhance key sharing to respect matrix configuration
2022-07-01 09:42:31 +02:00
ariskotsomitopoulos
a9a7400fef
Add MXCryptoConfig flag for key history sharing
...
Add shared_history flag to sessionBackupData
2022-07-01 09:42:31 +02:00
Valere
fb352ffa38
quick format
2022-07-01 09:42:31 +02:00
