Added a URL field in the password entries

astonbitecode · astonbitecode · commit fcf1f0234464 · 2018-06-11T14:19:46.000+03:00
diff --git a/java/pom.xml b/java/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>org.astonbitecode.rustkeylock</groupId>
 	<artifactId>rust-keylock-android</artifactId>
-	<version>0.5.0</version>
+	<version>0.6.0</version>
 	<packaging>apk</packaging>
 
 	<name>rust-keylock-android</name>
diff --git a/java/res/layout/fragment_show_entry.xml b/java/res/layout/fragment_show_entry.xml
@@ -44,6 +44,20 @@
                     android:layout_height="wrap_content"
                     android:inputType="text"/>
 
+            <TextView
+                    android:id="@+id/urlLabel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20sp"
+                    android:text="URL"
+                    android:textAppearance="?android:attr/textAppearanceSmall"/>
+
+            <EditText
+                    android:id="@+id/editUrl"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="text"/>
+
             <TextView
                     android:id="@+id/userLabel"
                     android:layout_width="wrap_content"
diff --git a/java/src/main/java/org/astonbitecode/rustkeylock/api/JavaEntry.java b/java/src/main/java/org/astonbitecode/rustkeylock/api/JavaEntry.java
@@ -8,35 +8,40 @@
 
 public class JavaEntry extends Structure {
 
-	public static class ByReference extends JavaEntry implements Structure.ByReference {
-	}
-
-	public static class ByValue extends JavaEntry implements Structure.ByValue {
-	}
-
-	public String name;
-	public String user;
-	public String pass;
-	public String desc;
-
-	public String getName() {
-		return name;
-	}
-
-	public String getUser() {
-		return user;
-	}
-
-	public String getPass() {
-		return pass;
-	}
-
-	public String getDesc() {
-		return desc;
-	}
-
-	@Override
-	protected List<String> getFieldOrder() {
-		return asList("name", "user", "pass", "desc");
-	}
+    public static class ByReference extends JavaEntry implements Structure.ByReference {
+    }
+
+    public static class ByValue extends JavaEntry implements Structure.ByValue {
+    }
+
+    public String name;
+    public String url;
+    public String user;
+    public String pass;
+    public String desc;
+
+    public String getName() {
+        return name;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public String getUser() {
+        return user;
+    }
+
+    public String getPass() {
+        return pass;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    @Override
+    protected List<String> getFieldOrder() {
+        return asList("name", "url", "user", "pass", "desc");
+    }
 }
diff --git a/java/src/main/java/org/astonbitecode/rustkeylock/fragments/ShowEntry.java b/java/src/main/java/org/astonbitecode/rustkeylock/fragments/ShowEntry.java
@@ -19,18 +19,23 @@
 import android.widget.EditText;
 import android.widget.TextView;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+
 public class ShowEntry extends Fragment implements OnClickListener, BackButtonHandler {
     private static final long serialVersionUID = 163106573370997557L;
     private final String TAG = getClass().getName();
     private transient JavaEntry entry;
     private String entryName;
+    private String entryUrl;
     private String entryUser;
     private String entryPass;
     private String entryDesc;
     private int entryIndex;
     private boolean edit;
     private boolean delete;
     private transient EditText nameText;
+    private transient EditText urlText;
     private transient EditText userText;
     private transient EditText passwordText;
     private transient EditText descriptionText;
@@ -47,6 +52,7 @@ public class ShowEntry extends Fragment implements OnClickListener, BackButtonHa
     public ShowEntry(JavaEntry entry, int entryIndex, boolean edit, boolean delete) {
         this.entry = entry;
         this.entryName = entry.getName();
+        this.entryUrl = entry.getUrl();
         this.entryUser = entry.getUser();
         this.entryPass = entry.getPass();
         this.entryDesc = entry.getDesc();
@@ -79,6 +85,7 @@ public void onClick(View view) {
 
             JavaEntry javaEntry = new JavaEntry();
             javaEntry.name = nameText.getText() != null ? nameText.getText().toString() : "";
+            javaEntry.url = urlText.getText() != null ? urlText.getText().toString() : "";
             javaEntry.user = userText.getText() != null ? userText.getText().toString() : "";
             javaEntry.pass = passwordText.getText() != null ? passwordText.getText().toString() : "";
             javaEntry.desc = descriptionText.getText() != null ? descriptionText.getText().toString() : "";
@@ -96,6 +103,14 @@ public void onClick(View view) {
                 passwordText.setError("Required field");
                 errorsOccured = true;
             }
+            if (!javaEntry.url.isEmpty()) {
+                try {
+                    new URL(javaEntry.url);
+                } catch (MalformedURLException mue) {
+                    urlText.setError("Invalid URL. Eg: https://my.com");
+                    errorsOccured = true;
+                }
+            }
             if (!errorsOccured) {
                 if (entryIndex >= 0) {
                     InterfaceWithRust.INSTANCE.replace_entry(javaEntry, entryIndex);
@@ -131,6 +146,10 @@ private void prepareUiElements(View v) {
         nameText.setText(entry.getName());
         nameText.setEnabled(edit);
         this.nameText = nameText;
+        EditText urlText = (EditText) v.findViewById(R.id.editUrl);
+        urlText.setText(entry.getUrl());
+        urlText.setEnabled(edit);
+        this.urlText = urlText;
         EditText userText = (EditText) v.findViewById(R.id.editUser);
         userText.setText(entry.getUser());
         userText.setEnabled(edit);
@@ -180,6 +199,7 @@ private void restore(Bundle state) {
         if (state != null) {
             this.entry = new JavaEntry();
             this.entry.name = this.entryName;
+            this.entry.url = this.entryUrl;
             this.entry.user = this.entryUser;
             this.entry.pass = this.entryPass;
             this.entry.desc = this.entryDesc;
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
 name = "rustkeylockandroid"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["aston <astonbitecode@gmail.com>"]
 
 [lib]
 name = "rustkeylockandroid"
 crate-type = ["cdylib"]
 
 [dependencies]
-rust_keylock = "0.5"
+rust_keylock = {git = "https://github.com/rust-keylock/rust-keylock-lib.git"}
 libc = "0.2"
 lazy_static = "0.2"
 log = "0.3"
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
@@ -35,6 +35,7 @@ lazy_static! {
 #[repr(C)]
 pub struct JavaEntry {
     name: *const c_char,
+    url: *const c_char,
     user: *const c_char,
     pass: *const c_char,
     desc: *const c_char,
@@ -44,6 +45,7 @@ impl JavaEntry {
     fn new(entry: &Entry) -> JavaEntry {
         JavaEntry {
             name: to_java_string(entry.name.clone()),
+            url: to_java_string(entry.url.clone()),
             user: to_java_string(entry.user.clone()),
             pass: to_java_string(entry.pass.clone()),
             desc: to_java_string(entry.desc.clone()),
@@ -53,6 +55,7 @@ impl JavaEntry {
     fn empty() -> JavaEntry {
         JavaEntry {
             name: to_java_string("".to_string()),
+            url: to_java_string("".to_string()),
             user: to_java_string("".to_string()),
             pass: to_java_string("".to_string()),
             desc: to_java_string("".to_string()),
@@ -62,6 +65,7 @@ impl JavaEntry {
     fn with_nulls() -> JavaEntry {
         JavaEntry {
             name: to_java_string("null".to_string()),
+            url: to_java_string("null".to_string()),
             user: to_java_string("null".to_string()),
             pass: to_java_string("null".to_string()),
             desc: to_java_string("null".to_string()),
@@ -296,6 +300,7 @@ pub extern "C" fn add_entry(java_entry: &JavaEntry) {
         TX.lock().unwrap().as_ref().unwrap().clone()
     };
     let entry = Entry::new(to_rust_string(java_entry.name),
+                           to_rust_string(java_entry.url),
                            to_rust_string(java_entry.user),
                            to_rust_string(java_entry.pass),
                            to_rust_string(java_entry.desc));
@@ -312,6 +317,7 @@ pub extern "C" fn replace_entry(java_entry: &JavaEntry, index: i32) {
         TX.lock().unwrap().as_ref().unwrap().clone()
     };
     let entry = Entry::new(to_rust_string(java_entry.name),
+                           to_rust_string(java_entry.url),
                            to_rust_string(java_entry.user),
                            to_rust_string(java_entry.pass),
                            to_rust_string(java_entry.desc));
