Bump v0.12.0

Author: astonbitecode

.travis.yml

@@ -19,8 +19,8 @@ script:
   - mvn -f java/pom.xml clean install
 before_deploy:
   - jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ks/rkl.jks -storepass
-    $storepass -keypass $keypass java/target/rust-keylock-android-0.11.0-unsigned.apk rustkeylock
-  - "${ANDROID_HOME}/build-tools/29.0.2/zipalign -v 4 java/target/rust-keylock-android-0.11.0-unsigned.apk
+    $storepass -keypass $keypass java/target/rust-keylock-android-0.12.0-unsigned.apk rustkeylock
+  - "${ANDROID_HOME}/build-tools/29.0.2/zipalign -v 4 java/target/rust-keylock-android-0.12.0-unsigned.apk
   java/target/rust-keylock-android.apk"
 deploy:
   overwrite: true

java/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.astonbitecode.rustkeylock"
     android:versionCode="1"
-    android:versionName="0.11.0" >
+    android:versionName="0.12.0" >
 
     <uses-sdk
         android:minSdkVersion="16"

java/pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>org.astonbitecode.rustkeylock</groupId>
     <artifactId>rust-keylock-android</artifactId>
-    <version>0.11.0</version>
+    <version>0.12.0</version>
     <packaging>apk</packaging>
 
     <name>rust-keylock-android</name>

rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rustkeylockandroid"
-version = "0.11.0"
+version = "0.12.0"
 authors = ["aston <astonbitecode@gmail.com>"]
 edition = "2018"
 
@@ -9,7 +9,7 @@ name = "rustkeylockandroid"
 crate-type = ["cdylib"]
 
 [dependencies]
-rust_keylock = "0.11"
+rust_keylock = {git = "https://github.com/rust-keylock/rust-keylock-lib.git"}
 j4rs = "0.11"
 libc = "0.2"
 jni-sys = "0.3"

rust/src/android_editor.rs

@@ -25,7 +25,6 @@ use rust_keylock::nextcloud::NextcloudConfiguration;
 
 use crate::{japi, errors};
 use crate::errors::RklAndroidError;
-use std::error::Error;
 
 pub struct AndroidImpl {
     jvm: Jvm,
@@ -121,8 +120,9 @@ fn show_menu(editor: &AndroidImpl, menu: &Menu) -> errors::Result<Receiver<UserS
                 "apply",
                 &[InvocationArg::try_from("Main")?])
         }
-        &Menu::NewEntry => {
-            let empty_entry = japi::JavaEntry::empty();
+        &Menu::NewEntry(ref entry_opt) => {
+            let entry = entry_opt.clone().unwrap_or_else(|| Entry::empty());
+            let empty_entry = japi::JavaEntry::new(&entry);
             // In order to denote that this is a new entry, put -1 as index
             editor.jvm.invoke_to_channel(
                 &editor.show_entry_cb,
@@ -278,7 +278,7 @@ fn show_message(editor: &AndroidImpl,
 }
 
 fn handle_error(error: &RklAndroidError) -> Receiver<UserSelection> {
-    error!("An error occured: {}", error.description());
+    error!("An error occured: {}", error);
     error!("{:?}", error);
     let (tx, rx) = mpsc::channel();
     let _ = tx.send(UserSelection::GoTo(Menu::Main));

rust/src/japi.rs

@@ -167,16 +167,6 @@ impl JavaEntry {
             desc: entry.desc.clone(),
         }
     }
-
-    pub(crate) fn empty() -> JavaEntry {
-        JavaEntry {
-            name: "".to_string(),
-            url: "".to_string(),
-            user: "".to_string(),
-            pass: "".to_string(),
-            desc: "".to_string(),
-        }
-    }
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -230,7 +220,7 @@ impl JavaMenu {
             JavaMenu::ImportEntries => Menu::ImportEntries,
             JavaMenu::ShowConfiguration => Menu::ShowConfiguration,
             JavaMenu::ForceExit => Menu::ForceExit,
-            JavaMenu::NewEntry => Menu::NewEntry,
+            JavaMenu::NewEntry => Menu::NewEntry(None),
             JavaMenu::WaitForDbxTokenCallback { s } => Menu::WaitForDbxTokenCallback(s),
             JavaMenu::ShowEntry { idx } => Menu::ShowEntry(idx),
             JavaMenu::EditEntry { idx } => Menu::EditEntry(idx),