From 271b0287d8f5dd73a89c5fdea4a909828c2bf24c Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Sun, 20 Oct 2019 17:47:55 -0400 Subject: [PATCH] Pass in stub version just in case --- .../main/java/com/topjohnwu/magisk/utils/DynAPK.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/shared/src/main/java/com/topjohnwu/magisk/utils/DynAPK.java b/shared/src/main/java/com/topjohnwu/magisk/utils/DynAPK.java index 93dfbf84c..24d139c3f 100644 --- a/shared/src/main/java/com/topjohnwu/magisk/utils/DynAPK.java +++ b/shared/src/main/java/com/topjohnwu/magisk/utils/DynAPK.java @@ -7,9 +7,12 @@ import java.util.Map; public class DynAPK { + private static final int STUB_VERSION = 1; + // Indices of the object array - private static final int COMPONENT_MAP = 0; - private static final int RESOURCE_MAP = 1; + private static final int STUB_VERSION_ENTRY = 0; + private static final int COMPONENT_MAP = 1; + private static final int RESOURCE_MAP = 2; // Indices of the resource map public static final int NOTIFICATION = 0; @@ -39,19 +42,22 @@ public class DynAPK { public static Data load(Object o) { Object[] arr = (Object[]) o; Data data = new Data(); + data.version = (int) arr[STUB_VERSION_ENTRY]; data.componentMap = (Map) arr[COMPONENT_MAP]; data.resourceMap = (int[]) arr[RESOURCE_MAP]; return data; } public static Object pack(Data data) { - Object[] arr = new Object[2]; + Object[] arr = new Object[3]; + arr[STUB_VERSION_ENTRY] = STUB_VERSION; arr[COMPONENT_MAP] = data.componentMap; arr[RESOURCE_MAP] = data.resourceMap; return arr; } public static class Data { + public int version; public Map componentMap; public int[] resourceMap; }