This commit is contained in:
Ryan ZHAO
2021-02-01 11:35:53 +11:00
parent 9bc360f047
commit 5cb3a79a27
84 changed files with 165 additions and 2319 deletions

View File

@@ -4,7 +4,7 @@ import androidx.annotation.NonNull;
import org.session.libsession.messaging.jobs.Data;
import org.thoughtcrime.securesms.logging.Log;
import org.session.libsession.utilities.JsonUtils;
import org.session.libsignal.utilities.JsonUtil;
import java.io.IOException;
@@ -15,7 +15,7 @@ public class JsonDataSerializer implements Data.Serializer {
@Override
public @NonNull String serialize(@NonNull Data data) {
try {
return JsonUtils.toJson(data);
return JsonUtil.toJsonThrows(data);
} catch (IOException e) {
Log.e(TAG, "Failed to serialize to JSON.", e);
throw new AssertionError(e);
@@ -25,7 +25,7 @@ public class JsonDataSerializer implements Data.Serializer {
@Override
public @NonNull Data deserialize(@NonNull String serialized) {
try {
return JsonUtils.fromJson(serialized, Data.class);
return JsonUtil.fromJson(serialized, Data.class);
} catch (IOException e) {
Log.e(TAG, "Failed to deserialize JSON.", e);
throw new AssertionError(e);