diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9e26c272..04e7e9ff 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -92,6 +92,9 @@ android:name="android.permission.WRITE_SECURE_SETTINGS" tools:ignore="ProtectedPermissions" /> + + diff --git a/app/src/main/java/org/autojs/autojs/apkbuilder/ApkBuilderPluginHelper.java b/app/src/main/java/org/autojs/autojs/apkbuilder/ApkBuilderPluginHelper.java index 88614c61..51a585a9 100644 --- a/app/src/main/java/org/autojs/autojs/apkbuilder/ApkBuilderPluginHelper.java +++ b/app/src/main/java/org/autojs/autojs/apkbuilder/ApkBuilderPluginHelper.java @@ -23,7 +23,13 @@ public class ApkBuilderPluginHelper { private static final boolean DEBUG_APK_PLUGIN = false; public static boolean isPluginAvailable(Context context) { - return DeveloperUtils.checkSignature(context, PLUGIN_PACKAGE_NAME); +// return DeveloperUtils.checkSignature(context, PLUGIN_PACKAGE_NAME); + try { + context.getPackageManager().getPackageInfo(PLUGIN_PACKAGE_NAME, 0); + } catch (PackageManager.NameNotFoundException e) { + return false; + } + return true; } public static InputStream openTemplateApk(Context context) { diff --git a/app/src/main/java/org/autojs/autojs/apkbuilder/ApkPackager.java b/app/src/main/java/org/autojs/autojs/apkbuilder/ApkPackager.java index 053d2ad3..a6f268c2 100644 --- a/app/src/main/java/org/autojs/autojs/apkbuilder/ApkPackager.java +++ b/app/src/main/java/org/autojs/autojs/apkbuilder/ApkPackager.java @@ -1,5 +1,7 @@ package org.autojs.autojs.apkbuilder; +import android.text.TextUtils; + import org.autojs.autojs.apkbuilder.util.StreamUtils; import java.io.File; @@ -36,7 +38,7 @@ public class ApkPackager { ZipInputStream zis = new ZipInputStream(mApkInputStream); for (ZipEntry e = zis.getNextEntry(); e != null; e = zis.getNextEntry()) { String name = e.getName(); - if (!e.isDirectory()) { + if (!e.isDirectory() && !TextUtils.isEmpty(name)) { File file = new File(mWorkspacePath, name); System.out.println(file); file.getParentFile().mkdirs(); diff --git a/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java b/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java index 854e0d66..0cd5a7d6 100644 --- a/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java @@ -34,7 +34,9 @@ import org.autojs.autojs6.R; import org.autojs.autojs6.databinding.ActivityBuildBinding; import java.io.File; +import java.io.IOException; import java.io.InputStream; +import java.util.Arrays; import java.util.Objects; import java.util.regex.Pattern; @@ -68,6 +70,7 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa private MaterialDialog mProgressDialog; private String mSource; private boolean mIsDefaultIcon = true; + private boolean mIsApkTemplateInAssets = false; @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -96,7 +99,21 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa if (mSource != null) { setupWithSourceFile(new ScriptFile(mSource)); } - checkApkBuilderPlugin(); + mIsApkTemplateInAssets = checkApkTemplateInAssets(); + if (!mIsApkTemplateInAssets) { + checkApkBuilderPlugin(); + } + } + + private boolean checkApkTemplateInAssets() { + try { + if (Arrays.asList(getAssets().list("")).contains("template.apk")) { + return true; + } + } catch (IOException e) { + Log.e(LOG_TAG, e.getMessage()); + } + return false; } private void checkApkBuilderPlugin() { @@ -182,7 +199,7 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa } void buildApk() { - if (!ApkBuilderPluginHelper.isPluginAvailable(this)) { + if (!mIsApkTemplateInAssets && !ApkBuilderPluginHelper.isPluginAvailable(this)) { ViewUtils.showToast(this, R.string.text_apk_builder_plugin_unavailable); return; } @@ -260,7 +277,7 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa } private ApkBuilder callApkBuilder(File tmpDir, File outApk, ApkBuilder.AppConfig appConfig) throws Exception { - InputStream templateApk = ApkBuilderPluginHelper.openTemplateApk(BuildActivity.this); + InputStream templateApk = mIsApkTemplateInAssets ? getAssets().open("template.apk") : ApkBuilderPluginHelper.openTemplateApk(BuildActivity.this); return new ApkBuilder(templateApk, outApk, tmpDir.getPath()) .setProgressCallback(BuildActivity.this) .prepare()