Skip to content

Commit

Permalink
Add V4 signature support
Browse files Browse the repository at this point in the history
Bump to 1.12.3
  • Loading branch information
zjn0505 committed Jul 9, 2021
1 parent c1477ab commit ba735cf
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
6 changes: 3 additions & 3 deletions info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
10 changes: 9 additions & 1 deletion scripts/show_install_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]))
Expand Down Expand Up @@ -277,6 +279,7 @@ def main(wf):
v1Verified = False
v2Verified = False
v3Verified = False
v4Verified = None
error = []
signer = []

Expand All @@ -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)

Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.12.2
1.12.3

0 comments on commit ba735cf

Please sign in to comment.