SpiritCroc
f5afdefe2f
Merge tag 'v1.4.4' into sc
...
Change-Id: Ibfb35ec30a51abebb652044719417f62c8a6be50
Conflicts:
library/ui-styles/src/main/res/values/dimens.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
vector/src/main/res/drawable/bg_unread_notification.xml
vector/src/main/res/drawable/ic_add_reaction_small.xml
vector/src/main/res/layout/item_room.xml
vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
vector/src/main/res/xml/vector_settings_preferences.xml
2022-03-10 13:26:09 +01:00
Benoit Marty
d83d5f9828
Merge pull request #5467 from vector-im/feature/bma/unused_resources_all
...
Remove unused resources
2022-03-10 13:03:27 +01:00
SpiritCroc
7bfd3c8dca
[TMP] Add some debugging to detect timeline inconsistencies
...
Note: may affect performance a little when loading the timeline, so
better revert when we are confident we have fixed the issue.
Change-Id: Ic4d31e47948984371a02ce51af7a8d56cb120234
2022-03-10 12:36:00 +01:00
Onuray Sahin
fd3e5128c7
Test initial poll event.
2022-03-10 14:30:03 +03:00
ericdecanini
a891f59397
Replaces lateinit var with passing params
2022-03-10 12:02:25 +01:00
ariskotsomitopoulos
21111922e6
Merge branch 'develop' into feature/aris/thread_live_thread_list
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
2022-03-10 12:55:13 +02:00
ariskotsomitopoulos
fd30d38603
Fix line length
2022-03-10 12:51:40 +02:00
Benoit Marty
ce4ad8819a
Merge pull request #5380 from vector-im/feature/bca/crypto_fix_rolling_uisi
...
Refactoring for safer olm and megolm session usage
2022-03-10 11:13:07 +01:00
ariskotsomitopoulos
45ee9f85e5
Check if the server supports MSC3440 using the stable flag from /versions api
2022-03-10 12:07:05 +02:00
ariskotsomitopoulos
03f293f216
Remove io.element.thread and add stable m.thread prefix
2022-03-10 12:06:02 +02:00
Adam Brown
d3fc3791bc
Merge branch 'main' into develop
2022-03-09 21:33:16 +00:00
ariskotsomitopoulos
92c1bc944d
Fix realm crash on v1.4.4
2022-03-09 20:03:42 +02:00
ericdecanini
2f706d6fae
Replaces children state event room id with space id
2022-03-09 18:42:35 +01:00
ericdecanini
f76f73f8ad
Refactors DefaultSpaceService querySpaceChildren
2022-03-09 18:36:56 +01:00
SpiritCroc
2498da3631
Fix updating unread marker if not to latest chunk
...
SetReadMarkerTask was not updating the read marker when both the old and
the new fully read eventId weren't in the last chunk, even when the new
one was after the first one.
Change-Id: I175b335cf90328f676238ca23e45aa0f91b269c9
2022-03-09 18:07:38 +01:00
Adam Brown
60bc3b09b7
updating to version 1.4.6 in prep for next release cycle
2022-03-09 16:03:00 +00:00
ericdecanini
bbc6e8bbce
Replaces caught Exception with HttpException
2022-03-09 16:41:18 +01:00
Benoit Marty
3f17cf595f
Remove unused resources
2022-03-09 14:55:40 +01:00
Benoit Marty
7d78c8819c
Ignore some other lint warnings
2022-03-09 14:40:59 +01:00
Benoit Marty
cbdc28dd9b
Merge pull request #5457 from vector-im/michaelk/ignore_flaky_test
...
Ignore flaky VerificationTest
2022-03-09 12:18:55 +01:00
ericdecanini
047e767f34
Adds coroutinesTest to matrix sdk gradle
2022-03-09 12:18:46 +01:00
Benoit Marty
02ba09900f
Merge pull request #5434 from vector-im/feature/nfe/space_unread_count_dm
...
include dms number in space unread number badge
2022-03-09 11:16:07 +01:00
ericdecanini
63cd79dc4f
Removes debug logs
2022-03-09 10:53:18 +01:00
Benoit Marty
20c1886fed
Support both unstable and stable prefixes.
...
Author: Onuray
2022-03-09 10:40:43 +01:00
ericdecanini
fb374b7374
Fixes wrong path parameter in getSpaceHierarchy
2022-03-09 09:57:20 +01:00
Valere
96b51744b6
Fix ktlint
2022-03-08 23:19:21 +01:00
ericdecanini
31f300c724
Adds error print stack trace
2022-03-08 21:32:13 +01:00
SpiritCroc
430963ae28
Fix missing messages when forward paging with chunks > 50 messages
...
- offsets() was not limiting in the right direction when loading
messages forwards
- after fixing offsets(), more recent messages would not be loaded due
to the isLastForward() check, so better prioritize the SUCCESS
LoadMoreResult over the REACHED_END here
Change-Id: I48011adc57ff2d48bb7be37cb4dda8bd8f745bf8
2022-03-08 18:29:21 +01:00
ericdecanini
54828f76cf
Adds slash to v1 prefix path
2022-03-08 17:26:01 +01:00
ericdecanini
0892525c84
Adds debug logs
2022-03-08 17:19:11 +01:00
ericdecanini
82b5fc9557
Removes unused imports
2022-03-08 16:50:49 +01:00
ariskotsomitopoulos
a53d5bdba2
Remove eventType from /relations api for threads
2022-03-08 16:41:38 +02:00
ericdecanini
eb46067c08
Changes caught exception type to Throwable
2022-03-08 15:40:13 +01:00
Michael Kaye
67c9584215
Ignore flaky VerificationTest
2022-03-08 14:08:30 +00:00
ariskotsomitopoulos
8c6902aa23
Fix reply within thread edition
2022-03-08 14:50:27 +02:00
ericdecanini
e5299d716c
Fixes legal comments
2022-03-08 13:15:26 +01:00
ericdecanini
0af6ae6075
Adds logic for using stable and unstable hierarchy endpoints
2022-03-08 13:10:18 +01:00
Onuray Sahin
7a1d3aa3f2
Filter poll response events in latest event query.
2022-03-08 14:07:14 +03:00
ericdecanini
bc3b8d0a16
Adds testing for fallback api
2022-03-08 11:51:17 +01:00
Michael Kaye
ab3f3fba68
Attempt to prevent the deprecated warning/error about Provider usage.
2022-03-08 10:38:23 +00:00
Michael Kaye
fb05731bb9
If no identity server configured, log at info, not warn.
2022-03-08 10:12:13 +00:00
SpiritCroc
768262094c
Fix missing messages when forward paging with chunks > 50 messages
...
- offsets() was not limiting in the right direction when loading
messages forwards
- after fixing offsets(), more recent messages would not be loaded due
to the isLastForward() check, so better prioritize the SUCCESS
LoadMoreResult over the REACHED_END here
2022-03-08 10:54:27 +01:00
ariskotsomitopoulos
557fd7eacf
Replace thread timeline and thread summaries EventInsertType from INCREMENTAL_SYNC to PAGINATION
2022-03-08 10:13:56 +02:00
ericdecanini
3b0a565822
Changes room hierarchy endpoint
2022-03-07 16:51:40 +01:00
Michael Kaye
1569c2f3c7
Missing import of at-Ignore annotation.
2022-03-07 14:46:01 +00:00
Michael Kaye
f32da28285
Ignore ThreadMessagingTest as it seems to cause other integration tests to fail.
2022-03-07 13:14:38 +00:00
NIkita Fedrunov
a3dcee55e4
include dms number in space unread number badge
2022-03-07 08:35:53 +01:00
ariskotsomitopoulos
d19dd91d67
Format code
2022-03-05 20:49:11 +02:00
ariskotsomitopoulos
bce5bc8389
Fix wrong versioning regex pattern
...
Add MSC3440 support using /version/ and /capabilities
2022-03-05 17:13:02 +02:00
Valere
3c931d6f6d
Save valid backup key before downloading keys
2022-03-04 19:21:19 +01:00
Valere
db84c679b4
Code review cleaning
2022-03-04 19:21:19 +01:00
Valere
99a07af9de
Better comment
...
Co-authored-by: poljar <poljar@termina.org.uk>
2022-03-04 19:21:19 +01:00
Valere
31d3fe38aa
Better comment
...
Co-authored-by: poljar <poljar@termina.org.uk>
2022-03-04 19:21:19 +01:00
Valere
7616e2d14c
better comment
...
Co-authored-by: poljar <poljar@termina.org.uk>
2022-03-04 19:21:19 +01:00
Valere
5d952feef9
code review cleaning
2022-03-04 19:21:19 +01:00
Valere
ada83d0ba6
fix test
2022-03-04 19:21:19 +01:00
Valere
714e1d79b7
clean log level
2022-03-04 19:21:19 +01:00
Valere
6546f98858
use mutex on suspend and not synchronized
2022-03-04 19:21:19 +01:00
Valere
49d33f3a4b
avoid duplicate userId on key download
2022-03-04 19:21:19 +01:00
Valere
87de51b184
Use loggerTag
2022-03-04 19:21:19 +01:00
Valere
b7bf39b99a
resurrect unwedge test + cleaning
2022-03-04 19:21:19 +01:00
Valere
078ed1b2d1
dispatch network calls to io
2022-03-04 19:21:19 +01:00
Valere
f238739438
Clean ensure olm, fix unwedging, better logs
2022-03-04 19:21:19 +01:00
Valere
2d9beb67b4
extract test to dedicated class
2022-03-04 19:21:19 +01:00
Valere
122e785f14
clean test
2022-03-04 19:21:19 +01:00
Valere
2f665dd08f
cleaning
2022-03-04 19:21:19 +01:00
Valere
11e888162c
test forward better key
2022-03-04 19:21:19 +01:00
Valere
9eb0473d74
better logs
2022-03-04 19:21:19 +01:00
Valere
ade16a0aa1
protect race on prekey + logs
2022-03-04 19:21:19 +01:00
Valere
9b3c5d2153
Improve inbound group session cache + mutex
2022-03-04 19:21:19 +01:00
Valere
c97de48474
Added e2ee sanity tests
2022-03-04 19:21:19 +01:00
Valere
24c51ea41a
Clean megolm import code
2022-03-04 19:21:19 +01:00
Valere
87d930819a
Fix test compilation
2022-03-04 19:21:19 +01:00
Valere
9df5f17132
protect olm account access
2022-03-04 19:21:19 +01:00
Valere
33f9bc52cb
Protect olm session from concurrent access
2022-03-04 19:21:19 +01:00
Valere
10ea166b2a
Extract olm cache store
2022-03-04 19:21:19 +01:00
SpiritCroc
2f5df9133f
Merge tag 'v1.4.2' into sc
...
Change-Id: I8a96211645ff31284897d818ce93c7b5571fbd0f
Conflicts:
library/ui-styles/src/main/res/values/styles_timeline.xml
library/ui-styles/src/main/res/values/theme_black.xml
library/ui-styles/src/main/res/values/theme_dark.xml
library/ui-styles/src/main/res/values/theme_light.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.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/timeline/TimelineEventController.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/MessageInformationDataFactory.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
vector/src/main/java/im/vector/app/features/html/PillImageSpan.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/res/layout/item_room.xml
vector/src/main/res/values/config.xml
2022-03-04 11:42:30 +01:00
ClaireG
2a9e582db5
Merge pull request #5405 from vector-im/cgizard/ISSUE-5402
...
[Create private room] Picture doesn't not displayed
2022-03-03 22:40:26 +01:00
ariskotsomitopoulos
daafddbe71
fix Realm crash
2022-03-03 19:10:40 +02:00
ariskotsomitopoulos
39bd437f75
Temp fix Realm crash
2022-03-03 17:04:08 +02:00
ariskotsomitopoulos
e4282e5f29
Merge branch 'develop' into feature/aris/thread_live_thread_list
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
2022-03-03 13:56:59 +02:00
ariskotsomitopoulos
719e254bb4
Format Code
2022-03-03 13:51:41 +02:00
ariskotsomitopoulos
33b170077e
force refresh home server capabilities
2022-03-03 13:49:53 +02:00
ariskotsomitopoulos
623e9257a5
Merge branch 'feature/aris/thread_live_thread_list' into feature/aris/threads_analytics
2022-03-03 12:56:12 +02:00
Benoit Marty
dd0d2e8101
Merge pull request #5383 from vector-im/dependabot/gradle/com.google.android.gms-oss-licenses-plugin-0.10.5
...
Bump oss-licenses-plugin from 0.10.4 to 0.10.5 - REQUIRE HUMAN INTERVENTION
2022-03-03 11:55:00 +01:00
SpiritCroc
20ba02db57
[TMP] Raise sync logging level
...
So we get these in rageshakes
Change-Id: I1efb8dd759cd03607ade0611c92a87df1b20c7f3
2022-03-03 08:55:34 +01:00
Benoit Marty
4396390409
Fix lint error (false positive, but anyway, not used)
2022-03-02 22:14:54 +01:00
ariskotsomitopoulos
214e0efcd9
Add Markdown support to thread summaries and thread list
2022-03-02 13:47:08 +02:00
Tiago Loureiro
ad8809196f
Fix overflow on media cache size
2022-03-01 13:12:46 -03:00
Filip Rakić
1216dde9c5
ignore KeysBackup tests
2022-03-01 13:16:01 +01:00
Benoit Marty
9cc35644a3
Merge pull request #5379 from vector-im/feature/aris/cleanup_threads_build_config
...
Cleanup enabling threads from buildConfig
2022-02-28 21:10:20 +01:00
Benoit Marty
71aac37ec7
Merge pull request #5330 from vector-im/feature/fga/more_realm_fixing
...
Feature/fga/more realm fixing
2022-02-28 21:02:10 +01:00
ariskotsomitopoulos
ae98185c9d
Cleanup enabling threads from buildConfig
2022-02-28 17:39:40 +02:00
ariskotsomitopoulos
e59f2bba0a
Add analytics to threads
2022-02-28 17:13:06 +02:00
ariskotsomitopoulos
eda723c230
Remove fetching thread summaries when homeserver do not support MSC3440
2022-02-28 12:35:27 +02:00
dependabot[bot]
ca56865dd1
Bump libphonenumber from 8.12.43 to 8.12.44
...
Bumps [libphonenumber](https://github.com/google/libphonenumber ) from 8.12.43 to 8.12.44.
- [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.43...v8.12.44 )
---
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-02-24 23:10:16 +00:00
Benoit Marty
ca8b69e377
Use correct copyright
2022-02-24 14:20:48 +01:00
ariskotsomitopoulos
8b254212af
Merge branch 'develop' into feature/aris/thread_live_thread_list
2022-02-24 12:45:08 +02:00
ganfra
f7c79a6de2
Realm: fix remaining frozen result
2022-02-23 18:02:02 +01:00
ganfra
beeee7c84b
Realm: avoid opening realm if not necessary in ReadReceiptsSummaryMapper
2022-02-23 18:01:19 +01:00
ganfra
fb2ed9a7ac
Rename getTimeLine to getTimeline to align naming. Also create TimelineEventDataSource.
2022-02-23 18:00:31 +01:00
Erik Johnston
7997435003
Also record `next_batch`
2022-02-23 11:23:05 +00:00
Erik Johnston
6105d7bea9
Log `since` token when doing an incremental sync
...
This aids debugging when `/sync` does something weird server side. Since we already log a line each time we do an incremental sync this shouldn't cause a problem.
2022-02-23 10:22:03 +00:00
Benoit Marty
cc77afbf66
Version++
2022-02-22 21:33:20 +01:00
Benoit Marty
ed80fe517d
Revert recent change to fix a crash
...
`readReceiptsSummaryEntity.realm` is null
2022-02-22 21:06:41 +01:00
ariskotsomitopoulos
79c97ac512
Formating code
2022-02-22 20:59:22 +02:00
ariskotsomitopoulos
f7f363ce25
Fix wrong copyrights
2022-02-22 20:52:01 +02:00
ariskotsomitopoulos
2054c577f3
Fix quality check errors
2022-02-22 17:41:54 +02:00
ganfra
4cc80162ca
Clean and add Changelog
2022-02-22 14:23:45 +01:00
ganfra
80d19fa497
Realm transactions: use Realm.WRITE_EXECUTOR (and use in Create/Join Room tasks)
2022-02-22 13:00:22 +01:00
ariskotsomitopoulos
9953d0d0ed
Resolve realm migration conflicts
2022-02-22 13:57:43 +02:00
ganfra
d27acfa64f
Read receipts: use RoomMember instead of User and avoid creating realm instance each time
2022-02-22 12:45:54 +01:00
ganfra
fcca75ee23
Realm: remove usage of freeze as it was not necessary (unique thread)
2022-02-22 12:45:10 +01:00
ariskotsomitopoulos
deb86d2e87
Resolve real migration conflicts
2022-02-22 13:18:09 +02:00
ariskotsomitopoulos
79a231f1dc
Merge branch 'develop' into feature/aris/thread_live_thread_list
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
2022-02-22 12:52:55 +02:00
Benoit Marty
95c00a1cce
Udpate comment
2022-02-21 17:52:26 +01:00
ariskotsomitopoulos
2b740a1ab6
Implement permalink support for /relations live thread timeline
2022-02-21 17:23:17 +02:00
ariskotsomitopoulos
f4f48b919e
Improve home server capabilities for threads
2022-02-21 12:14:51 +02:00
SpiritCroc
ecd28447c9
Merge tag 'v1.4.0' into sc
...
Change-Id: If953d524434cd8a7073a16014f4ec6850b72a226
Conflicts:
library/ui-styles/src/main/res/values/styles_timeline.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/media/PreviewUrlData.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.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/TimelineEventController.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/MessageInformationDataFactory.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.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/MessageBlockCodeItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.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/RoomListDisplayModeFilter.kt
vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
vector/src/main/res/drawable/ic_filter.xml
vector/src/main/res/layout/fragment_qr_code_scanner_with_button.xml
vector/src/main/res/layout/fragment_timeline.xml
vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
vector/src/main/res/layout/item_timeline_event_base.xml
vector/src/main/res/layout/item_timeline_event_file_stub.xml
vector/src/main/res/layout/item_timeline_event_notice_stub.xml
vector/src/main/res/layout/item_timeline_event_voice_stub.xml
vector/src/main/res/layout/view_voice_message_recorder.xml
vector/src/main/res/menu/menu_timeline.xml
2022-02-19 10:55:47 +01:00
ariskotsomitopoulos
83088bbe5a
Introduce live thread summaries using the enhanced /messages API from MSC 3440
...
Add capabilities to support local thread list to not supported servers
2022-02-18 17:21:10 +02:00
Valere
48fffc3dcf
Code review
2022-02-18 10:08:44 +01:00
Valere
3702ccd2ba
Defensive coding to ensure encryption when room was once e2e
2022-02-18 10:01:09 +01:00
Benoit Marty
d1d26a98af
Merge pull request #5237 from vector-im/feature/mna/5123-room-tag-suggestion
...
#5123 : @room tag suggestion
2022-02-17 15:40:54 +01:00
Benoit Marty
ac9f138fc0
Merge pull request #5185 from vector-im/feature/adm/decouple-matrix-creation
...
Decoupling Matrix creation from Application
2022-02-17 15:35:09 +01:00
Maxime Naturel
0a87486f65
Removing TODO
2022-02-17 14:19:17 +01:00
Maxime Naturel
10d196596c
Unmocking check of permission to notify room
2022-02-17 11:23:00 +01:00
Maxime Naturel
49596dcea3
Mocking check of permission to notify room
2022-02-17 11:23:00 +01:00
Maxime Naturel
fb2401d0b1
Fixing parsing of outcoming messages for @room chip (missing incoming messages)
2022-02-17 11:23:00 +01:00
Maxime Naturel
82ac302843
Fixing avatar name when there is no room picture
2022-02-17 11:22:59 +01:00
Maxime Naturel
d8e28d7be9
Adding autocomplete for @room (missing correct first letter of avatar)
2022-02-17 11:22:59 +01:00
Maxime Naturel
38fdfb27e4
Creating sealed wrapper class for member items
2022-02-17 11:22:59 +01:00
Maxime Naturel
2d38786d02
Adding TODOs
2022-02-17 11:22:59 +01:00
Adam Brown
343b8bf08d
Incrementing schema version - fixes pre-release launch crash ( #5245 )
...
* updating the schema version to 25 to reflect the latest migration
* adding changelog entry
2022-02-16 12:29:08 +00:00
Adam Brown
5b851f1cb7
suppressing deprecated warning on an unused method
2022-02-14 16:33:35 +00:00
Adam Brown
8e0f5802f9
Merge branch 'feature/adm/decouple-matrix-creation' of github.com:vector-im/element-android into feature/adm/decouple-matrix-creation
2022-02-14 16:05:00 +00:00
Adam Brown
95df3e7e2b
deprecating the Matrix.initialize and Matrix.getInstance entry points in favour of clients controlling their own instances
2022-02-14 16:04:47 +00:00
Adam Brown
d05af1cb04
providing more alternatives when Matrix.getInstance fails
2022-02-14 15:54:05 +00:00
ariskotsomitopoulos
830c38f50b
format ktlint
2022-02-14 16:53:29 +02:00
ariskotsomitopoulos
e9e5d680a1
Fix realm migration from 25 to 26
2022-02-14 16:51:56 +02:00
ariskotsomitopoulos
f98b595d85
Merge branch 'develop' into feature/aris/threads_live_timeline
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo025.kt
2022-02-14 16:13:51 +02:00
Adam Brown
2eb417ab05
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
...
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-02-14 13:41:40 +00:00
Adam Brown
2f7f86b8bb
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
...
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-02-14 13:41:27 +00:00
ariskotsomitopoulos
27bc43c24c
Fix realm migration
2022-02-14 15:33:51 +02:00
Benoit Marty
43d6a29ff3
Merge pull request #5208 from vector-im/feature/adm/personalisation-capabilities
...
MSC3283 - Supporting additional homeserver capabilities
2022-02-14 14:27:26 +01:00
ariskotsomitopoulos
f1b11df781
Merge branch 'develop' into feature/aris/threads_live_timeline
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
2022-02-14 15:17:55 +02:00
ariskotsomitopoulos
83d937b842
format ktlint
2022-02-14 15:10:30 +02:00
ariskotsomitopoulos
49b7726ac8
- Integrate /relations API to create a live thread timeline
2022-02-14 15:09:01 +02:00
Adam Brown
fd2d9287e7
creating separate creator for the matrix instance to avoid ambiguous non singleton/duplicated singleton usages
...
- also documents the static methods
2022-02-14 12:46:16 +00:00
Adam Brown
fed549f647
reusing refresh extension
2022-02-14 12:05:57 +00:00
Adam Brown
4519dec7eb
scheduling a refresh of the homeserver capabilities on introduction of new fields
2022-02-14 12:05:44 +00:00