From 0ef34fa63349149f17a491e350e0616a4e7a3f89 Mon Sep 17 00:00:00 2001
From: Nullptr <52071314+Dr-TSNG@users.noreply.github.com>
Date: Tue, 5 Jul 2022 19:10:29 +0800
Subject: [PATCH] Add .apk suffix

---
 .../main/java/org/lsposed/lspatch/loader/LSPApplication.java  | 4 ++--
 .../org/lsposed/lspatch/service/LocalApplicationService.java  | 2 +-
 patch/src/main/java/org/lsposed/patch/LSPatch.java            | 2 +-
 .../src/main/java/org/lsposed/lspatch/share/Constants.java    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/patch-loader/src/main/java/org/lsposed/lspatch/loader/LSPApplication.java b/patch-loader/src/main/java/org/lsposed/lspatch/loader/LSPApplication.java
index 0c15901..15ed576 100644
--- a/patch-loader/src/main/java/org/lsposed/lspatch/loader/LSPApplication.java
+++ b/patch-loader/src/main/java/org/lsposed/lspatch/loader/LSPApplication.java
@@ -133,7 +133,7 @@ public class LSPApplication {
             String originPath = appInfo.dataDir + "/cache/lspatch/origin/";
             String cacheApkPath;
             try (ZipFile sourceFile = new ZipFile(appInfo.sourceDir)) {
-                cacheApkPath = originPath + sourceFile.getEntry(ORIGINAL_APK_ASSET_PATH).getCrc();
+                cacheApkPath = originPath + sourceFile.getEntry(ORIGINAL_APK_ASSET_PATH).getCrc() + ".apk";
             }
 
             appInfo.sourceDir = cacheApkPath;
@@ -317,7 +317,7 @@ public class LSPApplication {
         if (config.sigBypassLevel >= Constants.SIGBYPASS_LV_PM_OPENAT) {
             String cacheApkPath;
             try (ZipFile sourceFile = new ZipFile(context.getPackageResourcePath())) {
-                cacheApkPath = context.getCacheDir() + "/lspatch/origin/" + sourceFile.getEntry(ORIGINAL_APK_ASSET_PATH).getCrc();
+                cacheApkPath = context.getCacheDir() + "/lspatch/origin/" + sourceFile.getEntry(ORIGINAL_APK_ASSET_PATH).getCrc() + ".apk";
             }
             SigBypass.enableOpenatHook(context.getPackageResourcePath(), cacheApkPath);
         }
diff --git a/patch-loader/src/main/java/org/lsposed/lspatch/service/LocalApplicationService.java b/patch-loader/src/main/java/org/lsposed/lspatch/service/LocalApplicationService.java
index 20ee4f8..37d6d6f 100644
--- a/patch-loader/src/main/java/org/lsposed/lspatch/service/LocalApplicationService.java
+++ b/patch-loader/src/main/java/org/lsposed/lspatch/service/LocalApplicationService.java
@@ -33,7 +33,7 @@ public class LocalApplicationService extends ILSPApplicationService.Stub {
                 String modulePath = context.getCacheDir() + "/lspatch/" + packageName + "/";
                 String cacheApkPath;
                 try (ZipFile sourceFile = new ZipFile(context.getPackageResourcePath())) {
-                    cacheApkPath = modulePath + sourceFile.getEntry("assets/lspatch/modules/" + name).getCrc();
+                    cacheApkPath = modulePath + sourceFile.getEntry("assets/lspatch/modules/" + name).getCrc() + ".apk";
                 }
 
                 if (!Files.exists(Paths.get(cacheApkPath))) {
diff --git a/patch/src/main/java/org/lsposed/patch/LSPatch.java b/patch/src/main/java/org/lsposed/patch/LSPatch.java
index 2e9af92..9b5e6d5 100644
--- a/patch/src/main/java/org/lsposed/patch/LSPatch.java
+++ b/patch/src/main/java/org/lsposed/patch/LSPatch.java
@@ -345,7 +345,7 @@ public class LSPatch {
                 var manifest = Objects.requireNonNull(ManifestParser.parseManifestFile(xmlIs));
                 var packageName = manifest.packageName;
                 logger.i("  - " + packageName);
-                zFile.add("assets/lspatch/modules/" + packageName + ".bin", fileIs);
+                zFile.add("assets/lspatch/modules/" + packageName + ".apk", fileIs);
             } catch (NullPointerException | IOException e) {
                 logger.e(module + " does not exist or is not a valid apk file.");
             }
diff --git a/share/java/src/main/java/org/lsposed/lspatch/share/Constants.java b/share/java/src/main/java/org/lsposed/lspatch/share/Constants.java
index 5a15b3f..ed01f8d 100644
--- a/share/java/src/main/java/org/lsposed/lspatch/share/Constants.java
+++ b/share/java/src/main/java/org/lsposed/lspatch/share/Constants.java
@@ -4,7 +4,7 @@ public class Constants {
 
     final static public String DEX_ASSET_PATH = "assets/lspatch/lsp.dex";
     final static public String CONFIG_ASSET_PATH = "assets/lspatch/config.json";
-    final static public String ORIGINAL_APK_ASSET_PATH = "assets/lspatch/origin_apk.bin";
+    final static public String ORIGINAL_APK_ASSET_PATH = "assets/lspatch/origin.apk";
 
     final static public String PROXY_APP_COMPONENT_FACTORY = "org.lsposed.lspatch.appstub.LSPAppComponentFactoryStub";
     final static public String MANAGER_PACKAGE_NAME = "org.lsposed.lspatch";