Version 1.0.1-SNAPSHOT - fixed issue with requesting pubkey, and problem where your keys are overwritten if you try to import a contact again or worse, your identity as a contact

core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java

@@ -200,6 +200,7 @@ public class BitmessageContext {
                     LOG.info("Public key is missing from recipient. Requesting.");
                     requestPubkey(msg.getFrom(), to);
                     msg.setStatus(PUBKEY_REQUESTED);
+                    msg.addLabels(ctx.getMessageRepository().getLabels(Label.Type.OUTBOX));
                     ctx.getMessageRepository().save(msg);
                 } else {
                     LOG.info("Sending message.");
@@ -224,7 +225,7 @@ public class BitmessageContext {
                 requestingIdentity,
                 address,
                 new GetPubkey(address),
-                +28 * DAY
+                +2 * DAY
         );
     }
 

core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java

@@ -4,6 +4,7 @@ import ch.dissem.bitmessage.entity.BitmessageAddress;
 import ch.dissem.bitmessage.entity.ObjectMessage;
 import ch.dissem.bitmessage.entity.Plaintext;
 import ch.dissem.bitmessage.entity.PlaintextHolder;
+import ch.dissem.bitmessage.entity.payload.Pubkey;
 import ch.dissem.bitmessage.ports.MessageRepository;
 import ch.dissem.bitmessage.ports.ProofOfWorkEngine;
 import ch.dissem.bitmessage.ports.ProofOfWorkRepository;
@@ -42,10 +43,10 @@ public class ProofOfWorkService implements ProofOfWorkEngine.Callback, InternalC
     }
 
     public void doProofOfWork(BitmessageAddress recipient, ObjectMessage object) {
-        long nonceTrialsPerByte = recipient == null ?
-                ctx.getNetworkNonceTrialsPerByte() : recipient.getPubkey().getNonceTrialsPerByte();
-        long extraBytes = recipient == null ?
-                ctx.getNetworkExtraBytes() : recipient.getPubkey().getExtraBytes();
+        Pubkey pubkey = recipient == null ? null : recipient.getPubkey();
+
+        long nonceTrialsPerByte = pubkey == null ? ctx.getNetworkNonceTrialsPerByte() : pubkey.getNonceTrialsPerByte();
+        long extraBytes = pubkey == null ? ctx.getNetworkExtraBytes() : pubkey.getExtraBytes();
 
         powRepo.putObject(object, nonceTrialsPerByte, extraBytes);
         if (object.getPayload() instanceof PlaintextHolder) {

core/src/main/java/ch/dissem/bitmessage/entity/valueobject/Label.java

@@ -79,6 +79,7 @@ public class Label implements Serializable {
         INBOX,
         BROADCAST,
         DRAFT,
+        OUTBOX,
         SENT,
         UNREAD,
         TRASH