mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-27 19:38:53 +03:00
Code Issues Projects Releases Packages Wiki Activity
15401 commits 7 branches 124 tags 230 MiB
Commit graph

1991 commits

Author SHA1 Message Date
Maxime NATUREL
25ca50c7bd Fix final members in Entity 2022-04-28 11:58:49 +02:00
Maxime NATUREL
f04b67ba29 Adding missing internal qualifier 2022-04-27 18:01:10 +02:00
Maxime NATUREL
d18ea43211 Adding new field in EventAnnotationsSummary 2022-04-27 17:17:31 +02:00
Maxime NATUREL
10aa753231 Creating classes to save aggregated summary of a live location share 2022-04-27 17:16:06 +02:00
Aris Kotsomitopoulos
09e8c104bb
Merge pull request #5592 from vector-im/feature/aris/prevent_decryption_fom_suspend_functions 
Avoid accessing realm instance from suspend functions
 2022-04-27 17:09:39 +03:00
ariskotsomitopoulos
5cfe218634 Wrap only cryptoService.decryptEvent with runBlocking instead of the whole methods 2022-04-27 12:38:25 +03:00
ariskotsomitopoulos
51b42929bd Merge branch 'develop' into feature/aris/prevent_decryption_fom_suspend_functions 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDecryptor.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
 2022-04-27 12:26:16 +03:00
ariskotsomitopoulos
780f1ffc8c Merge branch 'develop' into feature/aris/fix_account_deactivation_issue 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
 2022-04-27 12:15:36 +03:00
Benoit Marty
6ee0b62272
Merge branch 'develop' into feature/bma/sdk_doc_update 2022-04-26 16:15:07 +02:00
Benoit Marty
d4c0575f28 Merge remote-tracking branch 'origin/hotfix/1.4.13' into develop 2022-04-26 11:50:23 +02:00
ariskotsomitopoulos
ba99d5c028 Merge branch 'develop' into feature/aris/fix_account_deactivation_issue 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
 2022-04-26 12:49:21 +03:00
Maxime NATUREL
343322ef21
Merge pull request #5814 from vector-im/fix/mna/live-location-beacon-format 
[Live location sharing] - Removing BeaconInfo structure
 2022-04-26 09:57:46 +02:00
Benoit Marty
cd06ba656a Ensure getRootSpaceSummaries() is not called on the main thread. 2022-04-25 16:10:17 +02:00
Benoit Marty
272bdf95cb Use the session SearchService to search in a room. 2022-04-25 09:49:51 +02:00
Benoit Marty
0092a7057e Access the various services with a getter 2022-04-25 09:49:51 +02:00
Benoit Marty
016551f79f This 2 services can also be Lazy 2022-04-25 09:49:05 +02:00
Benoit Marty
96b2254ac1 Small update of the Matrix documentation 2022-04-25 09:48:57 +02:00
Benoit Marty
b36955f6e2
Merge pull request #5812 from vector-im/feature/bma/dokka_3 
Feature/bma/dokka 3
 2022-04-25 09:43:17 +02:00
