Fix possible race condition where fileParams becomes null

Stephen Paul Weber created 2 years ago

Change summary

src/main/java/eu/siacs/conversations/entities/Message.java | 9 ++++---
1 file changed, 5 insertions(+), 4 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/entities/Message.java

@@ -329,16 +329,17 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
     }
 
     public ContentValues getCheogramContentValues() {
+        final FileParams fp = fileParams;
         ContentValues values = new ContentValues();
         values.put(UUID, uuid);
         values.put("subject", subject);
-        values.put("fileParams", fileParams == null ? null : fileParams.toString());
-        if (fileParams != null && !fileParams.isEmpty()) {
+        values.put("fileParams", fp == null ? null : fp.toString());
+        if (fp != null && !fp.isEmpty()) {
             List<Element> sims = getSims();
             if (sims.isEmpty()) {
-                addPayload(fileParams.toSims());
+                addPayload(fp.toSims());
             } else {
-                sims.get(0).replaceChildren(fileParams.toSims().getChildren());
+                sims.get(0).replaceChildren(fp.toSims().getChildren());
             }
         }
         values.put("payloads", payloads.size() < 1 ? null : payloads.stream().map(Object::toString).collect(Collectors.joining()));