Convert Media to kotlin.

Author: alex-signal

app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarRenderer.kt

@@ -18,7 +18,6 @@ import org.thoughtcrime.securesms.util.MediaUtil
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.IOException
-import java.util.Optional
 
 /**
  * Renders Avatar objects into Media objects. This can involve creating a Bitmap, depending on the
@@ -132,6 +131,20 @@ object AvatarRenderer {
   }
 
   private fun createMedia(uri: Uri, size: Long): Media {
-    return Media(uri, MediaUtil.IMAGE_JPEG, System.currentTimeMillis(), DIMENSIONS, DIMENSIONS, size, 0, false, false, Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty())
+    return Media(
+      uri = uri,
+      contentType = MediaUtil.IMAGE_JPEG,
+      date = System.currentTimeMillis(),
+      width = DIMENSIONS,
+      height = DIMENSIONS,
+      size = size,
+      duration = 0,
+      isBorderless = false,
+      isVideoGif = false,
+      bucketId = null,
+      caption = null,
+      transformProperties = null,
+      fileName = null
+    )
   }
 }

app/src/main/java/org/thoughtcrime/securesms/conversation/drafts/DraftRepository.kt

@@ -115,7 +115,7 @@ class DraftRepository(
     }
 
     if (shareMediaList.isNotEmpty()) {
-      return ShareOrDraftData.StartSendMedia(shareMediaList, shareText) to null
+      return ShareOrDraftData.StartSendMedia(shareMediaList.filterNotNull(), shareText) to null
     }
 
     if (shareMedia != null && shareMediaType != null) {

app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragmentArgs.kt

@@ -23,7 +23,6 @@ import org.thoughtcrime.securesms.mms.PartAuthority
 import org.thoughtcrime.securesms.sharing.MultiShareArgs
 import org.thoughtcrime.securesms.stories.Stories
 import org.thoughtcrime.securesms.util.hasSharedContact
-import java.util.Optional
 import java.util.function.Consumer
 
 /**
@@ -188,19 +187,19 @@ data class MultiselectForwardFragmentArgs @JvmOverloads constructor(
       val uri = this.uri ?: return null
 
       return Media(
-        uri,
-        contentType,
-        System.currentTimeMillis(),
-        width,
-        height,
-        size,
-        0,
-        borderless,
-        videoGif,
-        Optional.empty(),
-        Optional.ofNullable(caption),
-        Optional.ofNullable(transformProperties),
-        Optional.ofNullable(fileName)
+        uri = uri,
+        contentType = contentType,
+        date = System.currentTimeMillis(),
+        width = width,
+        height = height,
+        size = size,
+        duration = 0,
+        isBorderless = borderless,
+        isVideoGif = videoGif,
+        bucketId = null,
+        caption = caption,
+        transformProperties = transformProperties,
+        fileName = fileName
       )
     }
   }

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

@@ -1329,19 +1329,19 @@ class ConversationFragment :
     } else {
       val mimeType = MediaUtil.getMimeType(requireContext(), uri) ?: mediaType.toFallbackMimeType()
       val media = Media(
-        uri,
-        mimeType,
-        0,
-        width,
-        height,
-        0,
-        0,
-        borderless,
-        videoGif,
-        Optional.empty(),
-        Optional.empty(),
-        Optional.of(AttachmentTable.TransformProperties.forSentMediaQuality(SignalStore.settings.sentMediaQuality.code)),
-        Optional.empty()
+        uri = uri,
+        contentType = mimeType,
+        date = 0,
+        width = width,
+        height = height,
+        size = 0,
+        duration = 0,
+        isBorderless = borderless,
+        isVideoGif = videoGif,
+        bucketId = null,
+        caption = null,
+        transformProperties = AttachmentTable.TransformProperties.forSentMediaQuality(SignalStore.settings.sentMediaQuality.code),
+        fileName = null
       )
       conversationActivityResultContracts.launchMediaEditor(listOf(media), recipientId, composeText.textTrimmed)
     }
@@ -3788,11 +3788,11 @@ class ConversationFragment :
 
       val slides: List<Slide> = result.nonUploadedMedia.mapNotNull {
         when {
-          MediaUtil.isVideoType(it.contentType) -> VideoSlide(requireContext(), it.uri, it.size, it.isVideoGif, it.width, it.height, it.caption.orNull(), it.transformProperties.orNull())
-          MediaUtil.isGif(it.contentType) -> GifSlide(requireContext(), it.uri, it.size, it.width, it.height, it.isBorderless, it.caption.orNull())
-          MediaUtil.isImageType(it.contentType) -> ImageSlide(requireContext(), it.uri, it.contentType, it.size, it.width, it.height, it.isBorderless, it.caption.orNull(), null, it.transformProperties.orNull())
+          MediaUtil.isVideoType(it.contentType) -> VideoSlide(requireContext(), it.uri, it.size, it.isVideoGif, it.width, it.height, it.caption, it.transformProperties)
+          MediaUtil.isGif(it.contentType) -> GifSlide(requireContext(), it.uri, it.size, it.width, it.height, it.isBorderless, it.caption)
+          MediaUtil.isImageType(it.contentType) -> ImageSlide(requireContext(), it.uri, it.contentType, it.size, it.width, it.height, it.isBorderless, it.caption, null, it.transformProperties)
           MediaUtil.isDocumentType(it.contentType) -> {
-            DocumentSlide(requireContext(), it.uri, it.contentType, it.size, it.fileName.orNull())
+            DocumentSlide(requireContext(), it.uri, it.contentType!!, it.size, it.fileName)
           }
 
           else -> {

app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt

@@ -30,6 +30,7 @@ import com.bumptech.glide.Glide
 import com.fasterxml.jackson.annotation.JsonProperty
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.Serializable
 import okio.ByteString
 import okio.ByteString.Companion.toByteString
 import org.json.JSONArray
@@ -3519,6 +3520,7 @@ class AttachmentTable(
     val random: ByteArray
   )
 
+  @Serializable
   @Parcelize
   data class TransformProperties(
     @JsonProperty("skipTransform")

app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java

@@ -126,7 +126,7 @@ private void handleGiphyMp4SuccessfulResult(@NonNull GiphyMp4SaveResult.Success
       mimeType = mediaType.toFallbackMimeType();
     }
 
-    Media media = new Media(success.getBlobUri(), mimeType, 0, success.getWidth(), success.getHeight(), 0, 0, false, true, Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty());
+    Media media = new Media(success.getBlobUri(), mimeType, 0, success.getWidth(), success.getHeight(), 0, 0, false,  true, null, null, null, null);
     startActivityForResult(MediaSelectionActivity.editor(this, sendType, Collections.singletonList(media), recipientId, text), MEDIA_SENDER);
   }
 

app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2ViewModel.kt

@@ -34,7 +34,6 @@ import org.thoughtcrime.securesms.notifications.NotificationChannels
 import org.thoughtcrime.securesms.notifications.NotificationIds
 import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.rx.RxStore
-import java.util.Optional
 
 class MediaPreviewV2ViewModel : ViewModel() {
 
@@ -191,18 +190,18 @@ fun MediaTable.MediaRecord.toMedia(): Media? {
   }
 
   return Media(
-    uri,
-    this.contentType,
-    this.date,
-    attachment.width,
-    attachment.height,
-    attachment.size,
-    0,
-    attachment.borderless,
-    attachment.videoGif,
-    Optional.empty(),
-    Optional.ofNullable(attachment.caption),
-    Optional.empty(),
-    Optional.empty()
+    uri = uri,
+    contentType = this.contentType,
+    date = this.date,
+    width = attachment.width,
+    height = attachment.height,
+    size = attachment.size,
+    duration = 0,
+    isBorderless = attachment.borderless,
+    isVideoGif = attachment.videoGif,
+    bucketId = null,
+    caption = attachment.caption,
+    transformProperties = null,
+    fileName = null
   )
 }

app/src/main/java/org/thoughtcrime/securesms/mediapreview/mediarail/MediaRailAdapter.kt

@@ -79,7 +79,7 @@ class MediaRailAdapter(
     override fun bind(model: MediaRailItem) {
       image.setImageResource(requestManager, model.media.uri, 0, 0, false, imageLoadingListener)
       image.setOnClickListener { onRailItemSelected(model.media) }
-      captionIndicator.visibility = if (model.media.caption.isPresent) View.VISIBLE else View.GONE
+      captionIndicator.visibility = if (model.media.caption != null) View.VISIBLE else View.GONE
 
       outline.visible = model.isSelected
       overlay.setImageResource(if (model.isSelected) R.drawable.mediapreview_rail_item_overlay_selected else R.drawable.mediapreview_rail_item_overlay_unselected)

app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionActivity.java

@@ -99,10 +99,10 @@ public void onImageCaptured(@NonNull byte[] data, int width, int height) {
                               0,
                               false,
                               false,
-                              Optional.of(Media.ALL_MEDIA_BUCKET_ID),
-                              Optional.empty(),
-                              Optional.empty(),
-                              Optional.empty()));
+                              Media.ALL_MEDIA_BUCKET_ID,
+                              null,
+                              null,
+                              null));
   }
 
   @Override

app/src/main/java/org/thoughtcrime/securesms/mediasend/ImageEditorModelRenderMediaTransform.java

@@ -18,7 +18,6 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.Optional;
 
 public final class ImageEditorModelRenderMediaTransform implements MediaTransform {
 
@@ -50,7 +49,7 @@ public ImageEditorModelRenderMediaTransform(@NonNull EditorModel modelToRender,
                             .withMimeType(MediaUtil.IMAGE_JPEG)
                             .createForSingleSessionOnDisk(context);
 
-      return new Media(uri, MediaUtil.IMAGE_JPEG, media.getDate(), bitmap.getWidth(), bitmap.getHeight(), outputStream.size(), 0, false, false, media.getBucketId(), media.getCaption(), Optional.empty(), Optional.empty());
+      return new Media(uri, MediaUtil.IMAGE_JPEG, media.getDate(), bitmap.getWidth(), bitmap.getHeight(), outputStream.size(), 0, false, false, media.getBucketId(), media.getCaption(), null, null);
     } catch (IOException e) {
       Log.w(TAG, "Failed to render image. Using base image.");
       return media;