TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-22 13:31:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix json serialization for group message error

Browse Source 
Fixes #6919
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-10-02 10:35:49 -07:00
parent 2e56a0aa70
commit e145875164
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java
View File

@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.database.documents;
import android.util.Log; import android.util.Log;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonParser;
@ -38,6 +39,7 @@ public class IdentityKeyMismatch {
this.identityKey = identityKey; this.identityKey = identityKey;
} }
@JsonIgnore
public Address getAddress() { public Address getAddress() {
return Address.fromSerialized(address); return Address.fromSerialized(address);
} }

2
src/org/thoughtcrime/securesms/database/documents/NetworkFailure.java
View File

@ -1,5 +1,6 @@
package org.thoughtcrime.securesms.database.documents; package org.thoughtcrime.securesms.database.documents;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.database.Address;
@ -15,6 +16,7 @@ public class NetworkFailure {
public NetworkFailure() {} public NetworkFailure() {}
@JsonIgnore
public Address getAddress() { public Address getAddress() {
return Address.fromSerialized(address); return Address.fromSerialized(address);
} }