From ba735cf72d7d8031f642e72bb667ba7acda9a99d Mon Sep 17 00:00:00 2001
From: Charlie Zhang <zjn0505@hotmail.com>
Date: Sat, 10 Jul 2021 00:15:16 +0800
Subject: [PATCH] Add V4 signature support Bump to 1.12.3

---
 info.plist                      |  6 +++---
 scripts/show_install_options.py | 10 +++++++++-
 version                         |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/info.plist b/info.plist
index 62922b2..eaa12fc 100644
--- a/info.plist
+++ b/info.plist
@@ -7774,11 +7774,11 @@ Use keyword "geny" to list and start Genymotion emulator</string>
 	<key>variables</key>
 	<dict>
 		<key>aapt_path</key>
-		<string>~/Library/Android/sdk/build-tools/29.0.2/aapt</string>
+		<string>~/Library/Android/sdk/build-tools/30.0.3/aapt</string>
 		<key>adb_path</key>
 		<string>~/Library/Android/sdk/platform-tools/adb</string>
 		<key>apksigner_path</key>
-		<string>~/Library/Android/sdk/build-tools/29.0.2/apksigner</string>
+		<string>~/Library/Android/sdk/build-tools/30.0.3/apksigner</string>
 		<key>config_clipboard</key>
 		<string>1</string>
 		<key>emulator_path</key>
@@ -7804,7 +7804,7 @@ Use keyword "geny" to list and start Genymotion emulator</string>
 		<string>aapt_path</string>
 	</array>
 	<key>version</key>
-	<string>1.12.2</string>
+	<string>1.12.3</string>
 	<key>webaddress</key>
 	<string>https://github.com/zjn0505/adb-alfred</string>
 </dict>
diff --git a/scripts/show_install_options.py b/scripts/show_install_options.py
index de9a8a3..4daa4d7 100644
--- a/scripts/show_install_options.py
+++ b/scripts/show_install_options.py
@@ -161,6 +161,8 @@ def showApkInstallItems():
                     
                     if apk.has_key('max'):
                         it.add_modifier('alt', "maxSdkVersion {0}".format(apk["max"]))
+                    else:
+                        it.add_modifier('alt', "maxSdkVersion not set")
 
                     if apk.has_key('target'):
                         it.add_modifier('ctrl', "targetSdkVersion {0}".format(apk["target"]))
@@ -277,6 +279,7 @@ def main(wf):
                 v1Verified = False
                 v2Verified = False
                 v3Verified = False
+                v4Verified = None
                 error = []
                 signer = []
 
@@ -289,6 +292,8 @@ def main(wf):
                         v2Verified = True
                     elif info.startswith("Verified using v3 scheme") and info.endswith("true"):
                         v3Verified = True
+                    elif info.startswith("Verified using v4 scheme"):
+                        v4Verified = info.endswith("true")
                     elif info.startswith("ERROR"):
                         error.append(info)
 
@@ -312,7 +317,10 @@ def main(wf):
                 title = "Signature " + infos[0]
                 if infos[0] == "Verifies":
                     title = "Signature verified"
-                subtitle = "Scheme V1 {0}, V2 {1}, V3 {2}".format(v1Verified, v2Verified, v3Verified)
+                if v4Verified != None:
+                    subtitle = "Scheme V1 {0}, V2 {1}, V3 {2} V4 {3}".format(v1Verified, v2Verified, v3Verified, v4Verified)
+                else:
+                    subtitle = "Scheme V1 {0}, V2 {1}, V3 {2}".format(v1Verified, v2Verified, v3Verified)
                 if verified:
                     wf.add_item(title=title, subtitle=subtitle, icon=ICON_INFO, valid=False)
                 else:
diff --git a/version b/version
index 69669de..c56eaaa 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.12.2
\ No newline at end of file
+1.12.3
\ No newline at end of file