Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-27 12:15:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Unify our Base64 utilities.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-10-13 09:36:29 -07:00
committed by Cody Henthorne
parent e636e38ba1
commit 4fe6d79fff
122 changed files with 549 additions and 542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/spinner/java/org/thoughtcrime/securesms/database/GV2UpdateTransformer.kt
View File

@@ -1,6 +1,7 @@
package org.thoughtcrime.securesms.database
import android.database.Cursor
import org.signal.core.util.Base64
import org.signal.core.util.CursorUtil
import org.signal.core.util.requireLong
import org.signal.spinner.ColumnTransformer
@@ -9,7 +10,6 @@ import org.thoughtcrime.securesms.database.model.MessageRecord
import org.thoughtcrime.securesms.database.model.UpdateDescription
import org.thoughtcrime.securesms.database.model.databaseprotos.DecryptedGroupV2Context
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
import org.thoughtcrime.securesms.util.Base64
object GV2UpdateTransformer : ColumnTransformer {
override fun matches(tableName: String?, columnName: String): Boolean {

4
app/src/spinner/java/org/thoughtcrime/securesms/database/KyberKeyTransformer.kt
View File

@@ -6,10 +6,10 @@
package org.thoughtcrime.securesms.database
import android.database.Cursor
import org.signal.core.util.Base64
import org.signal.core.util.requireBlob
import org.signal.libsignal.protocol.state.KyberPreKeyRecord
import org.signal.spinner.ColumnTransformer
import org.thoughtcrime.securesms.util.Base64
object KyberKeyTransformer : ColumnTransformer {
override fun matches(tableName: String?, columnName: String): Boolean {
@@ -18,6 +18,6 @@ object KyberKeyTransformer : ColumnTransformer {
override fun transform(tableName: String?, columnName: String, cursor: Cursor): String? {
val record = KyberPreKeyRecord(cursor.requireBlob(columnName))
return "ID: ${record.id}\nTimestamp: ${record.timestamp}\nPublicKey: ${Base64.encodeBytesWithoutPadding(record.keyPair.publicKey.serialize())}\nPrivateKey: ${Base64.encodeBytesWithoutPadding(record.keyPair.secretKey.serialize())}\nSignature: ${Base64.encodeBytesWithoutPadding(record.signature)}"
return "ID: ${record.id}\nTimestamp: ${record.timestamp}\nPublicKey: ${Base64.encodeWithoutPadding(record.keyPair.publicKey.serialize())}\nPrivateKey: ${Base64.encodeWithoutPadding(record.keyPair.secretKey.serialize())}\nSignature: ${Base64.encodeWithoutPadding(record.signature)}"
}
}

4
app/src/spinner/java/org/thoughtcrime/securesms/database/ProfileKeyCredentialTransformer.kt
View File

@@ -1,13 +1,13 @@
package org.thoughtcrime.securesms.database
import android.database.Cursor
import org.signal.core.util.Base64
import org.signal.core.util.Hex
import org.signal.core.util.requireString
import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential
import org.signal.spinner.ColumnTransformer
import org.signal.spinner.DefaultColumnTransformer
import org.thoughtcrime.securesms.database.model.databaseprotos.ExpiringProfileKeyCredentialColumnData
import org.thoughtcrime.securesms.util.Base64
import org.thoughtcrime.securesms.util.toLocalDateTime
import java.security.MessageDigest
@@ -27,7 +27,7 @@ object ProfileKeyCredentialTransformer : ColumnTransformer {
Expires: ${credential.expirationTime.toLocalDateTime()}
Matching Profile Key:
${Base64.encodeBytes(columnData.profileKey.toByteArray())}
${Base64.encodeWithPadding(columnData.profileKey.toByteArray())}
""".trimIndent().replace("\n", "<br>")
}
}