Skip to content

Commit

Permalink
Merge pull request #26 from whitewhidow/development
Browse files Browse the repository at this point in the history
FIX
  • Loading branch information
whitewhidow authored Dec 5, 2020
2 parents 0343d7f + 8129163 commit ef6a568
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -386,14 +386,16 @@ async function sideloadFolder(location) {
packageName = ''
try {
console.log("attempting to read package info")
try {


if (packageName.match(/-packageName-([a-zA-Z\d\_.]*)/)) {
packageName = apkfile.match(/-packageName-([a-zA-Z\d\_.]*)/)[1]
} catch (error) {
} else {
packageinfo = await getPackageInfo(apkfile)
packageName = packageinfo.packageName
return false
}


win.webContents.send('sideload_aapt_done',`{"success":true}`);
console.log("package info read success ("+packageName+")")
} catch (e) {
Expand Down Expand Up @@ -480,7 +482,7 @@ async function getPackageInfo(apkPath) {
console.log(util.inspect(manifest.versionName, { depth: null }))
console.log(util.inspect(manifest.package, { depth: null }))

console.log(manifest)
//console.log(manifest)

info = {
packageName : util.inspect(manifest.package, { depth: null }).replace(/\'/g,""),
Expand Down

0 comments on commit ef6a568

Please sign in to comment.