Skip to content

Commit ba735cf

Browse files
committed
Add V4 signature support
Bump to 1.12.3
1 parent c1477ab commit ba735cf

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

info.plist

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7774,11 +7774,11 @@ Use keyword "geny" to list and start Genymotion emulator</string>
77747774
<key>variables</key>
77757775
<dict>
77767776
<key>aapt_path</key>
7777-
<string>~/Library/Android/sdk/build-tools/29.0.2/aapt</string>
7777+
<string>~/Library/Android/sdk/build-tools/30.0.3/aapt</string>
77787778
<key>adb_path</key>
77797779
<string>~/Library/Android/sdk/platform-tools/adb</string>
77807780
<key>apksigner_path</key>
7781-
<string>~/Library/Android/sdk/build-tools/29.0.2/apksigner</string>
7781+
<string>~/Library/Android/sdk/build-tools/30.0.3/apksigner</string>
77827782
<key>config_clipboard</key>
77837783
<string>1</string>
77847784
<key>emulator_path</key>
@@ -7804,7 +7804,7 @@ Use keyword "geny" to list and start Genymotion emulator</string>
78047804
<string>aapt_path</string>
78057805
</array>
78067806
<key>version</key>
7807-
<string>1.12.2</string>
7807+
<string>1.12.3</string>
78087808
<key>webaddress</key>
78097809
<string>https://github.com/zjn0505/adb-alfred</string>
78107810
</dict>

scripts/show_install_options.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ def showApkInstallItems():
161161

162162
if apk.has_key('max'):
163163
it.add_modifier('alt', "maxSdkVersion {0}".format(apk["max"]))
164+
else:
165+
it.add_modifier('alt', "maxSdkVersion not set")
164166

165167
if apk.has_key('target'):
166168
it.add_modifier('ctrl', "targetSdkVersion {0}".format(apk["target"]))
@@ -277,6 +279,7 @@ def main(wf):
277279
v1Verified = False
278280
v2Verified = False
279281
v3Verified = False
282+
v4Verified = None
280283
error = []
281284
signer = []
282285

@@ -289,6 +292,8 @@ def main(wf):
289292
v2Verified = True
290293
elif info.startswith("Verified using v3 scheme") and info.endswith("true"):
291294
v3Verified = True
295+
elif info.startswith("Verified using v4 scheme"):
296+
v4Verified = info.endswith("true")
292297
elif info.startswith("ERROR"):
293298
error.append(info)
294299

@@ -312,7 +317,10 @@ def main(wf):
312317
title = "Signature " + infos[0]
313318
if infos[0] == "Verifies":
314319
title = "Signature verified"
315-
subtitle = "Scheme V1 {0}, V2 {1}, V3 {2}".format(v1Verified, v2Verified, v3Verified)
320+
if v4Verified != None:
321+
subtitle = "Scheme V1 {0}, V2 {1}, V3 {2} V4 {3}".format(v1Verified, v2Verified, v3Verified, v4Verified)
322+
else:
323+
subtitle = "Scheme V1 {0}, V2 {1}, V3 {2}".format(v1Verified, v2Verified, v3Verified)
316324
if verified:
317325
wf.add_item(title=title, subtitle=subtitle, icon=ICON_INFO, valid=False)
318326
else:

version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.12.2
1+
1.12.3

0 commit comments

Comments
 (0)