Keep migrated items

Give it a higher priority
Use latest Secret Service library

Author: purejava

pom.xml

@@ -43,7 +43,7 @@
 		<api.version>1.7.0</api.version>
 		<secret-service.version>2.0.1-alpha</secret-service.version>
 		<kdewallet.version>1.4.0</kdewallet.version>
-		<secret-service-02.version>1.0.0</secret-service-02.version>
+		<secret-service-02.version>1.0.1</secret-service-02.version>
 		<slf4j.version>2.0.17</slf4j.version>
 		<appindicator.version>1.4.2</appindicator.version>
 

src/main/java/org/cryptomator/linux/keychain/SecretServiceKeychainAccess.java

@@ -20,10 +20,11 @@
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-@Priority(900)
+@Priority(1100)
 @OperatingSystem(OperatingSystem.Value.LINUX)
 @DisplayName("Secret Service")
 public class SecretServiceKeychainAccess implements KeychainAccessProvider {
@@ -176,15 +177,21 @@ private void migrateKDEWalletEntries() {
 					session.getService().ensureUnlocked(i);
 					var item = new Item(i);
 					var secret = item.getSecret(session.getSession());
+					Map<String, String> newAttribs = new HashMap<>(attribs.value());
+					newAttribs.put("server", "Cryptomator - already migrated");
+					var label = item.getLabel().value();
+					var itemProps = Item.createProperties(label, newAttribs);
+					var replace = collection.createItem(itemProps, secret, true);
+					assert replace.isSuccess() : "Replacing migrated item failed";
+					item.delete();
  					try {
 						storePassphrase(attribs.value().get("user"), "Cryptomator", new String(session.decrypt(secret)));
+						LOG.info("Successfully migrated password for vault {}", attribs.value().get("user"));
 					} catch (KeychainAccessException | NoSuchPaddingException | NoSuchAlgorithmException |
 							 InvalidAlgorithmParameterException | InvalidKeyException | BadPaddingException |
 							 IllegalBlockSizeException e) {
 						LOG.error("Migrating entry {} for vault {} failed", i.getPath(), attribs.value().get("user"));
 					 }
-					 item.delete();
-					 LOG.info("Successfully migrated password for vault {}", attribs.value().get("user"));
 				}
 			}
 		}