From 93e71a75846ae9b9f3ba48c2509e6b9469db18be Mon Sep 17 00:00:00 2001
From: bontric <benjohnwie@gmail.com>
Date: Mon, 24 Sep 2018 18:30:36 +0200
Subject: [PATCH] Fixes
---
.../briarproject/bramble/mailbox/AbstractMailboxSession.java | 2 +-
.../briarproject/bramble/mailbox/PrivateMailboxSession.java | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/AbstractMailboxSession.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/AbstractMailboxSession.java
index 013fd0e17..5d8b45d8d 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/AbstractMailboxSession.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/AbstractMailboxSession.java
@@ -252,7 +252,7 @@ public abstract class AbstractMailboxSession implements Runnable {
StreamContext ctx =
keyManager
- .getStreamContext(targetContactId, MailboxConstants.ID);
+ .getStreamContext(c, MailboxConstants.ID);
if (ctx == null)
throw new IOException("Could not allocated stream context");
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/PrivateMailboxSession.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/PrivateMailboxSession.java
index 0ef05af61..631878288 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/PrivateMailboxSession.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/PrivateMailboxSession.java
@@ -3,6 +3,7 @@ package org.briarproject.bramble.mailbox;
import org.briarproject.bramble.api.contact.ContactId;
import org.briarproject.bramble.api.db.DatabaseComponent;
import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.mailbox.MailboxInfo;
import org.briarproject.bramble.api.sync.SyncSessionFactory;
import org.briarproject.bramble.api.transport.KeyManager;
import org.briarproject.bramble.api.transport.StreamContext;
@@ -75,6 +76,8 @@ public class PrivateMailboxSession extends AbstractMailboxSession {
return;
}
+ if (encryptedStream == null)
+ return;
MailboxRequest req =
new MailboxRequestStore(mailboxInfo.getAliasId(),
encryptedStream);
--
GitLab