TarasSmakula
2839d1467f
Feature/5575 custom auth params for sign up (#5577) 
Add a fun `RegistrationWizard.registrationCustom()` to be able to use any parameters during the registration.
Move terms converter into `api` package.
 2022-04-21 20:02:27 +00:00
Benoit Marty
96350b0ed0
Merge pull request #5813 from vector-im/feature/bma/query 
Improve code in file TimelineEventEntityQueries.kt
 2022-04-21 21:11:30 +02:00
Maxime NATUREL
914db8c6be Removing BeaconInfo structure 2022-04-21 15:52:16 +02:00
Benoit Marty
dbc558afbc More cleanup in TimelineEventEntityQueries.kt 2022-04-21 14:37:56 +02:00
Benoit Marty
7f09a37503 Move code to TimelineEventEntityQueries.kt (#5810) 2022-04-21 14:27:17 +02:00
Eric Decanini
c21ec983e8
Merge pull request #5805 from vector-im/task/eric/format-project 
Formats project with new code style
 2022-04-21 12:43:28 +02:00
Benoit Marty
863ed2f15d Move GetPushRulesResponse to internal package 2022-04-21 12:30:34 +02:00
Benoit Marty
4def1e6068 Rename internal package from notification to pushrules 2022-04-21 12:30:11 +02:00
Benoit Marty
729a2e6372 Move pushrules package to the session package 2022-04-21 12:30:11 +02:00
Eric Decanini
aebdee1070
Merge pull request #5652 from vector-im/bugfix/eric/sending-images-crashes 
Potentially fixes intermittent crashing from sending gallery images
 2022-04-21 11:54:59 +02:00
ericdecanini
de899bbb18 Formats entire project 2022-04-21 11:50:15 +02:00
Benoit Marty
7f3e72b9cb
Merge pull request #5772 from vector-im/feature/bma/ignore_users 
Delete Events from ignored users and trigger a clear cache request dialog when unignoring user(s)
 2022-04-21 11:03:09 +02:00
ericdecanini
8eab24c53d Replaces writeAsync with awaitTransaction 2022-04-20 11:10:01 +02:00
ericdecanini
90b063f0de Replaces doWithRealm with writeAsync 2022-04-20 10:55:06 +02:00
ericdecanini
4a010a7a2a Removes runCatching from TemporaryFileCreator 2022-04-19 13:31:13 +02:00
ariskotsomitopoulos
945d0ce035 Fix import ordering 2022-04-19 11:50:50 +03:00
ariskotsomitopoulos
459ae7276d Refactor packages 2022-04-19 11:36:59 +03:00
ariskotsomitopoulos
8a2cd97df0 Resolve merge conflicts 2022-04-19 11:12:28 +03:00
ariskotsomitopoulos
b96adadf1b Merge branch 'develop' into feature/aris/fix_account_deactivation_issue 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/InitializeCrossSigningTask.kt
#	vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
 2022-04-19 11:06:43 +03:00
Aris Kotsomitopoulos
abe07c73a4
Merge pull request #5775 from vector-im/feature/aris/threads_after_release_experience 
Enhance user experience when home servers do not support threads.
 2022-04-19 10:59:41 +03:00
Benoit Marty
903e226e59 Restart the timeline when some Event are deleted, for instance when ignoring a user, for the change to take effect 2022-04-15 16:30:09 +02:00
ariskotsomitopoulos
1a38b8c3c9 Replace var with val 2022-04-15 16:32:48 +03:00
Benoit Marty
cc8f086cc3 copyright 2022-04-15 13:32:30 +02:00
Benoit Marty
cdcf57659f Do not update the cache manually, else the initial sync request will not be triggered. 2022-04-15 12:54:04 +02:00
Benoit Marty
6b9f2965da Request an initial sync when a user is unignored (#1899) 2022-04-15 12:07:28 +02:00
Benoit Marty
6ed1516d90 Delete messages from just ignored users from our database (#1899) 2022-04-15 11:15:08 +02:00
Benoit Marty
ff28cb4349 Add TODO 2022-04-15 10:41:09 +02:00
Benoit Marty
b6f345aec2 Format 2022-04-15 10:18:30 +02:00
Adam Brown
e58677a104
Merge pull request #5763 from vector-im/feature/adm/server-selection-errors 
FTUE - Server selection errors
 2022-04-14 17:22:58 +01:00
Benoit Marty
6a6f59a3be
Merge pull request #5757 from ofalvai/bugfix/uploads-order-e2e 
Fix sorting of uploads in encrypted rooms
 2022-04-14 18:11:49 +02:00
Benoit Marty
97f2206f2a
Merge pull request #5767 from vector-im/feature/bma/unignore_user 
Unignore user must perform an initial sync
 2022-04-14 17:31:32 +02:00
Benoit Marty
a171a29bf1
Merge pull request #5762 from vector-im/feature/bma/dokka_2 
Make some data class immutable
 2022-04-14 17:17:55 +02:00