Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 21:15:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Spinner support for kyber keys.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-07-08 11:21:12 -04:00
committed by Clark Chen
parent c359207f1f
commit 500ae0c72e
6 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spinner/lib/src/main/assets/browse.hbs
View File

@@ -47,7 +47,7 @@
{{#each queryResult.rows}}
<tr>
{{#each this}}
<td><pre>{{#if (eq this null)}} <em class="null">null</em> {{else}} {{{this}}} {{/if}}</pre></td>
<td><pre>{{#if (eq this null)}}<em class="null">null</em>{{else}}{{{this}}}{{/if}}</pre></td>
{{/each}}
</tr>
{{/each}}

2
spinner/lib/src/main/assets/query.hbs
View File

@@ -38,7 +38,7 @@
{{#each queryResult.rows}}
<tr>
{{#each this}}
<td><pre>{{#if (eq this null)}} <em class="null">null</em> {{else}} {{{this}}} {{/if}}</pre></td>
<td><pre>{{#if (eq this null)}}<em class="null">null</em>{{else}}{{{this}}}{{/if}}</pre></td>
{{/each}}
</tr>
{{/each}}

6
spinner/lib/src/main/java/org/signal/spinner/SpinnerServer.kt
View File

@@ -144,7 +144,7 @@ internal class SpinnerServer(
}
val query = "select * from $table limit $pageSize offset ${pageSize * pageIndex}"
val queryResult = dbConfig.db().query(query).use { it.toQueryResult(columnTransformers = dbConfig.columnTransformers) }
val queryResult = dbConfig.db().query(query).use { it.toQueryResult(columnTransformers = dbConfig.columnTransformers, table = table) }
return renderTemplate(
"browse",
@@ -264,14 +264,14 @@ internal class SpinnerServer(
)
}
private fun Cursor.toQueryResult(queryStartTimeNanos: Long = 0, columnTransformers: List<ColumnTransformer> = emptyList()): QueryResult {
private fun Cursor.toQueryResult(queryStartTimeNanos: Long = 0, columnTransformers: List<ColumnTransformer> = emptyList(), table: String? = null): QueryResult {
val numColumns = this.columnCount
val columns = mutableListOf<String>()
val transformers = mutableListOf<ColumnTransformer>()
for (i in 0 until numColumns) {
val columnName = getColumnName(i)
val customTransformer: ColumnTransformer? = columnTransformers.find { it.matches(null, columnName) }
val customTransformer: ColumnTransformer? = columnTransformers.find { it.matches(table, columnName) }
columns += if (customTransformer != null) {
"$columnName *"