From 0a0b79ad9b11fc409e509686cb506ae601d0a649 Mon Sep 17 00:00:00 2001
From: ameba23 <ameba23@systemli.org>
Date: Fri, 25 Jun 2021 21:07:44 +0200
Subject: [PATCH] Check for null when adding local properties to fix
 integration test

---
 .../briar/socialbackup/SocialBackupManagerImpl.java         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/briar-core/src/main/java/org/briarproject/briar/socialbackup/SocialBackupManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/socialbackup/SocialBackupManagerImpl.java
index 5e2198772..f5d1f5998 100644
--- a/briar-core/src/main/java/org/briarproject/briar/socialbackup/SocialBackupManagerImpl.java
+++ b/briar-core/src/main/java/org/briarproject/briar/socialbackup/SocialBackupManagerImpl.java
@@ -447,8 +447,10 @@ class SocialBackupManagerImpl extends ConversationClientImpl
 				transportPropertyManager.getLocalProperties(txn);
 		Map<TransportId, TransportProperties> filteredLocalProps =
 				new HashMap<>();
-		filteredLocalProps
-				.put(TorConstants.ID, localProps.get(TorConstants.ID));
+		if (localProps.get(TorConstants.ID) != null) {
+			filteredLocalProps
+					.put(TorConstants.ID, localProps.get(TorConstants.ID));
+		}
 
 		return backupPayloadEncoder.encodeBackupPayload(secret, identity,
 				contactData, version, filteredLocalProps);