Adding four random bytes to mail message IDs

luwrain · Jan 12, 2023 · af43982 · af43982
1 parent 5b1dcce
commit af43982
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/org/luwrain/pim/mail/nitrite/Message.java b/src/main/java/org/luwrain/pim/mail/nitrite/Message.java
@@ -17,6 +17,8 @@
 
 package org.luwrain.pim.mail.nitrite;
 
+import java.util.*;
+
 import org.luwrain.core.*;
 import org.luwrain.pim.mail.*;
 import org.luwrain.util.*;
@@ -31,6 +33,6 @@ void genId()
  final byte[] bytes = getRawMessage();
  if (bytes.length == 0)
  throw new IllegalStateException("the raw message can't be empty on ID generation");
- this.id = new Sha1().getSha1(bytes);
+ this.id = new Sha1().getSha1(bytes) + "-" + UUID.randomUUID().toString().substring(0, 8);
  }
 }
diff --git a/src/main/java/org/luwrain/pim/mail/protocols/Pop3.java b/src/main/java/org/luwrain/pim/mail/protocols/Pop3.java
@@ -119,7 +119,7 @@ private void processAccount(MailAccount account) throws IOException, PimExceptio
  }
  final MessageObj hookObj = new MessageObj(message);
  try {
- Log.debug(LOG_COMPONENT, "saving the message " + num + "/" + total + " from " + message.getFrom());
+ Log.debug(LOG_COMPONENT, "saving the message " + (num + 1) + "/" + total + " from " + message.getFrom());
  return chainOfResponsibility(luwrain, HOOK_SAVE, new Object[]{mailHookObj, hookObj});
  }
  catch(Throwable e)