liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

make android unit tests and earthly build work

Browse Source
This commit is contained in:
John Smith
2022-01-11 21:48:37 -05:00
parent 02c0d065ef
commit d979f7f504
5 changed files with 54 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
veilid-core/src/intf/native/protected_store.rs
View File

@@ -33,7 +33,13 @@ impl ProtectedStore {
let c = self.config.get();
let mut inner = self.inner.lock();
if !c.protected_store.always_use_insecure_storage {
inner.keyring_manager = KeyringManager::new_secure(&c.program_name).ok();
cfg_if! {
if #[cfg(target_os = "android")] {
inner.keyring_manager = KeyringManager::new_secure(&c.program_name, intf::native::utils::android::get_android_globals()).ok();
} else {
inner.keyring_manager = KeyringManager::new_secure(&c.program_name).ok();
}
}
}
if (c.protected_store.always_use_insecure_storage
|| c.protected_store.allow_insecure_fallback)

6
veilid-core/src/intf/native/utils/android/get_directories.rs
View File

@@ -6,7 +6,7 @@ pub fn get_files_dir() -> String {
let ag = aglock.as_ref().unwrap();
let env = ag.vm.attach_current_thread().unwrap();
with_null_local_frame(env, 64, || {
with_null_local_frame(*env, 64, || {
// context.getFilesDir().getAbsolutePath()
let file = env
.call_method(ag.ctx.as_obj(), "getFilesDir", "()Ljava/io/File;", &[])
@@ -30,7 +30,7 @@ pub fn get_cache_dir() -> String {
let ag = aglock.as_ref().unwrap();
let env = ag.vm.attach_current_thread().unwrap();
with_null_local_frame(env, 64, || {
with_null_local_frame(*env, 64, || {
// context.getCacheDir().getAbsolutePath()
let file = env
.call_method(ag.ctx.as_obj(), "getCacheDir", "()Ljava/io/File;", &[])
@@ -44,7 +44,7 @@ pub fn get_cache_dir() -> String {
.unwrap();
let jstrval = env.get_string(JString::from(path)).unwrap();
String::from(jstrval.to_string_lossy())
Ok(String::from(jstrval.to_string_lossy()))
})
.unwrap()
}

9
veilid-core/src/intf/native/utils/android/mod.rs
View File

@@ -68,6 +68,15 @@ pub fn veilid_core_setup_android<'a>(
});
}
pub fn get_android_globals() -> (JavaVM, GlobalRef) {
let globals_locked = ANDROID_GLOBALS.lock();
let globals = globals_locked.as_ref().unwrap();
let env = globals.vm.attach_current_thread().unwrap();
let vm = env.get_java_vm().unwrap();
let ctx = globals.ctx.clone();
(vm, ctx)
}
pub fn with_null_local_frame<'b, T, F>(env: JNIEnv<'b>, s: i32, f: F) -> JniResult<T>
where
F: FnOnce() -> JniResult<T>,