From 3673fa4908db6b7696838544d7d2a540e8586927 Mon Sep 17 00:00:00 2001 From: Nicholas Tinsley Date: Tue, 9 Jan 2024 16:59:17 -0500 Subject: [PATCH] Null safety for TransformProperties during attachment compression. --- .../securesms/jobs/AttachmentCompressionJob.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJob.java index 61cd482229..838626f9db 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJob.java @@ -155,13 +155,20 @@ public final class AttachmentCompressionJob extends BaseJob { throw new UndeliverableMessageException("Cannot find the specified attachment."); } - if (databaseAttachment.transformProperties.shouldSkipTransform()) { + AttachmentTable.TransformProperties transformProperties = databaseAttachment.transformProperties; + + if (transformProperties == null) { + Log.i(TAG, "TransformProperties were null! Using empty TransformProperties."); + transformProperties = AttachmentTable.TransformProperties.empty(); + } + + if (transformProperties.shouldSkipTransform()) { Log.i(TAG, "Skipping at the direction of the TransformProperties."); return; } MediaConstraints mediaConstraints = mms ? MediaConstraints.getMmsMediaConstraints(mmsSubscriptionId) - : MediaConstraints.getPushMediaConstraints(SentMediaQuality.fromCode(databaseAttachment.transformProperties.sentMediaQuality)); + : MediaConstraints.getPushMediaConstraints(SentMediaQuality.fromCode(transformProperties.sentMediaQuality)); compress(database, mediaConstraints, databaseAttachment); }