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

android fixes

Browse Source
This commit is contained in:
Christien Rioux
2023-09-01 17:44:42 -04:00
parent f79b13a6d1
commit ffcf16711b
7 changed files with 45 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,13 +1,14 @@
use super::*;
use jni::errors::Result as JniResult;
use jni::objects::JString;
#[allow(dead_code)]
pub fn get_files_dir() -> String {
let aglock = ANDROID_GLOBALS.lock();
let ag = aglock.as_ref().unwrap();
let env = ag.vm.attach_current_thread().unwrap();
let mut env = ag.vm.attach_current_thread().unwrap();
with_null_local_frame(*env, 64, || {
env.with_local_frame(64, |env| {
// context.getFilesDir().getAbsolutePath()
let file = env
.call_method(ag.ctx.as_obj(), "getFilesDir", "()Ljava/io/File;", &[])
@@ -20,8 +21,9 @@ pub fn get_files_dir() -> String {
.l()
.unwrap();
let jstrval = env.get_string(JString::from(path)).unwrap();
Ok(String::from(jstrval.to_string_lossy()))
let jstr = JString::from(path);
let jstrval = env.get_string(&jstr).unwrap();
JniResult::Ok(String::from(jstrval.to_string_lossy()))
})
.unwrap()
}
@@ -30,9 +32,9 @@ pub fn get_files_dir() -> String {
pub fn get_cache_dir() -> String {
let aglock = ANDROID_GLOBALS.lock();
let ag = aglock.as_ref().unwrap();
let env = ag.vm.attach_current_thread().unwrap();
let mut env = ag.vm.attach_current_thread().unwrap();
with_null_local_frame(*env, 64, || {
env.with_local_frame(64, |env| {
// context.getCacheDir().getAbsolutePath()
let file = env
.call_method(ag.ctx.as_obj(), "getCacheDir", "()Ljava/io/File;", &[])
@@ -45,8 +47,9 @@ pub fn get_cache_dir() -> String {
.l()
.unwrap();
let jstrval = env.get_string(JString::from(path)).unwrap();
Ok(String::from(jstrval.to_string_lossy()))
let jstr = JString::from(path);
let jstrval = env.get_string(&jstr).unwrap();
JniResult::Ok(String::from(jstrval.to_string_lossy()))
})
.unwrap()
}

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

@@ -2,7 +2,6 @@ mod get_directories;
pub use get_directories::*;
use crate::*;
use jni::errors::Result as JniResult;
use jni::{objects::GlobalRef, objects::JObject, JNIEnv, JavaVM};
use lazy_static::*;
@@ -41,13 +40,3 @@ pub fn get_android_globals() -> (JavaVM, GlobalRef) {
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>,
{
env.push_local_frame(s)?;
let out = f();
env.pop_local_frame(JObject::null())?;
out
}