From 3f8980e236a08c1b4263ee743523cbb4e691ea97 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Wed, 11 Jan 2017 17:30:04 +0100
Subject: [PATCH] Make sure context is set after it is properly initialized

---
 .../main/java/ch/dissem/bitmessage/BitmessageContext.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index a36c2d8..8d3c0d7 100644
--- a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -66,13 +66,13 @@ public class BitmessageContext {
     private final boolean sendPubkeyOnIdentityCreation;
 
     private BitmessageContext(Builder builder) {
-        if (builder.listener instanceof Listener.WithContext) {
-            ((Listener.WithContext) builder.listener).setContext(this);
-        }
         ctx = new InternalContext(builder);
         labeler = builder.labeler;
         ctx.getProofOfWorkService().doMissingProofOfWork(30_000); // TODO: this should be configurable
         sendPubkeyOnIdentityCreation = builder.sendPubkeyOnIdentityCreation;
+        if (builder.listener instanceof Listener.WithContext) {
+            ((Listener.WithContext) builder.listener).setContext(this);
+        }
     }
 
     public AddressRepository addresses() {