Commit graph

15112 commits

Author SHA1 Message Date
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
Eric Decanini
9b7e94ebab
Fixes myroomnick changing Display Name (#5618) 2022-04-13 18:35:33 +02:00
Maxime NATUREL
e109319b1e
Merge pull request #5752 from vector-im/feature/mna/live-location-disabled-by-default
Disable live location sharing feature by default in debug config
2022-04-13 17:56:00 +02:00
Benoit Marty
619ac2a9d8
Merge pull request #5754 from vector-im/feature/adm/including-app-module-in-coverage
Fixing missing :vector test coverage in Jacoco report
2022-04-13 16:48:11 +02:00
Adam Brown
8bbb5e9c93 fixing missing :vector test coverage in jacoco report
- pulling application module coverage from the gplay variant as we're only including main sourceset files
2022-04-13 14:17:24 +01:00
Benoit Marty
2761b35b6f
Merge pull request #5731 from t3chguy/t3chguy/fix-room-type-misuse
Don't wrongly show non-space invites in the space panel
2022-04-13 15:01:45 +02:00
Benoit Marty
5075775c56
Merge pull request #5744 from vector-im/feature/bma/dokka
Set up dokka to generate SDK documentation and cleanup the API
2022-04-13 14:49:10 +02:00
Maxime NATUREL
ea4515f90e Deleting changelog entry 2022-04-13 14:44:43 +02:00
Maxime NATUREL
2d3a8b4d57 Adding details into changelog entry 2022-04-13 14:41:20 +02:00
Benoit Marty
e30c68fb82 Remove dokka dependencies classpath for this specific module, it's already declared in the main build.gradle file. 2022-04-13 13:45:06 +02:00
Benoit Marty
c8aefd5828 Update issue hint 2022-04-13 13:42:15 +02:00
Adam Brown
0bf84341af
Merge pull request #5747 from vector-im/feature/adm/concurrent-new-session-crash
Fixing crash when navigating the app whilst room keys are being processed
2022-04-13 10:43:10 +01:00
Maxime NATUREL
c832c1b848
Merge pull request #5722 from vector-im/feature/mna/PSF-883-start-live-message
[Location sharing] - Show message on start of a live
2022-04-13 11:17:22 +02:00
Maxime NATUREL
a0ca8b6a13 Using misc suffix for changelog entry 2022-04-13 11:09:08 +02:00
Maxime NATUREL
9d2c704aef Removing the BuildConfigField 2022-04-13 10:56:20 +02:00
Maxime NATUREL
3c57916ec3 Adding changelog entry 2022-04-13 10:55:59 +02:00
Maxime NATUREL
071340c868 Remove non necessary comment + adding a TODO for missing aggregation check 2022-04-13 10:39:13 +02:00
Adam Brown
594b442a21 copying the list of new session listeners to avoid concurrent modification
- copying the list avoids the need to synchronise the add/removing/iterations
2022-04-12 17:36:05 +01:00
Benoit Marty
4adb469b38
Merge pull request #5741 from vector-im/dependabot/github_actions/actions/upload-artifact-3
Bump actions/upload-artifact from 2 to 3
2022-04-12 17:01:22 +02:00
Benoit Marty
27be78002d
Merge pull request #5740 from vector-im/dependabot/github_actions/actions/setup-java-3
Bump actions/setup-java from 2 to 3
2022-04-12 17:01:10 +02:00
Benoit Marty
38bbbd62a4 Restore the correct copyright 2022-04-12 16:35:32 +02:00
Benoit Marty
a0eb4c144e Add changelog files 2022-04-12 16:14:48 +02:00
Maxime NATUREL
4c07405220 Create a const value for the height of message location item 2022-04-12 16:10:26 +02:00
Benoit Marty
bfbcef60e9 Run ktlintFormat 2022-04-12 16:09:56 +02:00
Benoit Marty
23d2a290ab Global import optimization 2022-04-12 16:06:27 +02:00
Maxime NATUREL
46700723a8 Remove the noisy reformatting of MessageItemFactory 2022-04-12 15:55:15 +02:00
Maxime NATUREL
c3fe782eb5 Fixing overlay in bubble mode 2022-04-12 15:51:02 +02:00
Maxime NATUREL
e50192910d Keep track of time out using last location event 2022-04-12 15:51:02 +02:00
Maxime NATUREL
d78ed3215b Adding support for notifications and message preview 2022-04-12 15:51:02 +02:00
Maxime NATUREL
78a9bdeb4c Making state beacon events displayable in timeline 2022-04-12 15:51:02 +02:00
Maxime NATUREL
6e61085b1f Removing TODO 2022-04-12 15:51:02 +02:00
Maxime NATUREL
e2d56e2d87 Align corner radius of banner on map view 2022-04-12 15:51:02 +02:00
Maxime NATUREL
26f89fa5f8 Handling bubble mode view 2022-04-12 15:51:02 +02:00
Maxime NATUREL
3da3589d5c Creating factory for live location items 2022-04-12 15:51:02 +02:00
Maxime NATUREL
aabfc81816 Show start event of live without conditions 2022-04-12 15:51:02 +02:00
Maxime NATUREL
e93e51d03c Adding new message item 2022-04-12 15:51:02 +02:00
Maxime NATUREL
a1fb85dcdb Creating layout for the new message item 2022-04-12 15:51:02 +02:00
Maxime NATUREL
2a201b3c46 Adding changelog entry 2022-04-12 15:51:02 +02:00
Benoit Marty
4e48c076e8 Make RuntimeJsonAdapterFactory internal and cleanup 2022-04-12 15:47:09 +02:00
Michael Telatynski
fd3bbabec5 Simplify solution based on pr feedback 2022-04-12 14:43:26 +01:00
Benoit Marty
7514edb399 Convert RuntimeJsonAdapterFactory to Kotlin 2022-04-12 15:41:37 +02:00
Benoit Marty
73270476d2 Rename .java to .kt 2022-04-12 15:41:37 +02:00
Benoit Marty
150c64350e Move UnsignedDeviceInfo to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
b6eafbe344 Move SendToDeviceObject to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
89f20e1cfb Move RoomKeyRequestBody to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
ed94d3ff1f Move EncryptedFileInfo and EncryptedFileKey to api package 2022-04-12 15:41:37 +02:00
Benoit Marty
7eaef934db DeviceKeys is now internal, removing unused code. 2022-04-12 15:41:37 +02:00