Merge pull request #34 from zjn0505/dev/switch-workflow-lib

Switch workflow lib

- Add APK file universal action
- Add modifier for listed applications
- Add modifier to show package options from dump task stacks
- Check APK signature in background
- Fix several regressions after python3 migration

scripts/adb_wifi.py → adb_wifi.py

@@ -4,7 +4,7 @@
 
 from workflow.background import run_in_background, is_running
 from item import Item
-from workflow import Workflow3
+from workflow import Workflow
 from toolchain import run_script
 from commands import CMD_GET_TCPIP
 from commands import CMD_TCPIP
@@ -19,7 +19,7 @@ def connect():
 		wifiDevices = []
 		wifiDevices.append(it)
 		run_in_background("update_wifi_history", 
-			['/usr/bin/python', wf.workflowfile('scripts/update_wifi_history.py'), 'add', pickle.dumps(wifiDevices)])
+			['/usr/bin/python3', wf.workflowfile('update_wifi_history.py'), 'add', pickle.dumps(wifiDevices)])
 	print("Executed: " + result)
 
 def init():
@@ -35,5 +35,5 @@ def init():
 
 if __name__ == '__main__':
 	if ip:
-		wf = Workflow3()
+		wf = Workflow()
 		init()

apk_print_cert.py

@@ -0,0 +1,37 @@
+import os
+import sys
+import pipes
+from workflow import Workflow
+from toolchain import run_script
+import subprocess
+
+adb_path = os.getenv('adb_path')
+apkFileOrFolder = os.getenv('apkFile')
+aapt_path = os.getenv('aapt_path')
+apksigner_path = os.getenv("apksigner_path")
+
+def main(wf):
+
+    hash = sys.argv[1]
+    apkPath = pipes.quote(apkFileOrFolder)
+    cmd = "{0} verify -v --print-certs {1}".format(apksigner_path, apkPath)
+
+    result = ""
+    verified = False
+    try:
+        result = run_script(cmd)
+        verified = True
+    except subprocess.CalledProcessError as exc:
+        log.error("Not verified")
+        result = exc.output.decode('utf8')
+
+    log.warning(result)
+    log.warning("result--end")
+
+    wf.cache_data('apk_print_cert' + hash, result+ "\n{}".format(verified))
+
+
+if __name__ == '__main__':
+    wf = Workflow()
+    log = wf.logger
+    sys.exit(wf.run(main))

scripts/clear_command_history.py → clear_command_history.py

@@ -1,6 +1,6 @@
 import sys
 import os
-from workflow import Workflow3
+from workflow import Workflow
 
 def main(wf):
 
@@ -20,6 +20,6 @@ def main(wf):
         wf.send_feedback()
 
 if __name__ == '__main__':
-    wf = Workflow3()
+    wf = Workflow()
     log = wf.logger
     sys.exit(wf.run(main))

scripts/dump_stack.py → dump_stack.py

@@ -1,6 +1,6 @@
 import os
 import sys
-from workflow import Workflow3
+from workflow import Workflow
 from toolchain import run_script
 from commands import CMD_DUMP_STACK
 
@@ -52,12 +52,16 @@ def main(wf):
                     arg=item.name,
                     copytext=item.name,
                     valid=True)
-                it.add_modifier("cmd", subtitle="Package: " + item.package)
+                m = it.add_modifier("cmd", subtitle="Package: " + item.package)
+                m.setvar("package", item.package)
+
         wf.send_feedback()
-    except:
+    except Exception as e:
         log.debug("Error")
+        log.error(e)
+
 
 if __name__ == '__main__':
-    wf = Workflow3()
+    wf = Workflow()
     log = wf.logger
     sys.exit(wf.run(main))