jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove redundant annotations

This commit is contained in:
Hugh Nimmo-Smith 2022-10-18 12:29:48 +01:00
parent 811d6d87ae
commit f7e0a19833
6 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
View File

@ -56,10 +56,10 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
@JsonClass(generateAdapter = true)
internal data class ECDHPayload(
@Json val algorithm: SecureRendezvousChannelAlgorithm? = null,
@Json val key: String? = null,
@Json val ciphertext: String? = null,
@Json val iv: String? = null
val algorithm: SecureRendezvousChannelAlgorithm? = null,
val key: String? = null,
val ciphertext: String? = null,
val iv: String? = null
)
private val olmSASMutex = Mutex()

7
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvous.kt
View File

@ -16,12 +16,11 @@
package org.matrix.android.sdk.api.rendezvous.model
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
@JsonClass(generateAdapter = true)
data class ECDHRendezvous(
@Json val transport: SimpleHttpRendezvousTransportDetails,
@Json val algorithm: SecureRendezvousChannelAlgorithm,
@Json val key: String
val transport: SimpleHttpRendezvousTransportDetails,
val algorithm: SecureRendezvousChannelAlgorithm,
val key: String
)

5
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvousCode.kt
View File

@ -16,11 +16,10 @@
package org.matrix.android.sdk.api.rendezvous.model
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
@JsonClass(generateAdapter = true)
data class ECDHRendezvousCode(
@Json val intent: RendezvousIntent,
@Json val rendezvous: ECDHRendezvous
val intent: RendezvousIntent,
val rendezvous: ECDHRendezvous
)

12
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Payload.kt
View File

@ -21,12 +21,12 @@ import com.squareup.moshi.JsonClass
@JsonClass(generateAdapter = true)
internal data class Payload(
@Json val type: PayloadType,
@Json val intent: RendezvousIntent? = null,
@Json val outcome: Outcome? = null,
@Json val protocols: List<Protocol>? = null,
@Json val protocol: Protocol? = null,
@Json val homeserver: String? = null,
val type: PayloadType,
val intent: RendezvousIntent? = null,
val outcome: Outcome? = null,
val protocols: List<Protocol>? = null,
val protocol: Protocol? = null,
val homeserver: String? = null,
@Json(name = "login_token") val loginToken: String? = null,
@Json(name = "device_id") val deviceId: String? = null,
@Json(name = "device_key") val deviceKey: String? = null,

3
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportDetails.kt
View File

@ -16,10 +16,9 @@
package org.matrix.android.sdk.api.rendezvous.model
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
@JsonClass(generateAdapter = true)
open class RendezvousTransportDetails(
@Json val type: RendezvousTransportType
val type: RendezvousTransportType
)

3
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SimpleHttpRendezvousTransportDetails.kt
View File

@ -16,10 +16,9 @@
package org.matrix.android.sdk.api.rendezvous.model
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
@JsonClass(generateAdapter = true)
data class SimpleHttpRendezvousTransportDetails(
@Json val uri: String
val uri: String
) : RendezvousTransportDetails(type = RendezvousTransportType.MSC3886_SIMPLE_HTTP_V1)