Fix crash when sharing stickers you don't have installed.

signalapp · Jan 24, 2021 · 3a2990a · 3a2990a
1 parent d8060b3
commit 3a2990a
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/sharing/MultiShareSender.java b/app/src/main/java/org/thoughtcrime/securesms/sharing/MultiShareSender.java
@@ -174,7 +174,7 @@ private static void sendTextMessage(@NonNull Context context,
   private static @NonNull SlideDeck buildSlideDeck(@NonNull Context context, @NonNull MultiShareArgs multiShareArgs) {
     SlideDeck slideDeck = new SlideDeck();
     if (multiShareArgs.getStickerLocator() != null) {
-      slideDeck.addSlide(buildStickerSlide(context, multiShareArgs.getStickerLocator()));
+      slideDeck.addSlide(new StickerSlide(context, multiShareArgs.getDataUri(), 0, multiShareArgs.getStickerLocator(), multiShareArgs.getDataType()));
     } else if (!multiShareArgs.getMedia().isEmpty()) {
       for (Media media : multiShareArgs.getMedia()) {
         slideDeck.addSlide(SlideFactory.getSlide(context, media.getMimeType(), media.getUri(), media.getWidth(), media.getHeight()));
@@ -186,13 +186,6 @@ private static void sendTextMessage(@NonNull Context context,
     return slideDeck;
   }
 
-  private static @NonNull StickerSlide buildStickerSlide(@NonNull Context context, @NonNull StickerLocator stickerLocator) {
-    StickerDatabase stickerDatabase = DatabaseFactory.getStickerDatabase(context);
-    StickerRecord   stickerRecord   = stickerDatabase.getSticker(stickerLocator.getPackId(), stickerLocator.getStickerId(), false);
-
-    return new StickerSlide(context, stickerRecord.getUri(), stickerRecord.getSize(), stickerLocator, stickerRecord.getContentType());
-  }
-
   public static final class MultiShareSendResultCollection {
     private final List<MultiShareSendResult> results;