Convert Database, AttachmentDatabase and MediaDatabase to Kotlin

app/src/main/java/org/thoughtcrime/securesms/MediaDocumentsAdapter.java

@@ -56,11 +56,11 @@ public ViewHolder onCreateItemViewHolder(ViewGroup parent, int viewType) {
   @Override
   public void onBindItemViewHolder(ViewHolder viewHolder, @NonNull Cursor cursor) {
     MediaDatabase.MediaRecord mediaRecord = MediaDatabase.MediaRecord.from(getContext(), cursor);
-    Slide                     slide       = MediaUtil.getSlideForAttachment(getContext(), mediaRecord.getAttachment());
+    Slide                     slide       = MediaUtil.getSlideForAttachment(getContext(), mediaRecord.attachment);
 
     if (slide != null && slide.hasDocument()) {
       viewHolder.documentView.setDocument((DocumentSlide)slide, false);
-      viewHolder.date.setText(DateUtils.getRelativeDate(getContext(), locale, mediaRecord.getDate()));
+      viewHolder.date.setText(DateUtils.getRelativeDate(getContext(), locale, mediaRecord.date));
       viewHolder.documentView.setVisibility(View.VISIBLE);
       viewHolder.date.setVisibility(View.VISIBLE);
       viewHolder.documentView.setOnClickListener(view -> {
@@ -91,7 +91,7 @@ public long getHeaderId(int position) {
     Cursor                    cursor      = getCursorAtPositionOrThrow(position);
     MediaDatabase.MediaRecord mediaRecord = MediaDatabase.MediaRecord.from(getContext(), cursor);
 
-    calendar.setTime(new Date(mediaRecord.getDate()));
+    calendar.setTime(new Date(mediaRecord.date));
     return Util.hashCode(calendar.get(Calendar.YEAR), calendar.get(Calendar.DAY_OF_YEAR));
   }
 
@@ -104,7 +104,7 @@ public HeaderViewHolder onCreateHeaderViewHolder(ViewGroup parent) {
   public void onBindHeaderViewHolder(HeaderViewHolder viewHolder, int position) {
     Cursor                    cursor      = getCursorAtPositionOrThrow(position);
     MediaDatabase.MediaRecord mediaRecord = MediaDatabase.MediaRecord.from(getContext(), cursor);
-    viewHolder.textView.setText(DateUtils.getRelativeDate(getContext(), locale, mediaRecord.getDate()));
+    viewHolder.textView.setText(DateUtils.getRelativeDate(getContext(), locale, mediaRecord.date));
   }
 
   public static class ViewHolder extends RecyclerView.ViewHolder {

app/src/main/java/org/thoughtcrime/securesms/MediaGalleryAdapter.java

@@ -111,7 +111,7 @@ public void onBindItemViewHolder(ItemViewHolder viewHolder, int section, int off
     MediaRecord   mediaRecord       = media.get(section, offset);
     ThumbnailView thumbnailView     = ((ViewHolder)viewHolder).imageView;
     View          selectedIndicator = ((ViewHolder)viewHolder).selectedIndicator;
-    Slide         slide             = MediaUtil.getSlideForAttachment(context, mediaRecord.getAttachment());
+    Slide         slide             = MediaUtil.getSlideForAttachment(context, mediaRecord.attachment);
 
     if (slide != null) {
       thumbnailView.setImageResource(glideRequests, slide, false);

app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java

@@ -286,7 +286,7 @@ private void handleMediaMultiSelectClick(@NonNull MediaDatabase.MediaRecord medi
     }
 
     private void handleMediaPreviewClick(@NonNull MediaDatabase.MediaRecord mediaRecord) {
-      if (mediaRecord.getAttachment().getDataUri() == null) {
+      if (mediaRecord.attachment.getDataUri() == null) {
         return;
       }
 
@@ -296,13 +296,13 @@ private void handleMediaPreviewClick(@NonNull MediaDatabase.MediaRecord mediaRec
       }
 
       Intent intent = new Intent(context, MediaPreviewActivity.class);
-      intent.putExtra(MediaPreviewActivity.DATE_EXTRA, mediaRecord.getDate());
-      intent.putExtra(MediaPreviewActivity.SIZE_EXTRA, mediaRecord.getAttachment().getSize());
+      intent.putExtra(MediaPreviewActivity.DATE_EXTRA, mediaRecord.date);
+      intent.putExtra(MediaPreviewActivity.SIZE_EXTRA, mediaRecord.attachment.getSize());
       intent.putExtra(MediaPreviewActivity.ADDRESS_EXTRA, recipient.getAddress());
       intent.putExtra(MediaPreviewActivity.OUTGOING_EXTRA, mediaRecord.isOutgoing());
       intent.putExtra(MediaPreviewActivity.LEFT_IS_RECENT_EXTRA, true);
 
-      intent.setDataAndType(mediaRecord.getAttachment().getDataUri(), mediaRecord.getContentType());
+      intent.setDataAndType(mediaRecord.attachment.getDataUri(), mediaRecord.getContentType());
       context.startActivity(intent);
     }
 
@@ -337,11 +337,11 @@ protected List<SaveAttachmentTask.Attachment> doInBackground(Void... params) {
                       List<SaveAttachmentTask.Attachment> attachments = new LinkedList<>();
 
                       for (MediaDatabase.MediaRecord mediaRecord : mediaRecords) {
-                        if (mediaRecord.getAttachment().getDataUri() != null) {
-                          attachments.add(new SaveAttachmentTask.Attachment(mediaRecord.getAttachment().getDataUri(),
+                        if (mediaRecord.attachment.getDataUri() != null) {
+                          attachments.add(new SaveAttachmentTask.Attachment(mediaRecord.attachment.getDataUri(),
                                   mediaRecord.getContentType(),
-                                  mediaRecord.getDate(),
-                                  mediaRecord.getAttachment().getFileName()));
+                                  mediaRecord.date,
+                                  mediaRecord.attachment.getFileName()));
                         }
                       }
 
@@ -391,7 +391,7 @@ protected Void doInBackground(MediaDatabase.MediaRecord... records) {
           }
 
           for (MediaDatabase.MediaRecord record : records) {
-            AttachmentUtil.deleteAttachment(getContext(), record.getAttachment());
+            AttachmentUtil.deleteAttachment(getContext(), record.attachment);
           }
           return null;
         }

app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java

@@ -707,8 +707,8 @@ public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
 
       try {
         //noinspection ConstantConditions
-        mediaView.set(glideRequests, window, mediaRecord.getAttachment().getDataUri(),
-                      mediaRecord.getAttachment().getContentType(), mediaRecord.getAttachment().getSize(), autoplay);
+        mediaView.set(glideRequests, window, mediaRecord.attachment.getDataUri(),
+                      mediaRecord.attachment.getContentType(), mediaRecord.attachment.getSize(), autoplay);
       } catch (IOException e) {
         Log.w(TAG, e);
       }
@@ -731,15 +731,15 @@ public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Obj
     public MediaItem getMediaItemFor(int position) {
       cursor.moveToPosition(getCursorPosition(position));
       MediaRecord mediaRecord = MediaRecord.from(context, cursor);
-      Address     address     = mediaRecord.getAddress();
+      Address     address     = mediaRecord.address;
 
-      if (mediaRecord.getAttachment().getDataUri() == null) throw new AssertionError();
+      if (mediaRecord.attachment.getDataUri() == null) throw new AssertionError();
 
       return new MediaItem(address != null ? Recipient.from(context, address,true) : null,
-                           mediaRecord.getAttachment(),
-                           mediaRecord.getAttachment().getDataUri(),
+              mediaRecord.attachment,
+                           mediaRecord.attachment.getDataUri(),
                            mediaRecord.getContentType(),
-                           mediaRecord.getDate(),
+              mediaRecord.date,
                            mediaRecord.isOutgoing());
     }
 

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/LinkPreviewDraftView.kt

@@ -32,9 +32,9 @@ class LinkPreviewDraftView : LinearLayout {
         binding.linkPreviewDraftContainer.isVisible = true
         binding.linkPreviewDraftLoader.isVisible = false
         binding.thumbnailImageView.root.setRoundedCorners(toPx(4, resources))
-        if (linkPreview.getThumbnail().isPresent) {
+        linkPreview.thumbnail?.let {
             // This internally fetches the thumbnail
-            binding.thumbnailImageView.root.setImageResource(glide, ImageSlide(context, linkPreview.getThumbnail().get()), false)
+            binding.thumbnailImageView.root.setImageResource(glide, ImageSlide(context, it), false)
         }
         binding.linkPreviewDraftTitleTextView.text = linkPreview.title
     }

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/LinkPreviewView.kt

@@ -39,9 +39,9 @@ class LinkPreviewView : LinearLayout {
         val linkPreview = message.linkPreviews.first()
         url = linkPreview.url
         // Thumbnail
-        if (linkPreview.getThumbnail().isPresent) {
+        linkPreview.thumbnail?.let {
             // This internally fetches the thumbnail
-            binding.thumbnailImageView.root.setImageResource(glide, ImageSlide(context, linkPreview.getThumbnail().get()), isPreview = false)
+            binding.thumbnailImageView.root.setImageResource(glide, ImageSlide(context, it), isPreview = false)
             binding.thumbnailImageView.root.loadIndicator.isVisible = false
         }
         // Title

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt

@@ -134,14 +134,9 @@ class VisibleMessageContentView : ConstraintLayout {
         }
 
         if (message is MmsMessageRecord) {
-            message.slideDeck.asAttachments().forEach { attach ->
-                val dbAttachment = attach as? DatabaseAttachment ?: return@forEach
-                onAttachmentNeedsDownload(dbAttachment)
-            }
-            message.linkPreviews.forEach { preview ->
-                val previewThumbnail = preview.getThumbnail().orNull() as? DatabaseAttachment ?: return@forEach
-                onAttachmentNeedsDownload(previewThumbnail)
-            }
+            message.slideDeck.asAttachments().asSequence() + message.linkPreviews.map { it.thumbnail }
+                .filterIsInstance<DatabaseAttachment>()
+                .forEach(onAttachmentNeedsDownload)
         }
 
         when {