filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-02-05 21:43:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal

Browse Source
This commit is contained in:
Benoit Marty 2021-02-02 21:22:54 +01:00
parent 6ac2717d8b
commit cfdfd3a8af
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/Extensions.kt
View File

@ -21,11 +21,11 @@ import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
import org.matrix.android.sdk.internal.util.JsonCanonicalizer import org.matrix.android.sdk.internal.util.JsonCanonicalizer
import timber.log.Timber import timber.log.Timber
fun CryptoDeviceInfo.canonicalSignable(): String { internal fun CryptoDeviceInfo.canonicalSignable(): String {
return JsonCanonicalizer.getCanonicalJson(Map::class.java, signalableJSONDictionary()) return JsonCanonicalizer.getCanonicalJson(Map::class.java, signalableJSONDictionary())
} }
fun CryptoCrossSigningKey.canonicalSignable(): String { internal fun CryptoCrossSigningKey.canonicalSignable(): String {
return JsonCanonicalizer.getCanonicalJson(Map::class.java, signalableJSONDictionary()) return JsonCanonicalizer.getCanonicalJson(Map::class.java, signalableJSONDictionary())
} }
@ -40,7 +40,7 @@ fun String.fromBase64(): ByteArray {
/** /**
* Decode the base 64. Return null in case of bad format. Should be used when parsing received data from external source * Decode the base 64. Return null in case of bad format. Should be used when parsing received data from external source
*/ */
fun String.fromBase64Safe(): ByteArray? { internal fun String.fromBase64Safe(): ByteArray? {
return try { return try {
Base64.decode(this, Base64.DEFAULT) Base64.decode(this, Base64.DEFAULT)
} catch (throwable: Throwable) { } catch (throwable: Throwable) {

4
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoCrossSigningKey.kt
View File

@ -63,7 +63,7 @@ data class CryptoCrossSigningKey(
) )
} }
data class Builder( internal data class Builder(
val userId: String, val userId: String,
val usage: KeyUsage, val usage: KeyUsage,
private var base64Pkey: String? = null, private var base64Pkey: String? = null,
@ -97,7 +97,7 @@ data class CryptoCrossSigningKey(
} }
} }
enum class KeyUsage(val value: String) { internal enum class KeyUsage(val value: String) {
MASTER("master"), MASTER("master"),
SELF_SIGNING("self_signing"), SELF_SIGNING("self_signing"),
USER_SIGNING("user_signing") USER_SIGNING("user_signing")

8
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/Tools.kt
View File

@ -21,7 +21,7 @@ import org.matrix.olm.OlmPkEncryption
import org.matrix.olm.OlmPkSigning import org.matrix.olm.OlmPkSigning
import org.matrix.olm.OlmUtility import org.matrix.olm.OlmUtility
fun <T> withOlmEncryption(block: (OlmPkEncryption) -> T): T { internal fun <T> withOlmEncryption(block: (OlmPkEncryption) -> T): T {
val olmPkEncryption = OlmPkEncryption() val olmPkEncryption = OlmPkEncryption()
try { try {
return block(olmPkEncryption) return block(olmPkEncryption)
@ -30,7 +30,7 @@ fun <T> withOlmEncryption(block: (OlmPkEncryption) -> T): T {
} }
} }
fun <T> withOlmDecryption(block: (OlmPkDecryption) -> T): T { internal fun <T> withOlmDecryption(block: (OlmPkDecryption) -> T): T {
val olmPkDecryption = OlmPkDecryption() val olmPkDecryption = OlmPkDecryption()
try { try {
return block(olmPkDecryption) return block(olmPkDecryption)
@ -39,7 +39,7 @@ fun <T> withOlmDecryption(block: (OlmPkDecryption) -> T): T {
} }
} }
fun <T> withOlmSigning(block: (OlmPkSigning) -> T): T { internal fun <T> withOlmSigning(block: (OlmPkSigning) -> T): T {
val olmPkSigning = OlmPkSigning() val olmPkSigning = OlmPkSigning()
try { try {
return block(olmPkSigning) return block(olmPkSigning)
@ -48,7 +48,7 @@ fun <T> withOlmSigning(block: (OlmPkSigning) -> T): T {
} }
} }
fun <T> withOlmUtility(block: (OlmUtility) -> T): T { internal fun <T> withOlmUtility(block: (OlmUtility) -> T): T {
val olmUtility = OlmUtility() val olmUtility = OlmUtility()
try { try {
return block(olmUtility) return block(olmUtility)