diff --git a/app/src/spinner/java/org/thoughtcrime/securesms/StorageServicePlugin.kt b/app/src/spinner/java/org/thoughtcrime/securesms/StorageServicePlugin.kt index d3680046ad..4bfe0dcae4 100644 --- a/app/src/spinner/java/org/thoughtcrime/securesms/StorageServicePlugin.kt +++ b/app/src/spinner/java/org/thoughtcrime/securesms/StorageServicePlugin.kt @@ -1,5 +1,6 @@ package org.thoughtcrime.securesms +import org.signal.core.util.Base64 import org.signal.spinner.Plugin import org.signal.spinner.PluginResult import org.thoughtcrime.securesms.dependencies.AppDependencies @@ -10,7 +11,7 @@ class StorageServicePlugin : Plugin { override val path: String = PATH override fun get(): PluginResult { - val columns = listOf("Type", "Data") + val columns = listOf("Type", "Id", "Data") val rows = mutableListOf>() val manager = AppDependencies.signalServiceAccountManager @@ -44,6 +45,9 @@ class StorageServicePlugin : Plugin { row += "Unknown" row += "" } + + row.add(1, Base64.encodeWithPadding(record.id.raw)) + rows += row } diff --git a/spinner/lib/src/main/java/org/signal/spinner/DefaultColumnTransformer.kt b/spinner/lib/src/main/java/org/signal/spinner/DefaultColumnTransformer.kt index 8a79dbe624..ed5c78ef0f 100644 --- a/spinner/lib/src/main/java/org/signal/spinner/DefaultColumnTransformer.kt +++ b/spinner/lib/src/main/java/org/signal/spinner/DefaultColumnTransformer.kt @@ -2,6 +2,7 @@ package org.signal.spinner import android.database.Cursor import org.signal.core.util.Base64 +import org.signal.core.util.Hex object DefaultColumnTransformer : ColumnTransformer { override fun matches(tableName: String?, columnName: String): Boolean { @@ -11,7 +12,7 @@ object DefaultColumnTransformer : ColumnTransformer { override fun transform(tableName: String?, columnName: String, cursor: Cursor): String? { val index = cursor.getColumnIndex(columnName) return when (cursor.getType(index)) { - Cursor.FIELD_TYPE_BLOB -> Base64.encodeWithPadding(cursor.getBlob(index)) + Cursor.FIELD_TYPE_BLOB -> "Base64 with padding:
${Base64.encodeWithPadding(cursor.getBlob(index))}

Hex string:
${Hex.toStringCondensed(cursor.getBlob(index))}" else -> cursor.getString(index) } }