From e145875164ae87971ce9430e4d9b380e9ee2b3af Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Mon, 2 Oct 2017 10:35:49 -0700
Subject: [PATCH] Fix json serialization for group message error

Fixes #6919
// FREEBIE
---
 .../securesms/database/documents/IdentityKeyMismatch.java       | 2 ++
 .../securesms/database/documents/NetworkFailure.java            | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java b/src/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java
index 760733e54f..0a85c64d59 100644
--- a/src/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java
+++ b/src/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.database.documents;
 
 import android.util.Log;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
@@ -38,6 +39,7 @@ public class IdentityKeyMismatch {
     this.identityKey = identityKey;
   }
 
+  @JsonIgnore
   public Address getAddress() {
     return Address.fromSerialized(address);
   }
diff --git a/src/org/thoughtcrime/securesms/database/documents/NetworkFailure.java b/src/org/thoughtcrime/securesms/database/documents/NetworkFailure.java
index 6dc87ca794..63861c9efc 100644
--- a/src/org/thoughtcrime/securesms/database/documents/NetworkFailure.java
+++ b/src/org/thoughtcrime/securesms/database/documents/NetworkFailure.java
@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.database.documents;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.thoughtcrime.securesms.database.Address;
@@ -15,6 +16,7 @@ public class NetworkFailure {
 
   public NetworkFailure() {}
 
+  @JsonIgnore
   public Address getAddress() {
     return Address.fromSerialized(address);
   }