vrr/VPN-Detector
2
0
Fork 0
mirror of https://github.com/cherepavel/VPN-Detector.git synced 2026-08-19 22:13:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

добавлена версия и билд в тектовый репорт

Browse source
This commit is contained in:
p.frasyn 2026-04-09 19:46:46 +03:00
parent 5ad7ab3a9d
commit 86953d2a53
4 changed files with 22 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/cherepavel/vpndetector/MainActivity.kt
View file

@ -204,7 +204,7 @@ class MainActivity : AppCompatActivity() {
val snapshot = detectionEngine.detect()
val report = ReportFormatter.build(this, snapshot)
val exportReport = ReportExportBuilder.build(snapshot)
val exportReport = ReportExportBuilder.build(this, snapshot)
val exportText = ReportExportFormatter.buildText(exportReport)
return DetectionOutput(

2
app/src/main/java/com/cherepavel/vpndetector/ui/export/ExportReport.kt
View file

@ -3,6 +3,8 @@ package com.cherepavel.vpndetector.ui.export
data class ExportReport(
val title: String,
val generatedAt: String,
val buildInfo: String,
val sourceCodeUrl: String,
val sections: List<ExportSection>
)

42
app/src/main/java/com/cherepavel/vpndetector/ui/export/ReportExportBuilder.kt
View file

@ -1,5 +1,8 @@
package com.cherepavel.vpndetector.ui.export
import android.content.Context
import com.cherepavel.vpndetector.BuildConfig
import com.cherepavel.vpndetector.R
import com.cherepavel.vpndetector.detector.TunnelNameMatcher
import com.cherepavel.vpndetector.model.DetectionConfidence
import com.cherepavel.vpndetector.model.DetectionSnapshot
@ -8,7 +11,10 @@ import com.cherepavel.vpndetector.util.nowString
object ReportExportBuilder {
fun build(snapshot: DetectionSnapshot): ExportReport {
fun build(
context: Context,
snapshot: DetectionSnapshot
): ExportReport {
val sections = buildList {
add(
ExportSection(
@ -35,10 +41,16 @@ object ReportExportBuilder {
return ExportReport(
title = "VPN Detector Report",
generatedAt = nowString(),
buildInfo = buildBuildInfo(),
sourceCodeUrl = context.getString(R.string.repo_url),
sections = sections
)
}
private fun buildBuildInfo(): String {
return "${BuildConfig.VERSION_NAME} • ${BuildConfig.GIT_HASH} • ${BuildConfig.BUILD_TYPE}"
}
private fun buildOverallItems(snapshot: DetectionSnapshot): List<ExportItem> {
val overall = buildOverallBlock(snapshot)
@ -102,27 +114,12 @@ object ReportExportBuilder {
add(ExportItem.Paragraph("API signals:"))
add(ExportItem.Paragraph("- Interface name"))
add(
ExportItem.Field(
"source",
"LinkProperties.getInterfaceName()"
)
)
add(
ExportItem.Field(
"value",
snapshot.rawInterfaceName ?: "none"
)
)
add(ExportItem.Field("source", "LinkProperties.getInterfaceName()"))
add(ExportItem.Field("value", snapshot.rawInterfaceName ?: "none"))
add(ExportItem.Field("hint", interfaceHint))
add(ExportItem.Paragraph("- Transport info"))
add(
ExportItem.Field(
"source",
"NetworkCapabilities.getTransportInfo()"
)
)
add(ExportItem.Field("source", "NetworkCapabilities.getTransportInfo()"))
add(
ExportItem.Field(
"value",
@ -138,12 +135,7 @@ object ReportExportBuilder {
private fun buildVpnNetworkDetailsSection(snapshot: DetectionSnapshot): ExportSection? {
val items = buildList {
if (snapshot.vpnRoutes.isNotEmpty()) {
add(
ExportItem.ListBlock(
label = "Routes",
values = snapshot.vpnRoutes
)
)
add(ExportItem.ListBlock("Routes", snapshot.vpnRoutes))
}
if (snapshot.vpnDnsServers.isNotEmpty()) {

2
app/src/main/java/com/cherepavel/vpndetector/ui/export/ReportExportFormatter.kt
View file

@ -6,6 +6,8 @@ object ReportExportFormatter {
return buildString {
appendLine(report.title)
appendLine("Generated: ${report.generatedAt}")
appendLine("Build: ${report.buildInfo}")
appendLine("Source code: ${report.sourceCodeUrl}")
appendLine()
report.sections.forEachIndexed { index, section ->