empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Stop throwing an assertion error when getting attachment TransformationProperties.

Browse source
This commit is contained in:
Clark 2023-11-28 13:04:06 -05:00 • committed by Cody Henthorne
parent 97c1ace020
commit 8037494f7a
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.java
View file

@ -945,7 +945,14 @@ public class AttachmentTable extends DatabaseTable {
public void markAttachmentAsTransformed(@NonNull AttachmentId attachmentId, boolean withFaststart) {
getWritableDatabase().beginTransaction();
try {
TransformProperties transformProperties = getTransformProperties(attachmentId).withSkipTransform();
TransformProperties transformProperties = getTransformProperties(attachmentId);
if (transformProperties == null) {
Log.w(TAG, "Failed to get transformation properties, attachment no longer exists.");
return;
}
transformProperties = transformProperties.withSkipTransform();
if (withFaststart) {
transformProperties = transformProperties.withMp4Faststart();
@ -960,7 +967,10 @@ public class AttachmentTable extends DatabaseTable {
}
}
public @NonNull TransformProperties getTransformProperties(@NonNull AttachmentId attachmentId) {
/**
* @return null if we fail to find the given attachmentId
*/
public @Nullable TransformProperties getTransformProperties(@NonNull AttachmentId attachmentId) {
String[] projection = SqlUtil.buildArgs(TRANSFORM_PROPERTIES);
String[] args = attachmentId.toStrings();
@ -969,7 +979,7 @@ public class AttachmentTable extends DatabaseTable {
String serializedProperties = CursorUtil.requireString(cursor, TRANSFORM_PROPERTIES);
return TransformProperties.parse(serializedProperties);
} else {
throw new AssertionError("No such attachment.");
return null;
}
}
}