Fix possible NPE

Stephen Paul Weber created 1 year ago

Change summary

src/main/java/eu/siacs/conversations/persistance/FileBackend.java | 8 
1 file changed, 6 insertions(+), 2 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/persistance/FileBackend.java

@@ -1148,7 +1148,9 @@ public class FileBackend {
         List<Element> thumbs = message.getFileParams() != null ? message.getFileParams().getThumbnails() : null;
         if (thumbs != null && !thumbs.isEmpty()) {
             for (Element thumb : thumbs) {
-                Uri uri = Uri.parse(thumb.getAttribute("uri"));
+                final var uriS = thumb.getAttribute("uri");
+                if (uriS == null) continue;
+                Uri uri = Uri.parse(uriS);
                 if (uri.getScheme().equals("data")) {
                     String[] parts = uri.getSchemeSpecificPart().split(",", 2);
 
@@ -1218,7 +1220,9 @@ public class FileBackend {
                 List<Element> thumbs = message.getFileParams() != null ? message.getFileParams().getThumbnails() : null;
                 if (thumbs != null && !thumbs.isEmpty()) {
                     for (Element thumb : thumbs) {
-                        Uri uri = Uri.parse(thumb.getAttribute("uri"));
+                        final var uriS = thumb.getAttribute("uri");
+                        if (uriS == null) continue;
+                        Uri uri = Uri.parse(uriS);
                         if (uri.getScheme().equals("data")) {
                             if (android.os.Build.VERSION.SDK_INT < 28) continue;
                             String[] parts = uri.getSchemeSpecificPart().split(",", 2);