mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-02-17 04:20:00 +03:00
Code Issues Projects Releases Packages Wiki Activity
25251 commits 7 branches 127 tags 238 MiB
Commit graph

6599 commits

Author SHA1 Message Date
Benoit Marty
5ee3ae5eea version++ 2023-01-02 13:39:05 +01:00
valere
a345c6c8e5 fix 7870 2022-12-31 13:21:07 +01:00
SpiritCroc
740364f733 Merge remote-tracking branch 'deepbluev7/nico/fix-at-room' into sc 
Change-Id: I9587d87c60e70c2efc098b7379a6bac9f9c9be26
 2022-12-31 08:24:15 +01:00
SpiritCroc
25dddf7566 Merge tag 'v1.5.16' into sc 
Change-Id: I98c122b95dd3758d41f4845a42ec9ed2371e174f

Conflicts:
	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/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
 2022-12-30 17:58:06 +01:00
valere
ea2c41b818 version++ 2022-12-29 18:24:33 +01:00
valere
25f4f2175a Fix failing tests 2022-12-28 10:19:25 +01:00
valere
558317260b Add migration to clean db from SyncFilterParamsEntity 2022-12-27 15:40:49 +01:00
Onuray Sahin
486968fdc2 Render ended poll. 2022-12-26 14:41:38 +03:00
valere
76fa1bfee5 Merge branch 'develop' into feature/bca/rust_flavor 2022-12-26 09:29:03 +01:00
NIkita Fedrunov
91b4dc1f97 tests are fixed 2022-12-23 13:51:19 +01:00
NIkita Fedrunov
d20121603a sync filter params moved to matrix config 2022-12-23 13:10:27 +01:00
SpiritCroc
e054828370 Merge tag 'v1.5.14' into sc 
Change-Id: Ib0162cc1f66cd563e15a24a2c090cfd18b5250c2
 2022-12-21 09:57:40 +01:00
Benoit Marty
67e15a42c0 Version++ 2022-12-20 16:50:08 +01:00
Benoit Marty
576ea2df55 Prepare hotfix 1.5.14 2022-12-20 16:44:11 +01:00
SpiritCroc
f5dcf25a6d Merge tag 'v1.5.13' into sc 
Change-Id: I16e8750adb88c86ad6af84f60d904fd5e16d2f13
 2022-12-19 18:04:43 +01:00
Benoit Marty
ffa49870a9 Version 1.5.13 2022-12-19 16:52:32 +01:00
SpiritCroc
dd83c16e46 Disable useless thread fallback to reply fallback calculation 
Don't ask me why Element did that much effort for those, instead of just
doing rich replies...

Change-Id: I90146a34b7a29896f550fcde50f821af629d7edb
 2022-12-17 15:18:03 +01:00
valere
ee5dfba389 fix kotlinCrypto flavor compilation 2022-12-17 11:53:13 +01:00
SpiritCroc
aa9e0bc627 Add read receipt debugging 
Change-Id: I2cd0b5feb23962bc36295380fe3e77346f0ea694
 2022-12-17 11:34:39 +01:00
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