Skip to content

Commit ddd8244

Browse files
committed
kdoc
1 parent 8e829c6 commit ddd8244

File tree

15 files changed

+19
-56
lines changed

15 files changed

+19
-56
lines changed

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ interface CryptoService {
193193
fun prepareToEncrypt(roomId: String, callback: MatrixCallback<Unit>)
194194

195195
/**
196-
* Share all inbound sessions of the last chunk messages to the provided userId devices
196+
* Share all inbound sessions of the last chunk messages to the provided userId devices.
197197
*/
198198
suspend fun sendSharedHistoryKeys(roomId: String, userId: String, sessionInfoSet: Set<SessionInfo>?)
199199
}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/ForwardedRoomKeyContent.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@ data class ForwardedRoomKeyContent(
7272
val senderClaimedEd25519Key: String? = null,
7373

7474
/**
75-
* MSC3061
76-
* Identifies keys that were sent when the room's visibility setting was set to world_readable or shared
75+
* MSC3061 Identifies keys that were sent when the room's visibility setting was set to world_readable or shared.
7776
*/
7877
@Json(name = "org.matrix.msc3061.shared_history")
7978
val sharedHistory: Boolean? = false,

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/content/RoomKeyContent.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ data class RoomKeyContent(
4141
val chainIndex: Any? = null,
4242

4343
/**
44-
* MSC3061
45-
* Identifies keys that were sent when the room's visibility setting was set to world_readable or shared
44+
* MSC3061 Identifies keys that were sent when the room's visibility setting was set to world_readable or shared.
4645
*/
4746
@Json(name = "org.matrix.msc3061.shared_history")
4847
val sharedHistory: Boolean? = false

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibility.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ enum class RoomHistoryVisibility {
5050
}
5151

5252
/**
53-
* Room history should be shared only if room visibility is world_readable or shared
53+
* Room history should be shared only if room visibility is world_readable or shared.
5454
*/
5555
internal fun RoomHistoryVisibility.shouldShareHistory() =
5656
this == RoomHistoryVisibility.WORLD_READABLE || this == RoomHistoryVisibility.SHARED

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -601,6 +601,7 @@ internal class MXOlmDevice @Inject constructor(
601601
* @param forwardingCurve25519KeyChain Devices involved in forwarding this session to us.
602602
* @param keysClaimed Other keys the sender claims.
603603
* @param exportFormat true if the megolm keys are in export format
604+
* @param sharedHistory MSC3061, this key is sharable on invite
604605
* @return true if the operation succeeds.
605606
*/
606607
fun addInboundGroupSession(sessionId: String,

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MegolmSessionData.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ internal data class MegolmSessionData(
7373

7474
/**
7575
* Flag that indicates whether or not the current inboundSession will be shared to
76-
* invited users to decrypt past messages
76+
* invited users to decrypt past messages.
7777
*/
7878
// When this feature lands in spec name = shared_history should be used
7979
@Json(name = "org.matrix.msc3061.shared_history")

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,15 +300,15 @@ internal class MXMegolmDecryption(
300300
}
301301

302302
/**
303-
* Returns boolean shared key flag, if enabled with respect to matrix configuration
303+
* Returns boolean shared key flag, if enabled with respect to matrix configuration.
304304
*/
305305
private fun RoomKeyContent.getSharedKey(): Boolean {
306306
if (!cryptoStore.isShareKeysOnInviteEnabled()) return false
307307
return sharedHistory ?: false
308308
}
309309

310310
/**
311-
* Check if the some messages can be decrypted with a new session
311+
* Check if the some messages can be decrypted with a new session.
312312
*
313313
* @param roomId the room id where the new Megolm session has been created for, may be null when importing from external sessions
314314
* @param senderKey the session sender key

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1469,7 +1469,7 @@ internal class DefaultKeysBackupService @Inject constructor(
14691469
}
14701470

14711471
/**
1472-
* Returns boolean shared key flag, if enabled with respect to matrix configuration
1472+
* Returns boolean shared key flag, if enabled with respect to matrix configuration.
14731473
*/
14741474
private fun MXInboundMegolmSessionWrapper.getSharedKey(): Boolean {
14751475
if (!cryptoStore.isShareKeysOnInviteEnabled()) return false

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeyBackupData.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ internal data class KeyBackupData(
5454

5555
/**
5656
* Flag that indicates whether or not the current inboundSession will be shared to
57-
* invited users to decrypt past messages
57+
* invited users to decrypt past messages.
5858
*/
5959
@Json(name = "org.matrix.msc3061.shared_history")
6060
val sharedHistory: Boolean = false

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/InboundGroupSessionData.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ data class InboundGroupSessionData(
4343

4444
/**
4545
* Flag that indicates whether or not the current inboundSession will be shared to
46-
*invited users to decrypt past messages
46+
* invited users to decrypt past messages.
4747
*/
4848
@Json(name = "shared_history")
4949
val sharedHistory: Boolean = false,
5050

51-
)
51+
)

0 commit comments

Comments
 (0)