kopia lustrzana https://github.com/ryukoposting/Signal-Android
Add more device info at the top of Spinner.
rodzic
c1181478dd
commit
88a34936cd
|
@ -14,6 +14,8 @@ import org.thoughtcrime.securesms.database.MegaphoneDatabase
|
||||||
import org.thoughtcrime.securesms.database.MessageBitmaskColumnTransformer
|
import org.thoughtcrime.securesms.database.MessageBitmaskColumnTransformer
|
||||||
import org.thoughtcrime.securesms.database.QueryMonitor
|
import org.thoughtcrime.securesms.database.QueryMonitor
|
||||||
import org.thoughtcrime.securesms.database.SignalDatabase
|
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 org.thoughtcrime.securesms.util.AppSignatureUtil
|
||||||
import shark.AndroidReferenceMatchers
|
import shark.AndroidReferenceMatchers
|
||||||
|
|
||||||
|
@ -23,10 +25,14 @@ class SpinnerApplicationContext : ApplicationContext() {
|
||||||
|
|
||||||
Spinner.init(
|
Spinner.init(
|
||||||
this,
|
this,
|
||||||
Spinner.DeviceInfo(
|
mapOf(
|
||||||
name = "${Build.MODEL} (Android ${Build.VERSION.RELEASE}, API ${Build.VERSION.SDK_INT})",
|
"Device" to "${Build.MODEL} (Android ${Build.VERSION.RELEASE}, API ${Build.VERSION.SDK_INT})",
|
||||||
packageName = "$packageName (${AppSignatureUtil.getAppSignature(this).or("Unknown")})",
|
"Package" to "$packageName (${AppSignatureUtil.getAppSignature(this).or("Unknown")})",
|
||||||
appVersion = "${BuildConfig.VERSION_NAME} (${BuildConfig.CANONICAL_VERSION_CODE}, ${BuildConfig.GIT_HASH})"
|
"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(
|
linkedMapOf(
|
||||||
"signal" to DatabaseConfig(
|
"signal" to DatabaseConfig(
|
||||||
|
|
|
@ -19,10 +19,9 @@ class MainActivity : AppCompatActivity() {
|
||||||
|
|
||||||
Spinner.init(
|
Spinner.init(
|
||||||
application,
|
application,
|
||||||
Spinner.DeviceInfo(
|
mapOf(
|
||||||
name = "${Build.MODEL} (API ${Build.VERSION.SDK_INT})",
|
"Name" to "${Build.MODEL} (API ${Build.VERSION.SDK_INT})",
|
||||||
packageName = packageName,
|
"Package" to packageName
|
||||||
appVersion = "0.1"
|
|
||||||
),
|
),
|
||||||
mapOf("main" to Spinner.DatabaseConfig(db = db))
|
mapOf("main" to Spinner.DatabaseConfig(db = db))
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,18 +1,12 @@
|
||||||
<h1>SPINNER</h1>
|
<h1>SPINNER</h1>
|
||||||
|
|
||||||
<table class="device-info">
|
<table class="device-info">
|
||||||
<tr>
|
{{#each deviceInfo}}
|
||||||
<td>Device</td>
|
<tr>
|
||||||
<td>{{deviceInfo.name}}</td>
|
<td>{{@key}}</td>
|
||||||
</tr>
|
<td>{{this}}</td>
|
||||||
<tr>
|
</tr>
|
||||||
<td>Package</td>
|
{{/each}}
|
||||||
<td>{{deviceInfo.packageName}}</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>App Version</td>
|
|
||||||
<td>{{deviceInfo.appVersion}}</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
|
|
|
@ -15,7 +15,7 @@ object Spinner {
|
||||||
|
|
||||||
private lateinit var server: SpinnerServer
|
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 {
|
try {
|
||||||
server = SpinnerServer(application, deviceInfo, databases)
|
server = SpinnerServer(application, deviceInfo, databases)
|
||||||
server.start()
|
server.start()
|
||||||
|
@ -87,12 +87,6 @@ object Spinner {
|
||||||
return builder.toString()
|
return builder.toString()
|
||||||
}
|
}
|
||||||
|
|
||||||
data class DeviceInfo(
|
|
||||||
val name: String,
|
|
||||||
val packageName: String,
|
|
||||||
val appVersion: String
|
|
||||||
)
|
|
||||||
|
|
||||||
data class DatabaseConfig(
|
data class DatabaseConfig(
|
||||||
val db: SupportSQLiteDatabase,
|
val db: SupportSQLiteDatabase,
|
||||||
val columnTransformers: List<ColumnTransformer> = emptyList()
|
val columnTransformers: List<ColumnTransformer> = emptyList()
|
||||||
|
|
|
@ -26,7 +26,7 @@ import kotlin.math.min
|
||||||
*/
|
*/
|
||||||
internal class SpinnerServer(
|
internal class SpinnerServer(
|
||||||
private val application: Application,
|
private val application: Application,
|
||||||
private val deviceInfo: Spinner.DeviceInfo,
|
private val deviceInfo: Map<String, String>,
|
||||||
private val databases: Map<String, DatabaseConfig>
|
private val databases: Map<String, DatabaseConfig>
|
||||||
) : NanoHTTPD(5000) {
|
) : NanoHTTPD(5000) {
|
||||||
|
|
||||||
|
@ -342,7 +342,7 @@ internal class SpinnerServer(
|
||||||
}
|
}
|
||||||
|
|
||||||
data class OverviewPageModel(
|
data class OverviewPageModel(
|
||||||
val deviceInfo: Spinner.DeviceInfo,
|
val deviceInfo: Map<String, String>,
|
||||||
val database: String,
|
val database: String,
|
||||||
val databases: List<String>,
|
val databases: List<String>,
|
||||||
val tables: List<TableInfo>,
|
val tables: List<TableInfo>,
|
||||||
|
@ -352,7 +352,7 @@ internal class SpinnerServer(
|
||||||
)
|
)
|
||||||
|
|
||||||
data class BrowsePageModel(
|
data class BrowsePageModel(
|
||||||
val deviceInfo: Spinner.DeviceInfo,
|
val deviceInfo: Map<String, String>,
|
||||||
val database: String,
|
val database: String,
|
||||||
val databases: List<String>,
|
val databases: List<String>,
|
||||||
val tableNames: List<String>,
|
val tableNames: List<String>,
|
||||||
|
@ -362,7 +362,7 @@ internal class SpinnerServer(
|
||||||
)
|
)
|
||||||
|
|
||||||
data class QueryPageModel(
|
data class QueryPageModel(
|
||||||
val deviceInfo: Spinner.DeviceInfo,
|
val deviceInfo: Map<String, String>,
|
||||||
val database: String,
|
val database: String,
|
||||||
val databases: List<String>,
|
val databases: List<String>,
|
||||||
val query: String = "",
|
val query: String = "",
|
||||||
|
@ -370,7 +370,7 @@ internal class SpinnerServer(
|
||||||
)
|
)
|
||||||
|
|
||||||
data class RecentPageModel(
|
data class RecentPageModel(
|
||||||
val deviceInfo: Spinner.DeviceInfo,
|
val deviceInfo: Map<String, String>,
|
||||||
val database: String,
|
val database: String,
|
||||||
val databases: List<String>,
|
val databases: List<String>,
|
||||||
val recentSql: List<RecentQuery>?
|
val recentSql: List<RecentQuery>?
|
||||||
|
|
Ładowanie…
Reference in New Issue