[Sync] Fixed Element ID Export/Import Issue

This fix addresses the problem where the application would erroneously export and import the ID of an element. This issue previously caused conflicts when attempting to import an element with an existing ID in the database, resulting in the overwriting of database entries.

Author: OffRange

app/src/main/java/de/davis/passwordmanager/gson/annotations/Exclude.java

@@ -0,0 +1,11 @@
+package de.davis.passwordmanager.gson.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface Exclude {
+}

app/src/main/java/de/davis/passwordmanager/gson/strategies/ExcludeAnnotationStrategy.java

@@ -0,0 +1,18 @@
+package de.davis.passwordmanager.gson.strategies;
+
+import com.google.gson.ExclusionStrategy;
+import com.google.gson.FieldAttributes;
+
+import de.davis.passwordmanager.gson.annotations.Exclude;
+
+public class ExcludeAnnotationStrategy implements ExclusionStrategy {
+    @Override
+    public boolean shouldSkipField(FieldAttributes f) {
+        return f.getAnnotation(Exclude.class) != null;
+    }
+
+    @Override
+    public boolean shouldSkipClass(Class<?> clazz) {
+        return false;
+    }
+}

app/src/main/java/de/davis/passwordmanager/security/element/SecureElement.java

@@ -21,6 +21,7 @@
 
 import de.davis.passwordmanager.R;
 import de.davis.passwordmanager.dashboard.Item;
+import de.davis.passwordmanager.gson.annotations.Exclude;
 
 @Entity
 public class SecureElement implements Serializable, Comparable<SecureElement>, Item {
@@ -45,6 +46,7 @@ public class SecureElement implements Serializable, Comparable<SecureElement>, I
     private boolean favorite;
 
     @PrimaryKey(autoGenerate = true)
+    @Exclude
     private long id;
 
     @ColumnInfo(name = "created_at")

app/src/main/java/de/davis/passwordmanager/security/element/creditcard/CreditCardDetails.java

@@ -1,5 +1,7 @@
 package de.davis.passwordmanager.security.element.creditcard;
 
+import java.util.Objects;
+
 import de.davis.passwordmanager.security.element.ElementDetail;
 import de.davis.passwordmanager.security.element.SecureElement;
 import de.davis.passwordmanager.utils.CreditCardUtil;
@@ -67,4 +69,28 @@ public void setExpirationDate(String expirationDate) {
     public int getType() {
         return SecureElement.TYPE_CREDIT_CARD;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        CreditCardDetails that = (CreditCardDetails) o;
+
+        if (!Objects.equals(cardholder, that.cardholder))
+            return false;
+        if (!Objects.equals(expirationDate, that.expirationDate))
+            return false;
+        if (!cardNumber.equals(that.cardNumber)) return false;
+        return Objects.equals(cvv, that.cvv);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = cardholder != null ? cardholder.hashCode() : 0;
+        result = 31 * result + (expirationDate != null ? expirationDate.hashCode() : 0);
+        result = 31 * result + cardNumber.hashCode();
+        result = 31 * result + (cvv != null ? cvv.hashCode() : 0);
+        return result;
+    }
 }

app/src/main/java/de/davis/passwordmanager/security/element/password/PasswordDetails.java

@@ -1,5 +1,7 @@
 package de.davis.passwordmanager.security.element.password;
 
+import java.util.Objects;
+
 import de.davis.passwordmanager.security.Cryptography;
 import de.davis.passwordmanager.security.element.ElementDetail;
 import de.davis.passwordmanager.security.element.SecureElement;
@@ -57,4 +59,17 @@ public String getPassword(){
     public int getType() {
         return SecureElement.TYPE_PASSWORD;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        PasswordDetails that = (PasswordDetails) o;
+        return getPassword().equals(that.getPassword()) && Objects.equals(origin, that.origin) && Objects.equals(username, that.username);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(origin, username, getPassword());
+    }
 }

app/src/main/java/de/davis/passwordmanager/sync/DataTransfer.java

@@ -61,8 +61,7 @@ protected void handleResult(Handler handler, Result result){
                 new MaterialAlertDialogBuilder(getContext())
                         .setTitle(R.string.error_title)
                         .setMessage(error.getMessage())
-                        .setPositiveButton(R.string.ok,
-                                (dialog, which) -> dialog.dismiss())
+                        .setPositiveButton(R.string.ok, (dialog, which) -> {})
                         .show();
 
             else if (result instanceof Result.Success success)

app/src/main/java/de/davis/passwordmanager/sync/keygo/KeyGoTransfer.java

@@ -31,6 +31,7 @@
 import de.davis.passwordmanager.R;
 import de.davis.passwordmanager.database.SecureElementDatabase;
 import de.davis.passwordmanager.dialog.EditDialogBuilder;
+import de.davis.passwordmanager.gson.strategies.ExcludeAnnotationStrategy;
 import de.davis.passwordmanager.security.Cryptography;
 import de.davis.passwordmanager.security.element.ElementDetail;
 import de.davis.passwordmanager.security.element.SecureElement;
@@ -73,7 +74,10 @@ public JsonElement serialize(ElementDetail src, java.lang.reflect.Type typeOfSrc
 
     public KeyGoTransfer(Context context) {
         super(context);
-        this.gson = new GsonBuilder().registerTypeAdapter(ElementDetail.class, new ElementDetailTypeAdapter()).create();
+        this.gson = new GsonBuilder()
+                .registerTypeAdapter(ElementDetail.class, new ElementDetailTypeAdapter())
+                .setExclusionStrategies(new ExcludeAnnotationStrategy())
+                .create();
     }
 
     @Override
@@ -97,7 +101,8 @@ protected Result importElements(InputStream inputStream, String password) throws
 
         int existed = 0;
         for (SecureElement element : list) {
-            if(elements.stream().anyMatch(e -> e.getTitle().equals(element.getTitle()))) {
+            if(elements.stream().anyMatch(e -> e.getTitle().equals(element.getTitle())
+                    && e.getDetail().equals(element.getDetail()))) {
                 existed++;
                 continue;
             }
@@ -142,6 +147,7 @@ public void start(int type, Uri uri) {
                 .show();
 
         alertDialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener(v -> {
+            alertDialog.dismiss();
             String password = ((EditText)alertDialog.findViewById(R.id.textInputEditText)).getText().toString();
 
             if(password.isEmpty()){
@@ -151,7 +157,6 @@ public void start(int type, Uri uri) {
             }
 
             start(type, uri, password);
-            alertDialog.dismiss();
         });
     }
 }