these-android-re/android_of_theseus
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update to 2024

Browse source
This commit is contained in:
Jean-Marie Mineau 2025-03-27 14:14:22 +01:00
parent 01426a3d0f
commit 0a77cf2efb
Signed by: histausse
GPG key ID: B66AEEDA9B645AD2
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
patcher/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "patcher"
version = "0.1.0"
edition = "2021"
edition = "2024"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

20
patcher/src/code_loading_patcher.rs
View file

@ -115,17 +115,17 @@ fn insert_code_model_class_loaders(apk: &mut Apk, data: &RuntimeData) -> Result<
// TODO: update Runtime Data to reflect the name change
let apk = if let ApkOrRef::Ref(apk) = class_loaders.remove(&main_cl_id).unwrap().apk {
let apk = match class_loaders.remove(&main_cl_id).unwrap().apk { ApkOrRef::Ref(apk) => {
apk
} else {
} _ => {
panic!("Main APK is not stored as ref?")
};
}};
for (_, ClassLoader { apk: other, .. }) in class_loaders.into_iter() {
if let ApkOrRef::Owned(other) = other {
match other { ApkOrRef::Owned(other) => {
apk.merge(other);
} else {
} _ => {
panic!("Secondary APK is not stored as owned?")
}
}}
}
//todo!()
Ok(())
@ -144,14 +144,14 @@ struct ClassLoader<'a> {
impl ClassLoader<'_> {
pub fn apk_mut(&mut self) -> &mut Apk {
match &mut self.apk {
ApkOrRef::Owned(ref mut apk) => apk,
ApkOrRef::Ref(ref mut apk) => apk,
ApkOrRef::Owned(apk) => apk,
ApkOrRef::Ref(apk) => apk,
}
}
pub fn apk(&self) -> &Apk {
match &self.apk {
ApkOrRef::Owned(ref apk) => apk,
ApkOrRef::Ref(ref apk) => apk,
ApkOrRef::Owned(apk) => apk,
ApkOrRef::Ref(apk) => apk,
}
}