Upgrade Androguard version to latest

Pipfile

@@ -15,7 +15,7 @@ tqdm = "<=4.66.5"
 colorama = "<=0.4.4"
 quark-engine = {editable = true,path = "."}
 click = "<=8.1.7"
-androguard = "==3.4.0a1"
+androguard = "==4.1.4"
 graphviz = "<=0.18.2"
 requests = "<=2.33.0"
 plotly = "<=5.4.0"
@@ -28,7 +28,7 @@ r2pipe = "==1.8.0"
 pathvalidate = "==3.2.3"
 
 [requires]
-python_version = "3.10"
+python_version = ">=3.10"
 
 [pipenv]
 allow_prereleases = true

quark/core/apkinfo.py

@@ -16,16 +16,20 @@
 from typing import Dict, List, Optional, Set, Union
 
 from androguard.core.analysis.analysis import MethodAnalysis
-from androguard.core.bytecodes.dvm_types import Operand
+from androguard.core.dex.dex_types import Operand
 from androguard.misc import AnalyzeAPK, get_default_session
-from androguard.core.bytecodes.dvm import Instruction45cc, Instruction4rcc, get_kind, Kind
+from androguard.core.dex import Instruction45cc, Instruction4rcc, get_kind, Kind
+from loguru import logger as _androguard_logger
 
 from quark.core.interface.baseapkinfo import BaseApkinfo
 from quark.core.struct.bytecodeobject import BytecodeObject
 from quark.core.struct.methodobject import MethodObject
 from quark.evaluator.pyeval import PyEval
 
 
+_androguard_logger.disable("androguard")
+
+
 class AndroguardImp(BaseApkinfo):
     """Information about apk based on androguard analysis"""
 

setup.py

@@ -7,7 +7,8 @@
 
 required_requirements = [
     "prettytable>=1.0.0",
-    "androguard==3.4.0a1",
+    "androguard==4.1.4",
+    "numpy",
     "tqdm",
     "colorama",
     "graphviz",

tests/forensic/test_forensic.py

@@ -22,7 +22,7 @@ def forensic(scope="function"):
 
 class TestForensic:
     def test_all_strings(self, forensic):
-        assert len(forensic.get_all_strings()) == 1005
+        assert len(forensic.get_all_strings()) == 4409
 
     def test_get_url(self, forensic):
         assert len(forensic.get_url()) == 4
@@ -48,7 +48,7 @@ def test_get_file(self, forensic):
         assert len(forensic.get_file()) == 0
 
     def test_get_base64(self, forensic):
-        assert len(forensic.get_base64()) == 102
+        assert len(forensic.get_base64()) == 604
 
     def test_get_android_api(self, forensic):
         assert len(forensic.get_android_api()) == 640

tests/script/test_script.py

@@ -418,7 +418,7 @@ def testMethodGetXrefFrom(QUARK_ANALYSIS_RESULT_FOR_RULE_68):
 
     @staticmethod
     def testGetAllStrings(QUARK_ANALYSIS_RESULT_FOR_RULE_68):
-        assert len(QUARK_ANALYSIS_RESULT_FOR_RULE_68.getAllStrings()) == 1005
+        assert len(QUARK_ANALYSIS_RESULT_FOR_RULE_68.getAllStrings()) == 4409
 
     @staticmethod
     def testIsHardCoded(QUARK_ANALYSIS_RESULT_FOR_RULE_68):