From 265283fea5f54f267da49f8c3015374e4cd92b4c Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Thu, 17 Feb 2022 11:53:55 -0500 Subject: [PATCH] Do not backup null key-values. --- .../securesms/backup/FullBackupExporter.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java index b50b68d58..080dced86 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java @@ -442,7 +442,12 @@ public class FullBackupExporter extends FullBackupBase { Class type = dataSet.getType(key); if (type == byte[].class) { - builder.setBlobValue(ByteString.copyFrom(dataSet.getBlob(key, null))); + byte[] data = dataSet.getBlob(key, null); + if (data != null) { + builder.setBlobValue(ByteString.copyFrom(dataSet.getBlob(key, null))); + } else { + Log.w(TAG, "Skipping storing null blob for key: " + key); + } } else if (type == Boolean.class) { builder.setBooleanValue(dataSet.getBoolean(key, false)); } else if (type == Float.class) { @@ -452,7 +457,12 @@ public class FullBackupExporter extends FullBackupBase { } else if (type == Long.class) { builder.setLongValue(dataSet.getLong(key, 0)); } else if (type == String.class) { - builder.setStringValue(dataSet.getString(key, null)); + String data = dataSet.getString(key, null); + if (data != null) { + builder.setStringValue(dataSet.getString(key, null)); + } else { + Log.w(TAG, "Skipping storing null string for key: " + key); + } } else { throw new AssertionError("Unknown type: " + type); }