Skip to content

Commit 174ff45

Browse files
committed
Update logoImageUrl to be nullable in Result class
1 parent f175d22 commit 174ff45

4 files changed

Lines changed: 12 additions & 9 deletions

File tree

data/src/main/kotlin/com/theapache64/stackzy/data/local/AnalysisReport.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class AnalysisReport(
3232
) : AnalysisReportDefinition
3333

3434

35-
fun AnalysisReport.toResult(resultsRepo: ResultsRepo, config: Config? = null, logoImageUrl: String): Result {
35+
fun AnalysisReport.toResult(resultsRepo: ResultsRepo, config: Config? = null, logoImageUrl: String?): Result {
3636

3737
return Result(
3838
appName = this.appName ?: this.packageName,

data/src/main/kotlin/com/theapache64/stackzy/data/remote/Result.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ data class Result(
2626
@Json(name = "stackzy_lib_version")
2727
val stackzyLibVersion: Int,
2828
@Json(name = "logo_image_url")
29-
val logoImageUrl: String
29+
val logoImageUrl: String? = null
3030
)

data/src/main/kotlin/com/theapache64/stackzy/data/repo/AdbRepo.kt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,18 @@ class AdbRepo @Inject constructor(
131131

132132
installedPackages
133133
.split("\n") // parse line by line
134-
.filter { packageName -> packageName.isNotBlank() }
135-
.map { it.replace("package:", "").trim() } // filter package name
136-
.map { packageName ->
137-
AndroidApp(Package(packageName), isSystemApp = isSystemApp)
138-
}
134+
.filter { packageNameAndVersionCode -> packageNameAndVersionCode.isNotBlank() }
135+
.map { packageNameAndVersionCode ->
136+
var (packageName, versionCode) = packageNameAndVersionCode.split(" ")
137+
packageName = packageName.replace("package:", "").trim()
138+
val versionCodeInt = versionCode.replace("versionCode:", "").trim().toIntOrNull()
139+
AndroidApp(Package(packageName), isSystemApp = isSystemApp,versionCode = versionCodeInt)
140+
} // filter package name
141+
139142
}
140143

141144
private suspend fun getInstalledPackagesByFlag(device: Device, flag: String): String = adb.execute(
142-
request = ShellCommandRequest("pm list packages $flag"),
145+
request = ShellCommandRequest("pm list packages --show-versioncode $flag"),
143146
serial = device.serial
144147
).output
145148

src/main/kotlin/com/theapache64/stackzy/ui/feature/appdetail/AppDetailViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ class AppDetailViewModel @Inject constructor(
332332

333333
if (shouldStoreResult) {
334334
// Converting AnalysisReport to Result
335-
val result = report.toResult(resultsRepo, config, androidApp.imageUrl!!)
335+
val result = report.toResult(resultsRepo, config, androidApp.imageUrl)
336336

337337
// Add result to remove
338338
resultsRepo.add(result).collect {

0 commit comments

Comments
 (0)