mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-29 06:28:45 +03:00
Code Issues Projects Releases Packages Wiki Activity
17806 commits 6 branches 120 tags 229 MiB
Commit graph

5152 commits

Author SHA1 Message Date
SpiritCroc
3058ee8f9e Add more sync logging 
It looks like we're spending some time in the untimed area of the sync

Change-Id: Ifa0fcccf5da74a72ab2b10491114a8a14a94a7ab
 2022-06-14 18:38:47 +02:00
SpiritCroc
ff65f2d704 Merge tag 'v1.4.20' into sc 
Change-Id: I8d93dd3caa86ff7c68aacbd037dca60591ec254c
 2022-06-14 10:06:37 +02:00
Benoit Marty
4fa8e70276 Prepare hotfix 1.4.20 2022-06-13 12:37:39 +02:00
ganfra
2a9ac539e4 Change after PR review 2022-06-13 12:35:39 +02:00
ganfra
c384a3de8d Fix EventInsertLiveObserver gets blocked by reverting and adding lock instead 2022-06-13 12:35:20 +02:00
SpiritCroc
6344a3982d Merge remote-tracking branch 'origin/merge-v1.4.19' into sc 
Change-Id: Idbdbece462fff520912ab0f356a74585989d6d14
 2022-06-08 14:35:25 +02:00
SpiritCroc
de179f1d29 Merge tag 'v1.4.19' into merge-v1.4.19 
Change-Id: Id486dab5c9b6c545e7035355fe921240c34409a6
 2022-06-07 15:33:53 +02:00
Benoit Marty
b2f67f971b Prepare v1.4.19 2022-06-07 15:11:46 +02:00
Valere
a6113526d0 code review 2022-06-07 15:01:57 +02:00
Valere
2fa25f8b5e Fix param name 2022-06-07 15:01:29 +02:00
Valere
d67f86a1e0 fix slow paged room list 2022-06-07 15:00:54 +02:00
SpiritCroc
a1e6e50ad4 Raise sync timing log level 
Change-Id: I6b7d98675c2a5d03510d357ea147d46d35f5a903
 2022-06-05 12:46:35 +02:00
SpiritCroc
49663a1154 Merge tag 'v1.4.18' into sc 
Change-Id: I58667aa99a8eb99b0b1e7f0784d811061c2086a5

Conflicts:
	dependencies.gradle
	library/attachment-viewer/build.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.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/session/room/summary/RoomSummaryDataSource.kt
	vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/utils/Emoji.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/UnreadMessagesSharedViewModel.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/MessageLocationItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/res/xml/vector_settings_labs.xml
 2022-06-01 13:54:34 +02:00
Benoit Marty
ae94f45f34
Merge pull request #5952 from vector-im/feature/bma/sdk_user_story 
Sdk user story
 2022-05-30 18:30:56 +02:00
SpiritCroc
0393dd51c9 Bring back downstream "Update room previews once we have decryption keys" 
This reverts commit 130fe7f887.
Also update to some newer decryption logic, and disable the new upstream
logic, to avoid duplicate decryption attempts.

Change-Id: Ibcea8b825d94284dfcf2d305b5f57423366601e5
 2022-05-30 17:39:20 +02:00
Benoit Marty
0806e7358a
Merge pull request #5780 from ofalvai/dependency-cleanup 
Remove unused dependencies
 2022-05-30 15:41:10 +02:00
Maxime NATUREL
eeaf9fd616
Merge pull request #6129 from vector-im/feature/mna/PSF-1019-user-pins 
[Location sharing] - Show user live location pins in map view (PSF-1019)
 2022-05-30 12:32:09 +02:00
Benoit Marty
c071dc502e Create extension String?.toActiveSpaceOrOrphanRooms() to reduce noise. 2022-05-30 11:38:31 +02:00
Benoit Marty
ad60467ae7 Fix test compilation 2022-05-30 11:38:03 +02:00
Benoit Marty
cffdb7f7a6 Add some Kdoc 2022-05-30 11:38:03 +02:00
Benoit Marty
5fbcec0c9c Add some Kdoc 2022-05-30 11:34:55 +02:00
Benoit Marty
0b6f35b256 Create SpaceFilter.OrphanRooms to improve the API. 
Not 100% of the side effect. There is probably some (fixed?) bugs here.
 2022-05-30 11:34:55 +02:00
