mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-24 16:53:56 +03:00
Code Issues Projects Releases Packages Wiki Activity
25813 commits 7 branches 125 tags 235 MiB
Commit graph

6730 commits

Author SHA1 Message Date
valere
406dfaab85 quick format 2022-12-17 10:52:13 +01:00
valere
d337ccd359 Merge branch 'develop' into feature/bca/rust_flavor 2022-12-17 10:51:49 +01:00
Benoit Marty
555cbe5f7d Return faster if list is empty 2022-12-16 20:44:26 +01:00
Benoit Marty
b063b25e8c Ignore typing notification for ignored users (part of #2965) 2022-12-16 20:39:44 +01:00
valere
2d388f392f ignore verification events from initial sync 2022-12-16 14:03:11 +01:00
Maxime NATUREL
648f97ba78
Merge pull request #7779 from vector-im/feature/mna/relations-api-poll-end 
[Poll] When a poll is ended, use /relations API to ensure poll results are correct (PSG-1013)
 2022-12-16 10:40:39 +01:00
valere
ca2d36303c clean logs 2022-12-16 09:34:01 +01:00
valere
3146f5209b Merge branch 'develop' into feature/bca/rust_flavor 2022-12-16 09:33:37 +01:00
valere
f07aa9f6f0 Fix tests and better logs 2022-12-15 18:47:48 +01:00
valere
3efaa8e171 Remove run blocking from realm tx 2022-12-15 18:44:43 +01:00
valere
49239e6bf2 fix ER migration 2022-12-15 18:42:10 +01:00
valere
b224a8d626 Fix lock blocking sync loop 2022-12-15 17:52:14 +01:00
SpiritCroc
330f0cf5cc Merge tag 'v1.5.12' into sc 
Change-Id: I4c53d64845ee05ff395e5df436a0739c87798737

Conflicts:
	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/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
	vector-app/build.gradle
	vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
	vector-config/src/main/res/values/config-settings.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
 2022-12-15 11:01:52 +01:00
Benoit Marty
8c49609aa6 version++ 2022-12-15 10:20:26 +01:00
Maxime NATUREL
e5663ec1c3 Fixing unit tests 2022-12-15 09:45:17 +01:00
Nikita Fedrunov
cf3abd6562
thread list loading (#7766) 2022-12-14 18:56:16 +01:00
Yoan Pintas
c74ea2dd16
Merge pull request #7719 from vector-im/feature/fre/voice_broadcast_last_message 
Voice Broadcast - Update last message in the room list
 2022-12-14 17:39:42 +01:00
Maxime NATUREL
4e4f72f241 Fixing code styling issues 2022-12-14 17:37:45 +01:00
Maxime NATUREL
dd13e1cb6d Fixing Copyright in SDK 2022-12-14 17:02:09 +01:00
Maxime NATUREL
66abda63ee Removing unused imports 2022-12-14 16:35:34 +01:00
Maxime NATUREL
bd7b6d6495 Adding unit test on task to fetch the poll response events 2022-12-14 16:33:27 +01:00
Maxime NATUREL
644803dcf3 Adding unit test on aggregation processor 2022-12-14 14:31:27 +01:00
Maxime NATUREL
9338ec9805 Mutualizing decryption of event 2022-12-14 11:49:41 +01:00
Maxime NATUREL
8b7c8e3351 Task to ensure aggregation of all poll responses when receiving ending poll event 2022-12-14 11:27:08 +01:00
Maxime NATUREL
8c88140b3c Updating Room API to clarify usage 2022-12-14 11:27:08 +01:00
Maxime NATUREL
fe5e4d6830
Merge pull request #7757 from vector-im/fix/mna/poll-end-not-recognized 
[Poll] Poll end event is not recognized (PSG-948 and PSG-949)
 2022-12-13 17:08:01 +01:00
valere
3abd68c153 fix compilation warning 2022-12-13 15:48:13 +01:00
Maxime NATUREL
851276978f Remove unused import 2022-12-13 15:47:30 +01:00
Maxime NATUREL
96e29d4d10 Renaming the name of the test file be consistent 2022-12-13 15:46:14 +01:00
Maxime NATUREL
71df1e61d4 Remove non necessary call when getting the targeted event id 2022-12-13 15:45:46 +01:00
valere
c3f439ea72 code quality 2022-12-13 15:27:13 +01:00
Nikita Fedrunov
3dadebe505
threads are enabled by default end forced to enabled for existing users (#7775) 2022-12-13 14:02:45 +01:00
valere
f541be4755 Merge branch 'develop' into feature/bca/rust_flavor 2022-12-13 11:52:46 +01:00
valere
d0807b9239 Fix test compilation 2022-12-13 11:50:06 +01:00
Valere
d05e10e10a
crypto migration tests (#7645) 
Crypto migration tests

Co-authored-by: Benoit Marty <benoitm@matrix.org>
 2022-12-13 11:38:49 +01:00
valere
3db82e629b Merge branch 'develop' into feature/bca/rust_flavor 2022-12-13 10:11:21 +01:00
valere
9680b044f9 Fix test crash 2022-12-13 09:48:15 +01:00
Onuray Sahin
250bd9c620
Merge pull request #7754 from vector-im/feature/ons/remove_client_information_account_data 
Delete unused client information from account data (PSG-871)
 2022-12-13 11:10:41 +03:00
Hugh Nimmo-Smith
34ee399f94
Merge pull request #7737 from vector-im/bugfix/hughns/qr-server-change 2022-12-12 18:21:39 +00:00
Onuray Sahin
9954045d30
Merge pull request #7740 from vector-im/feature/ons/remove_account_data 
Handle account data removal (PSG-865, PSG-867)
 2022-12-12 19:31:16 +03:00
Hugh Nimmo-Smith
21cbe52740 Lint 2022-12-12 16:30:34 +00:00
Hugh Nimmo-Smith
1930047ce1 Fix issue of QR not being offered where domain is entered instead of homeserver 2022-12-12 16:30:34 +00:00
valere
c52be1f5b1 Merge branch 'develop' into feature/bca/rust_flavor 2022-12-12 15:26:44 +01:00
valere
8c773b6d00 update crypto crate 2022-12-12 15:07:46 +01:00
Onuray Sahin
8c6c2dd5c2 Code review fixes. 2022-12-12 16:36:40 +03:00
Onuray Sahin
746fb7719a Code review fixes. 2022-12-12 13:39:56 +03:00
Maxime NATUREL
dba8aaea16
Merge pull request #7752 from vector-im/fix/mna/wrong-usage-of-stable-fields 
Revert usage of stable fields in live location sharing and polls
 2022-12-09 17:32:53 +01:00
Maxime NATUREL
bd91db66f8 Fixing retrieve of related event id in the end poll event during aggregation 2022-12-09 14:07:06 +01:00
Onuray Sahin
8206b534f9 Create a task to delete an event data with a given type. 2022-12-09 14:52:27 +03:00
Onuray Sahin
3d68233723 Support retrieving account data whose key starts with a string. 2022-12-09 14:51:23 +03:00