Skip to content

skip appInfo.enabled check for package that has staticDep on itself #431

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

Merged
thestinger merged 1 commit into from
Aug 20, 2025
Merged

skip appInfo.enabled check for package that has staticDep on itself #431

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
13 changes: 7 additions & 6 deletions app/src/main/java/app/grapheneos/apps/core/Repo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class Repo(json: JSONObject, val eTag: String, val isDummy: Boolean = false) {
for (manifestPackageName in packagesJson.keys()) {
val packageContainerJson = packagesJson.getJSONObject(manifestPackageName)

if (!checkStaticDeps(packageContainerJson, this)) {
if (!checkStaticDeps(packageContainerJson, manifestPackageName, this)) {
continue
}

Expand Down Expand Up @@ -237,7 +237,7 @@ class RPackageContainer(val repo: Repo, val packageName: String,
}
}

if (!checkStaticDeps(jo, repo)) {
if (!checkStaticDeps(jo, manifestPackageName, repo)) {
continue
}

Expand Down Expand Up @@ -539,7 +539,7 @@ private class ComplexDependency(string: String) {
}
}

private fun checkStaticDeps(json: JSONObject, repo: Repo): Boolean {
private fun checkStaticDeps(json: JSONObject, dependentManifestPkgName: String, repo: Repo): Boolean {
json.optJSONArray("supportedDevices")?.asStringList()?.let { devices ->
if (!devices.contains(Build.DEVICE)) {
return false
Expand All @@ -558,7 +558,7 @@ private fun checkStaticDeps(json: JSONObject, repo: Repo): Boolean {
// there's currently no certificate checks for static dependencies, require them to
// be a system package instead, unless it's our own package
val enforceSystemPkg = dep.lhs != selfPkgName
if (!checkPackageDep(dep, repo, enforceSystemPkg)) {
if (!checkPackageDep(dep, dependentManifestPkgName, repo, enforceSystemPkg)) {
return false
}
}
Expand All @@ -572,12 +572,13 @@ private fun checkSystemFeatureDep(dep: ComplexDependency): Boolean {
return dep.check(featureInfo.version.toLong())
}

private fun checkPackageDep(dep: ComplexDependency, repo: Repo, enforceSystemPkg: Boolean = false): Boolean {
private fun checkPackageDep(dep: ComplexDependency, dependentManifestPkgName: String,
repo: Repo, enforceSystemPkg: Boolean = false): Boolean {
val manifestPackageName = dep.lhs
val packageName = repo.translateManifestPackageName(manifestPackageName)
val pi = pkgManager.getPackageInfoOrNull(packageName) ?: return false
val appInfo = pi.applicationInfo ?: return false
if (!appInfo.enabled) {
if (!appInfo.enabled && manifestPackageName != dependentManifestPkgName) {
return false
}
if (enforceSystemPkg) {
Expand Down