From 546b6f75106c368ec41c481f2ea91eab46a94138 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Fri, 11 Mar 2016 10:24:13 +0100
Subject: [PATCH] fix null pointer, cleanups

---
 .../payment/PaymentAccountFactory.java        |  3 +--
 .../main/offer/takeoffer/TakeOfferView.java   | 25 +++++++++++--------
 .../gui/main/overlays/windows/TacWindow.java  |  1 -
 .../bitsquare/p2p/storage/P2PDataStorage.java |  5 ++--
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/core/src/main/java/io/bitsquare/payment/PaymentAccountFactory.java b/core/src/main/java/io/bitsquare/payment/PaymentAccountFactory.java
index d799655e24..71f95118cd 100644
--- a/core/src/main/java/io/bitsquare/payment/PaymentAccountFactory.java
+++ b/core/src/main/java/io/bitsquare/payment/PaymentAccountFactory.java
@@ -17,11 +17,10 @@
 
 package io.bitsquare.payment;
 
-import io.bitsquare.common.persistance.Persistable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public abstract class PaymentAccountFactory implements Persistable {
+public class PaymentAccountFactory {
     private static final Logger log = LoggerFactory.getLogger(PaymentAccountFactory.class);
 
     public static PaymentAccount getPaymentAccount(PaymentMethod paymentMethod) {
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java
index 2af42545b8..4c3361c59c 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java
@@ -271,7 +271,10 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
         };
         model.dataModel.feeFromFundingTxProperty.addListener(feeFromFundingTxListener);
 
-        if (spinner != null && takeOfferButton.isVisible())
+        if (offerAvailabilitySpinner != null && offerAvailabilitySpinner.isVisible())
+            offerAvailabilitySpinner.setProgress(-1);
+
+        if (spinner != null && spinner.isVisible())
             spinner.setProgress(-1);
     }
 
@@ -429,16 +432,16 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
             String tradeAmountText = model.isSeller() ? "the trade amount, " : "";
             new Popup().headLine("Fund your trading wallet")
                     .instruction("You need to pay in " +
-                    model.totalToPay.get() + " to your local Bitsquare trading wallet.\n" +
-                    "The amount is the sum of " + tradeAmountText + "the security deposit, the trading fee and " +
-                    "the bitcoin mining fee.\n\n" +
-                    "Please send from your external Bitcoin wallet the exact amount to the address: " +
-                    model.getAddressAsString() + "\n(you can copy the address in the screen below after closing that popup)\n\n" +
-                    "Make sure you use a sufficiently high mining fee of at least " +
-                    model.formatter.formatCoinWithCode(FeePolicy.getMinRequiredFeeForFundingTx()) +
-                    " to avoid problems that your transaction does not get confirmed in the blockchain.\n" +
-                    "Transactions with a lower fee will not be accepted.\n\n" +
-                    "You can see the status of your incoming payment and all the details in the screen below.")
+                            model.totalToPay.get() + " to your local Bitsquare trading wallet.\n" +
+                            "The amount is the sum of " + tradeAmountText + "the security deposit, the trading fee and " +
+                            "the bitcoin mining fee.\n\n" +
+                            "Please send from your external Bitcoin wallet the exact amount to the address: " +
+                            model.getAddressAsString() + "\n(you can copy the address in the screen below after closing that popup)\n\n" +
+                            "Make sure you use a sufficiently high mining fee of at least " +
+                            model.formatter.formatCoinWithCode(FeePolicy.getMinRequiredFeeForFundingTx()) +
+                            " to avoid problems that your transaction does not get confirmed in the blockchain.\n" +
+                            "Transactions with a lower fee will not be accepted.\n\n" +
+                            "You can see the status of your incoming payment and all the details in the screen below.")
                     .dontShowAgainId(key, preferences)
                     .show();
         }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TacWindow.java b/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TacWindow.java
index d1d43249c3..8987b5f09e 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TacWindow.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TacWindow.java
@@ -73,5 +73,4 @@ public class TacWindow extends Overlay<TacWindow> {
     protected void onShow() {
         display();
     }
-
 }
diff --git a/network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java b/network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java
index 1f8a675f17..c908d37d56 100644
--- a/network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java
+++ b/network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java
@@ -203,7 +203,7 @@ public class P2PDataStorage implements MessageListener, ConnectionListener {
 
                 broadcast(new AddDataMessage(protectedStorageEntry), sender, listener, isDataOwner);
             }
-          
+
             hashMapChangedListeners.stream().forEach(e -> e.onAdded(protectedStorageEntry));
         } else {
             log.trace("add failed");
@@ -442,7 +442,8 @@ public class P2PDataStorage implements MessageListener, ConnectionListener {
             else
                 result = expirableMailboxStoragePayload.receiverPubKeyForRemoveOperation.equals(protectedStorageEntry.ownerPubKey);
         } else {
-            result = protectedStorageEntry.getStoragePayload().getOwnerPubKey().equals(protectedStorageEntry.ownerPubKey);
+            result = protectedStorageEntry != null && protectedStorageEntry.getStoragePayload() != null &&
+                    protectedStorageEntry.getStoragePayload().getOwnerPubKey().equals(protectedStorageEntry.ownerPubKey);
         }
 
         if (!result)