Benoit Marty
c7997edf9a Rename ActiveSpaceFilter to SpaceFilter 2022-05-30 11:34:55 +02:00
Benoit Marty
00809027c1 Remove ActiveSpaceFilter.None 
Prefer nullability for API coherency of `RoomSummaryQueryParams`
 2022-05-30 11:34:55 +02:00
Benoit Marty
289f27b738 Add some Kdoc 2022-05-30 11:34:55 +02:00
Benoit Marty
3442829e11 Remove duplicated lines of code (the same code is done a few lines later) 2022-05-30 11:34:55 +02:00
Benoit Marty
8843fe0a54 Remove RoomCategoryFilter.ALL 
Prefer nullability for API coherency of `RoomSummaryQueryParams`
 2022-05-30 11:34:55 +02:00
Benoit Marty
8d7a54a6cf displayName default value is now QueryStringValue.NoCondition. 
It was working fine since in the DB we always have a name using `RoomDisplayNameFallbackProvider`, which in our current implementation always return a non empty String.
 2022-05-30 11:34:55 +02:00
Benoit Marty
2b0077b138 Small rework for nicer code 2022-05-30 11:34:55 +02:00
Benoit Marty
bfdc885d7f Remove roomId from RoomSummaryQueryParams.Builder(). 
Create a new API in RoomService to observe a room summary from a roomId.
 2022-05-30 11:34:55 +02:00
Benoit Marty
49a29fb56f Always use roomSummaryQueryParams, and not directly a RoomSummaryQueryParams.Builder() 
Also format and add some Kdoc
 2022-05-30 11:34:55 +02:00
Benoit Marty
12b3afbc50 Always use roomSummaryQueryParams, and not directly a RoomSummaryQueryParams.Builder() 
Also format and add some Kdoc
 2022-05-30 11:34:55 +02:00
Eric Decanini
eeb7d60e59
Merge pull request #5860 from vector-im/feature/eric/replace-search-room-subheader 
Replaces subtitle in Search Rooms with room context rather than last event
 2022-05-30 11:13:10 +02:00
Maxime NATUREL
066c540eb7 Filter event id in the DB query for active lives 2022-05-30 10:06:04 +02:00
Maxime NATUREL
f707f177d9 Improving mapper tests 2022-05-30 10:03:27 +02:00
dependabot[bot]
c6751f00ab
Bump libphonenumber from 8.12.48 to 8.12.49 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.48 to 8.12.49.
- [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.48...v8.12.49)

---
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-05-27 23:07:12 +00:00
ericdecanini
a5dc8ec181 Only gets flattenParents if specifically requested 2022-05-27 15:05:39 +02:00
Valere
c8b44bfd4c fix test post rebase 2022-05-27 10:17:40 +02:00
Olivér Falvai
9ce9ad6d3a Merge remote-tracking branch 'origin/develop' into dependency-cleanup 2022-05-26 14:04:39 +02:00
Valere
5735b094ac post rebase fix 2022-05-25 18:41:37 +02:00
Valere
e1292c03a1 code review 2022-05-25 18:40:33 +02:00
Valere
adb5b4c1b9 Fix closing deactivated accounts in tests 2022-05-25 18:40:33 +02:00
Valere
3332d827f0 rename testHelpers and make constructor private 2022-05-25 18:40:33 +02:00
Valere
29ff4d1e84 use withTestHelpers in sanity tests 2022-05-25 18:40:33 +02:00
Valere
e18402f834 Improve test stability 2022-05-25 18:40:33 +02:00
Valere
d7c8abbe98 quick format 2022-05-25 16:52:56 +02:00
Valere
abb335c43d Improve redaction test 2022-05-25 16:52:56 +02:00
Valere
136d2e330a added change log 2022-05-25 16:52:56 +02:00
Valere
755da616ed Fix decrypting redacted event 2022-05-25 16:52:56 +02:00
Valere
52eb48d808
Merge pull request #6077 from vector-im/feature/aris/crypto_replay_attack 
Feature/aris/crypto replay attack
 2022-05-25 16:20:26 +02:00