Merge branch 'master' into newFields

hsiafan · Nov 1, 2019 · 061d336 · 061d336
2 parents 00f1451 + 860e651
commit 061d336
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/main/java/net/dongliu/apk/parser/parser/ApkMetaTranslator.java b/src/main/java/net/dongliu/apk/parser/parser/ApkMetaTranslator.java
@@ -79,7 +79,6 @@ public void onStartTag(XmlNodeStartTag xmlNodeStartTag) {
             case "manifest":
                 apkMetaBuilder.setPackageName(attributes.getString("package"));
                 apkMetaBuilder.setVersionName(attributes.getString("versionName"));
-                apkMetaBuilder.setVersionCode(attributes.getLong("versionCode"));
                 apkMetaBuilder.setRevisionCode(attributes.getLong("revisionCode"));
                 apkMetaBuilder.setSharedUserId(attributes.getString("sharedUserId"));
                 apkMetaBuilder.setSharedUserLabel(attributes.getString("sharedUserLabel"));
@@ -89,6 +88,16 @@ public void onStartTag(XmlNodeStartTag xmlNodeStartTag) {
                 apkMetaBuilder.setIsSplitRequired(attributes.getBoolean("isSplitRequired", false));
                 apkMetaBuilder.setIsolatedSplits(attributes.getBoolean("isolatedSplits", false));
 
+                Long majorVersionCode = attributes.getLong("versionCodeMajor");
+                Long versionCode = attributes.getLong("versionCode");
+                if (majorVersionCode != null) {
+                    if (versionCode == null) {
+                        versionCode = 0L;
+                    }
+                    versionCode = (majorVersionCode << 32) | (versionCode & 0xFFFFFFFFL);
+                }
+                apkMetaBuilder.setVersionCode(versionCode);
+
                 String installLocation = attributes.getString("installLocation");
                 if (installLocation != null) {
                     apkMetaBuilder.setInstallLocation(installLocation);