Merge pull request #3875 from deltachat/adb/issue-3874

avoid NPE in DecryptableUri

Author: adbenitez

src/main/java/org/thoughtcrime/securesms/components/QuoteView.java

@@ -237,11 +237,13 @@ private void setQuoteAttachment(@NonNull GlideRequests glideRequests, @NonNull S
           MediaUtil.createVideoThumbnailIfNeeded(getContext(), slide.getUri(), slide.getThumbnailUri(), null);
           thumbnailUri = slide.getThumbnailUri();
         }
-        glideRequests.load(new DecryptableUri(thumbnailUri))
-                .centerCrop()
-                .override(getContext().getResources().getDimensionPixelSize(R.dimen.quote_thumb_size))
-                .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
-                .into(thumbnailView);
+        if (thumbnailUri != null) {
+          glideRequests.load(new DecryptableUri(thumbnailUri))
+                  .centerCrop()
+                  .override(getContext().getResources().getDimensionPixelSize(R.dimen.quote_thumb_size))
+                  .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
+                  .into(thumbnailView);
+        }
       }
     } else if(slide != null && slide.hasAudio()) {
       thumbnailView.setVisibility(GONE);

src/main/java/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java

@@ -179,7 +179,7 @@ private GlideRequest<Bitmap> getBitmapGlideRequest(@NonNull Context context, boo
                    .diskCacheStrategy(DiskCacheStrategy.NONE)
                    .override(width, height)
                    .centerInside()
-                   .load(decryptable ? new DecryptableStreamUriLoader.DecryptableUri(imageUri) : imageUri);
+                   .load(decryptable && imageUri!=null ? new DecryptableStreamUriLoader.DecryptableUri(imageUri) : imageUri);
   }
 
   @Override