rebelonion/Dantotsu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

signing fix

Browse source
This commit is contained in:
Finnley Somdahl 2023-12-02 18:34:40 -06:00
parent afa960c808
commit 121be4bc6f
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -29,7 +29,7 @@ android {
debug { debug {
applicationIdSuffix ".beta" applicationIdSuffix ".beta"
manifestPlaceholders = [icon_placeholder: "@mipmap/ic_launcher_beta", icon_placeholder_round: "@mipmap/ic_launcher_beta_round"] manifestPlaceholders = [icon_placeholder: "@mipmap/ic_launcher_beta", icon_placeholder_round: "@mipmap/ic_launcher_beta_round"]
debuggable false debuggable true
} }
release { release {
manifestPlaceholders = [icon_placeholder: "@mipmap/ic_launcher", icon_placeholder_round: "@mipmap/ic_launcher_round"] manifestPlaceholders = [icon_placeholder: "@mipmap/ic_launcher", icon_placeholder_round: "@mipmap/ic_launcher_round"]

2
app/src/main/java/ani/dantotsu/parsers/novel/NovelExtensionGithubApi.kt
View file

@ -124,7 +124,7 @@ class NovelExtensionGithubApi {
source.baseUrl, source.baseUrl,
) )
} }
val iconUrl = "${REPO_URL_PREFIX}icons/${extension.pkg}.png" val iconUrl = "${REPO_URL_PREFIX}icon/${extension.pkg}.png"
NovelExtension.Available( NovelExtension.Available(
extension.name, extension.name,
extension.pkg, extension.pkg,

8
app/src/main/java/ani/dantotsu/parsers/novel/NovelExtensionLoader.kt
View file

@ -71,7 +71,7 @@ internal object NovelExtensionLoader {
val packageInfo = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { val packageInfo = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
context.packageManager.getPackageArchiveInfo( context.packageManager.getPackageArchiveInfo(
file.absolutePath, file.absolutePath,
GET_SIGNING_CERTIFICATES GET_SIGNATURES or GET_SIGNING_CERTIFICATES
) )
?: return NovelLoadResult.Error(Exception("Failed to load extension")) ?: return NovelLoadResult.Error(Exception("Failed to load extension"))
} else { } else {
@ -89,7 +89,7 @@ internal object NovelExtensionLoader {
logger("Package ${packageInfo.packageName} isn't signed") logger("Package ${packageInfo.packageName} isn't signed")
logger("signatureHash: $signatureHash") logger("signatureHash: $signatureHash")
snackString("Package ${packageInfo.packageName} isn't signed") snackString("Package ${packageInfo.packageName} isn't signed")
return NovelLoadResult.Error(Exception("Extension not signed")) //return NovelLoadResult.Error(Exception("Extension not signed"))
} }
val extension = NovelExtension.Installed( val extension = NovelExtension.Installed(
@ -111,12 +111,12 @@ internal object NovelExtensionLoader {
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
private fun getSignatureHash(pkgInfo: PackageInfo): List<String>? { private fun getSignatureHash(pkgInfo: PackageInfo): List<String>? {
val signatures = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { val signatures = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && pkgInfo.signingInfo != null) {
pkgInfo.signingInfo.apkContentsSigners pkgInfo.signingInfo.apkContentsSigners
} else { } else {
pkgInfo.signatures pkgInfo.signatures
} }
return if (signatures != null && signatures.isNotEmpty()) { return if (!signatures.isNullOrEmpty()) {
signatures.map { Hash.sha256(it.toByteArray()) } signatures.map { Hash.sha256(it.toByteArray()) }
} else { } else {
null null