bugfix

androscalpel/src/annotation.rs

@@ -32,6 +32,10 @@ pub struct DexAnnotationItem {
 
 #[pymethods]
 impl DexAnnotationItem {
+    pub fn __eq__(&self, other: &Self) -> bool {
+        self == other
+    }
+
     #[new]
     pub fn new(annotation: DexAnnotation) -> Self {
         Self {
@@ -124,6 +128,10 @@ pub struct DexAnnotation {
 
 #[pymethods]
 impl DexAnnotation {
+    pub fn __eq__(&self, other: &Self) -> bool {
+        self == other
+    }
+
     #[new]
     pub fn new(type_: IdType, elements: HashMap<DexString, DexValue>) -> Self {
         Self { type_, elements }

androscalpel/src/apk.rs

@@ -2364,6 +2364,10 @@ impl Apk {
         Ok(())
     }
 
+    pub fn __eq__(&self, other: &Self) -> bool {
+        self == other
+    }
+
     #[pyo3(name = "gen_raw_dex")] //Sad GIL noise
     pub fn py_gen_raw_dex(&self, py: Python<'_>) -> Result<Vec<PyObject>> {
         Ok(self

androscalpel/src/class.rs

@@ -368,4 +368,8 @@ impl Class {
         }
         flags
     }
+
+    pub fn __eq__(&self, other: &Self) -> bool {
+        self == other
+    }
 }

androscalpel/src/code.rs

@@ -38,6 +38,8 @@ pub struct Code {
     pub insns: Vec<Instruction>,
 }
 
+// TODO reimplement PartialEq: label should become address independant
+
 #[pymethods]
 impl Code {
     pub fn to_json(&self) -> Result<String> {
@@ -128,4 +130,8 @@ impl Code {
         }
         handles
     }
+
+    pub fn __eq__(&self, other: &Self) -> bool {
+        self == other
+    }
 }

androscalpel/src/dex_id.rs

@@ -448,7 +448,6 @@ impl IdType {
         types.insert(self.clone());
         types
     }
-
     // TODO: TESTS
 }
 
@@ -679,6 +678,7 @@ impl PartialOrd for IdMethod {
 #[pyclass]
 #[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
 pub struct IdEnum(pub IdField);
+
 #[pymethods]
 impl IdEnum {
     pub fn to_json(&self) -> Result<String> {
@@ -721,4 +721,8 @@ impl IdEnum {
     pub fn get_all_field_ids(&self) -> HashSet<IdField> {
         self.0.get_all_field_ids()
     }
+
+    pub fn __eq__(&self, other: &Self) -> bool {
+        self == other
+    }
 }

androscalpel/src/field.rs

@@ -248,4 +248,8 @@ impl Field {
     pub fn has_annotations(&self) -> bool {
         !self.annotations.is_empty()
     }
+
+    pub fn __eq__(&self, other: &Self) -> bool {
+        self == other
+    }
 }

androscalpel/src/method.rs

@@ -289,4 +289,8 @@ impl Method {
                 .iter()
                 .any(|list| !list.is_empty())
     }
+
+    pub fn __eq__(&self, other: &Self) -> bool {
+        self == other
+    }
 }

test.py

@@ -5,20 +5,21 @@ logging.basicConfig(format=FORMAT)
 logging.getLogger().setLevel(logging.DEBUG)
 
 import json
-import androscalpel as asc
 import zipfile as z
-from androscalpel import *
 from pathlib import Path
 
+from androscalpel import Apk, IdType, IdMethodType, ins, DexString, IdMethod, Code, utils  # type: ignore
+
 # APK_NAME = Path(__file__).parent / "test.apk"
-APK_NAME = Path(__file__).parent / "app-release.apk"
+APK_NAME = Path(__file__).parent / "app.apk"
 DEX_NAME = "classes.dex"
 
+print(f"[+] Load bytecode ")
 with z.ZipFile(APK_NAME) as zipf:
-    with zipf.open(DEX_NAME, "r") as dex:
-        dex = dex.read()
+    with zipf.open(DEX_NAME, "r") as dex_f:
+        dex = dex_f.read()
 
-apk = asc.Apk()
+apk = Apk()
 apk.add_dex_file(dex)
 
 clazz_id = IdType("Lcom/example/testapplication/ui/home/HomeViewModel;")
@@ -35,17 +36,18 @@ print(f"[+] Code of {method_id} ")
 for i in code.insns:
     print(f"    {i}")
 print("[+] Modify code")
+
 new_insns = []
 for i in code.insns:
-    if isinstance(i, asc.ins.ConstString):
+    if isinstance(i, ins.ConstString):
         if i.lit == "Hello":
-            i = asc.ins.ConstString(i.reg, DexString("Degemer Mat"))
+            i = ins.ConstString(i.reg, DexString("Degemer Mat"))
         elif i.lit == "Bye":
-            i = asc.ins.ConstString(i.reg, DexString("Kenavo"))
+            i = ins.ConstString(i.reg, DexString("Kenavo"))
     new_insns.append(i)
 
 # This need improving!
-code = asc.Code(code.registers_size, code.ins_size, code.outs_size, new_insns)
+code = Code(code.registers_size, code.ins_size, code.outs_size, new_insns)
 apk.set_method_code(method_id, code)
 # apk.set_method_code(method.descriptor, code)
 
@@ -58,49 +60,44 @@ for i in code.insns:
     print(f"    {i}")
 
 # Strip class for debugging
-# classes = list(
-#    filter(
-#        lambda x: x
-#        not in [
-#            IdType("Lcom/example/testapplication/ui/home/HomeViewModel;"),
-#            IdType("Landroidx/navigation/NavDeepLink$Builder;"),
-#            IdType("Landroidx/constraintlayout/core/widgets/ConstraintWidget$1;"),
-#        ],
-#        apk.classes.keys(),
-#    )
-# )
-# for cls in classes:
-#    apk.remove_class(cls)
+classes = list(
+    filter(
+        lambda x: x
+        not in [
+            IdType("Lcom/example/testapplication/ui/home/HomeViewModel;"),
+            IdType("Landroidx/navigation/NavDeepLink$Builder;"),
+            IdType("Landroidx/constraintlayout/core/widgets/ConstraintWidget$1;"),
+        ],
+        apk.classes.keys(),
+    )
+)
+for cls in classes:
+    apk.remove_class(cls)
 
 print("[+] Recompile")
 
 dex_raw = apk.gen_raw_dex()
 
-utils.replace_dex(
-    APK_NAME,
-    APK_NAME.parent / "app-instrumented.apk",
-    dex_raw,
-    Path().parent / "my-release-key.jks",
-    zipalign=Path.home() / "Android" / "Sdk" / "build-tools" / "34.0.0" / "zipalign",
-    apksigner=Path.home() / "Android" / "Sdk" / "build-tools" / "34.0.0" / "apksigner",
-)
-
-# assert len(dex_raw) == 1
-# with open(DEX_NAME, "wb") as file:
-#    file.write(dex_raw[0])
-#
-# with open(DEX_NAME, "rb") as file:
-#    dex = file.read()
-
-print("[+] Load new dex")
-new_apk = asc.Apk()
+new_apk = Apk()
 for dex in dex_raw:
     new_apk.add_dex_file(dex)
 
-clazz = new_apk.classes[clazz_id]
-method = clazz.virtual_methods[method_id]
-code = method.code
+print(f"{new_apk == apk=}")
 
-print(f"[+] Code of {method_id} in new apk")
-for i in code.insns:
-    print(f"    {i}")
+
+# print("[+] Repackage")
+#
+# utils.replace_dex(
+#    APK_NAME,
+#    APK_NAME.parent / (APK_NAME.name.removesuffix(".apk") + "-instrumented.apk"),
+#    dex_raw,
+#    Path().parent / "my-release-key.jks",
+#    zipalign=Path.home() / "Android" / "Sdk" / "build-tools" / "34.0.0" / "zipalign",
+#    apksigner=Path.home() / "Android" / "Sdk" / "build-tools" / "34.0.0" / "apksigner",
+# )
+
+
+def cmp(a, b):
+    for f in dir(a):
+        if getattr(getattr(a, f), "__call__", None) is None:
+            print(f"{f}: {getattr(a, f) == getattr(b, f)}")