Skip to content

Support diffing uses-permission counts #274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Goooler wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

Support diffing uses-permission counts #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion formats/src/main/kotlin/com/jakewharton/diffuse/format/AndroidManifest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ class AndroidManifest private constructor(
val packageName: String,
val versionName: String?,
val versionCode: Long?,
val usesPermissionCount: Int,
) {
companion object {
const val NAME = "AndroidManifest.xml"
Expand Down Expand Up @@ -167,8 +168,9 @@ class AndroidManifest private constructor(
} else {
null
}
val usesPermissionCount = manifestElement.getElementsByTagName("uses-permission").length

return AndroidManifest(toFormattedXml(), packageName, versionName, versionCode)
return AndroidManifest(toFormattedXml(), packageName, versionName, versionCode, usesPermissionCount)
}

private fun Document.toFormattedXml() = buildString {
Expand Down
4 changes: 3 additions & 1 deletion reports/src/main/kotlin/com/jakewharton/diffuse/diff/ManifestDiff.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ internal class ManifestDiff(
) {
internal val parsedPropertiesChanged = oldManifest.packageName != newManifest.packageName ||
oldManifest.versionName != newManifest.versionName ||
oldManifest.versionCode != newManifest.versionCode
oldManifest.versionCode != newManifest.versionCode ||
oldManifest.usesPermissionCount != newManifest.usesPermissionCount

val diff: List<String> = run {
val oldLines = oldManifest.xml.lines()
Expand All @@ -34,6 +35,7 @@ internal fun ManifestDiff.toDetailReport() = buildString {
row("package", oldManifest.packageName, newManifest.packageName)
row("version code", oldManifest.versionCode, newManifest.versionCode)
row("version name", oldManifest.versionName, newManifest.versionName)
row("uses-permission count", oldManifest.usesPermissionCount, newManifest.usesPermissionCount)
},
)
}
Expand Down