empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Add more device info at the top of Spinner.

Browse source
This commit is contained in:
Greyson Parrelli 2022-03-09 17:22:52 -05:00 • committed by Cody Henthorne
parent c1181478dd
commit 88a34936cd
5 changed files with 25 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/spinner/java/org/thoughtcrime/securesms/SpinnerApplicationContext.kt
View file

@ -14,6 +14,8 @@ import org.thoughtcrime.securesms.database.MegaphoneDatabase
import org.thoughtcrime.securesms.database.MessageBitmaskColumnTransformer
import org.thoughtcrime.securesms.database.QueryMonitor
import org.thoughtcrime.securesms.database.SignalDatabase
import org.thoughtcrime.securesms.keyvalue.SignalStore
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.util.AppSignatureUtil
import shark.AndroidReferenceMatchers
@ -23,10 +25,14 @@ class SpinnerApplicationContext : ApplicationContext() {
Spinner.init(
this,
Spinner.DeviceInfo(
name = "${Build.MODEL} (Android ${Build.VERSION.RELEASE}, API ${Build.VERSION.SDK_INT})",
packageName = "$packageName (${AppSignatureUtil.getAppSignature(this).or("Unknown")})",
appVersion = "${BuildConfig.VERSION_NAME} (${BuildConfig.CANONICAL_VERSION_CODE}, ${BuildConfig.GIT_HASH})"
mapOf(
"Device" to "${Build.MODEL} (Android ${Build.VERSION.RELEASE}, API ${Build.VERSION.SDK_INT})",
"Package" to "$packageName (${AppSignatureUtil.getAppSignature(this).or("Unknown")})",
"App Version" to "${BuildConfig.VERSION_NAME} (${BuildConfig.CANONICAL_VERSION_CODE}, ${BuildConfig.GIT_HASH})",
"Profile Name" to (if (SignalStore.account().isRegistered) Recipient.self().profileName.toString() else "none"),
"E164" to (SignalStore.account().e164 ?: "none"),
"ACI" to (SignalStore.account().aci?.toString() ?: "none"),
"PNI" to (SignalStore.account().pni?.toString() ?: "none")
),
linkedMapOf(
"signal" to DatabaseConfig(

7
spinner/app/src/main/java/org/signal/spinnertest/MainActivity.kt
View file

@ -19,10 +19,9 @@ class MainActivity : AppCompatActivity() {
Spinner.init(
application,
Spinner.DeviceInfo(
name = "${Build.MODEL} (API ${Build.VERSION.SDK_INT})",
packageName = packageName,
appVersion = "0.1"
mapOf(
"Name" to "${Build.MODEL} (API ${Build.VERSION.SDK_INT})",
"Package" to packageName
),
mapOf("main" to Spinner.DatabaseConfig(db = db))
)

18
spinner/lib/src/main/assets/partials/prefix.hbs
View file

@ -1,18 +1,12 @@
<h1>SPINNER</h1>
<table class="device-info">
<tr>
<td>Device</td>
<td>{{deviceInfo.name}}</td>
</tr>
<tr>
<td>Package</td>
<td>{{deviceInfo.packageName}}</td>
</tr>
<tr>
<td>App Version</td>
<td>{{deviceInfo.appVersion}}</td>
</tr>
{{#each deviceInfo}}
<tr>
<td>{{@key}}</td>
<td>{{this}}</td>
</tr>
{{/each}}
</table>
<div>

8
spinner/lib/src/main/java/org/signal/spinner/Spinner.kt
View file

@ -15,7 +15,7 @@ object Spinner {
private lateinit var server: SpinnerServer
fun init(application: Application, deviceInfo: DeviceInfo, databases: Map<String, DatabaseConfig>) {
fun init(application: Application, deviceInfo: Map<String, String>, databases: Map<String, DatabaseConfig>) {
try {
server = SpinnerServer(application, deviceInfo, databases)
server.start()
@ -87,12 +87,6 @@ object Spinner {
return builder.toString()
}
data class DeviceInfo(
val name: String,
val packageName: String,
val appVersion: String
)
data class DatabaseConfig(
val db: SupportSQLiteDatabase,
val columnTransformers: List<ColumnTransformer> = emptyList()

10
spinner/lib/src/main/java/org/signal/spinner/SpinnerServer.kt
View file

@ -26,7 +26,7 @@ import kotlin.math.min
*/
internal class SpinnerServer(
private val application: Application,
private val deviceInfo: Spinner.DeviceInfo,
private val deviceInfo: Map<String, String>,
private val databases: Map<String, DatabaseConfig>
) : NanoHTTPD(5000) {
@ -342,7 +342,7 @@ internal class SpinnerServer(
}
data class OverviewPageModel(
val deviceInfo: Spinner.DeviceInfo,
val deviceInfo: Map<String, String>,
val database: String,
val databases: List<String>,
val tables: List<TableInfo>,
@ -352,7 +352,7 @@ internal class SpinnerServer(
)
data class BrowsePageModel(
val deviceInfo: Spinner.DeviceInfo,
val deviceInfo: Map<String, String>,
val database: String,
val databases: List<String>,
val tableNames: List<String>,
@ -362,7 +362,7 @@ internal class SpinnerServer(
)
data class QueryPageModel(
val deviceInfo: Spinner.DeviceInfo,
val deviceInfo: Map<String, String>,
val database: String,
val databases: List<String>,
val query: String = "",
@ -370,7 +370,7 @@ internal class SpinnerServer(
)
data class RecentPageModel(
val deviceInfo: Spinner.DeviceInfo,
val deviceInfo: Map<String, String>,
val database: String,
val databases: List<String>,
val recentSql: List<RecentQuery>?