Recover support of older Android versions (starting from level 16)

Author: astonbitecode

java/pom.xml

@@ -42,7 +42,7 @@
         <dependency>
             <groupId>io.github.astonbitecode</groupId>
             <artifactId>j4rs</artifactId>
-            <version>0.11.0-java7</version>
+            <version>0.11.2-java7</version>
         </dependency>
         <dependency>
             <groupId>com.dropbox.core</groupId>

java/src/main/java/org/astonbitecode/rustkeylock/adapters/EntriesAdapter.java

@@ -17,8 +17,8 @@
 
 import java.util.List;
 
-import org.astonbitecode.rustkeylock.R;
 import org.astonbitecode.rustkeylock.api.JavaEntry;
+import org.astonbitecode.rustkeylock.R;
 
 import android.app.Activity;
 import android.content.Context;

java/src/main/java/org/astonbitecode/rustkeylock/api/InterfaceWithRust.java

@@ -19,7 +19,6 @@
 import android.util.Log;
 import org.astonbitecode.j4rs.api.invocation.NativeCallbackToRustChannelSupport;
 import org.astonbitecode.rustkeylock.api.stubs.GuiResponse;
-import org.astonbitecode.rustkeylock.callbacks.*;
 
 import java.util.List;
 import java.util.Map;
@@ -28,7 +27,7 @@
 public class InterfaceWithRust {
     private final String TAG = getClass().getName();
     public static final InterfaceWithRust INSTANCE = new InterfaceWithRust();
-    private AtomicReference<NativeCallbackToRustChannelSupport> callback = new AtomicReference(null);
+    private AtomicReference<NativeCallbackToRustChannelSupport> callback = new AtomicReference<>(null);
     private AtomicReference<Fragment> previousFragment = new AtomicReference<>(null);
 
     private InterfaceWithRust() {

rust/Cargo.toml

@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 rust_keylock = {git="https://github.com/rust-keylock/rust-keylock-lib.git"}
-j4rs = "0.11.0"
+j4rs = "0.11"
 libc = "0.2"
 jni-sys = "0.3"
 serde = { version = "1.0", features = ["derive"] }

rust/src/lib.rs

@@ -51,12 +51,14 @@ pub extern fn Java_org_astonbitecode_rustkeylock_api_InterfaceWithRust_execute(
     _jni_env: *mut JNIEnv,
     _thiz: jobject,
     cert_file_path_java_string: jstring) {
+    debug!("Executing rust-keylock native");
     match j4rs::JvmBuilder::new()
         .detach_thread_on_drop(false)
         .with_no_implicit_classpath()
         .with_native_lib_name("rustkeylockandroid")
         .build() {
         Ok(jvm) => {
+            debug!("JVM is created ");
             if let Ok(cert_file_path) = j4rs::jstring_to_rust_string(&jvm, cert_file_path_java_string) {
                 ::std::env::set_var("SSL_CERT_FILE", cert_file_path);
             }