Merge pull request #1924 from session-foundation/techdebt/remove-guava

Techdebt/remove guava

Author: ThomasSession

app/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt

@@ -227,14 +227,14 @@ class AttachmentUploadJob @AssistedInject constructor(
     }
 
     private fun handlePermanentFailure(dispatcherName: String, e: Exception) {
-        Log.w(TAG, "Attachment upload failed permanently due to error: $this.")
+        Log.w(TAG, "Attachment upload failed permanently due to error:", e)
         delegate?.handleJobFailedPermanently(this, dispatcherName, e)
         messageDataProvider.handleFailedAttachmentUpload(attachmentID)
         failAssociatedMessageSendJob(e)
     }
 
     private fun handleFailure(dispatcherName: String, e: Exception) {
-        Log.w(TAG, "Attachment upload failed due to error: $this.")
+        Log.w(TAG, "Attachment upload failed due to error:", e)
         delegate?.handleJobFailed(this, dispatcherName, e)
         if (failureCount + 1 >= maxFailureCount) {
             failAssociatedMessageSendJob(e)

app/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt

@@ -7,7 +7,6 @@ import com.google.protobuf.ByteString
 import org.session.libsession.messaging.sending_receiving.attachments.PointerAttachment
 import org.session.libsignal.messages.SignalServiceAttachmentPointer
 import org.session.protos.SessionProtos
-import org.session.libsignal.utilities.guava.Optional
 import java.io.File
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment as SignalAttachment
 
@@ -28,69 +27,63 @@ class Attachment {
             val result = Attachment()
 
             // Note: For legacy Session Android clients this filename will be null and we'll synthesise an appropriate filename
-            // further down the stack
+            // further down the stack in the Storage.persist
             result.filename = proto.fileName
 
             fun inferContentType(): String {
-                val fileName = result.filename
+                val fileName = result.filename.orEmpty()
                 val fileExtension = File(fileName).extension
                 val mimeTypeMap = MimeTypeMap.getSingleton()
                 return mimeTypeMap.getMimeTypeFromExtension(fileExtension) ?: "application/octet-stream"
             }
             result.contentType = proto.contentType ?: inferContentType()
 
-            // If we were given a null filename from a legacy client but we at least have a content type (i.e., mime type)
-            // then the best we can do is synthesise a filename based on the content type and when we received the file.
-            if (result.filename.isNullOrEmpty() && !result.contentType.isNullOrEmpty()) {
-                Log.d("", "*** GOT an empty filename")
-                //result.filename = generateFilenameFromReceivedTypeForLegacyClients(result.contentType!!)
-                //todo: Found this part with the code commented out... This 'if' is now doing nothing at all, is that normal? Shouldn't we indeed set a filename here or is that handled further down the line? (can't explore this now so I'm leaving a todo)
-            }
-
             result.key = proto.key.toByteArray()
             result.digest = proto.digest.toByteArray()
-            val kind: Kind = if (proto.hasFlags() && proto.flags.and(SessionProtos.AttachmentPointer.Flags.VOICE_MESSAGE_VALUE) > 0) {
-                Kind.VOICE_MESSAGE
-            } else {
-                Kind.GENERIC
-            }
-            result.kind = kind
+
+            result.kind =
+                if (proto.hasFlags() && (proto.flags and SessionProtos.AttachmentPointer.Flags.VOICE_MESSAGE_VALUE) > 0) {
+                    Kind.VOICE_MESSAGE
+                } else {
+                    Kind.GENERIC
+                }
+
             result.caption = if (proto.hasCaption()) proto.caption else null
-            val size: Size = if (proto.hasWidth() && proto.width > 0 && proto.hasHeight() && proto.height > 0) {
-                Size(proto.width, proto.height)
-            } else {
-                Size(0,0)
-            }
-            result.size = size
+
+            result.size =
+                if (proto.hasWidth() && proto.width > 0 && proto.hasHeight() && proto.height > 0) {
+                    Size(proto.width, proto.height)
+                } else {
+                    Size(0, 0)
+                }
+
             result.sizeInBytes = if (proto.size > 0) proto.size else null
             result.url = proto.url
 
             return result
         }
 
-        fun createAttachmentPointer(attachment: SignalServiceAttachmentPointer): SessionProtos.AttachmentPointer? {
+        fun createAttachmentPointer(attachment: SignalServiceAttachmentPointer): SessionProtos.AttachmentPointer {
             val builder = SessionProtos.AttachmentPointer.newBuilder()
-                    .setContentType(attachment.contentType)
-                    .setId(attachment.id.toString().toLongOrNull() ?: 0L)
-                    .setKey(ByteString.copyFrom(attachment.key))
-                    .setSize(attachment.size.get())
-                    .setUrl(attachment.url)
-
-            if (attachment.digest.isPresent) {
-                builder.setDigest(ByteString.copyFrom(attachment.digest.get()))
-            }
-            
+                .setContentType(attachment.contentType)
+                .setId(attachment.id)
+                .setKey(ByteString.copyFrom(attachment.key))
+                .setSize(attachment.size ?: 0)
+                .setUrl(attachment.url)
+
+            attachment.digest?.let { builder.setDigest(ByteString.copyFrom(it)) }
+
             // Filenames are now mandatory for picked/shared files, Giphy GIFs, and captured photos.
             // The images associated with LinkPreviews don't have a "given name" so we'll use the
             // attachment ID as the filename. It's not possible to save these preview images or see
             // the filename, so what the filename IS isn't important, only that a filename exists.
             builder.fileName = attachment.filename ?: attachment.id.toString()
 
-            if (attachment.preview.isPresent) { builder.thumbnail = ByteString.copyFrom(attachment.preview.get())               }
-            if (attachment.width > 0)         { builder.width = attachment.width                                                }
-            if (attachment.height > 0)        { builder.height = attachment.height                                              }
-            if (attachment.voiceNote)         { builder.flags = SessionProtos.AttachmentPointer.Flags.VOICE_MESSAGE_VALUE }
-            if (attachment.caption.isPresent) { builder.caption = attachment.caption.get()                                      }
+            attachment.preview?.let { builder.thumbnail = ByteString.copyFrom(it) }
+            if (attachment.width > 0) builder.width = attachment.width
+            if (attachment.height > 0) builder.height = attachment.height
+            if (attachment.voiceNote) builder.flags = SessionProtos.AttachmentPointer.Flags.VOICE_MESSAGE_VALUE
+            attachment.caption?.let { builder.caption = it }
 
             return builder.build()
         }
@@ -112,14 +105,31 @@ class Attachment {
 
     fun toSignalAttachment(): SignalAttachment? {
         if (!isValid()) return null
-        return PointerAttachment.forAttachment((this))
+        return PointerAttachment.forAttachment(this)
     }
 
     fun toSignalPointer(): SignalServiceAttachmentPointer? {
         if (!isValid()) return null
-        return SignalServiceAttachmentPointer(0, contentType, key, Optional.fromNullable(sizeInBytes), null,
-                size?.width ?: 0, size?.height ?: 0, Optional.fromNullable(digest), filename,
-                kind == Kind.VOICE_MESSAGE, Optional.fromNullable(caption), url)
-    }
 
-}
+        // safe because isValid() checked them
+        val ct = contentType!!
+        val k = key!!
+        val u = url!!
+        val file = filename
+
+        return SignalServiceAttachmentPointer(
+            id = 0L,
+            contentType = ct,
+            key = k,
+            size = sizeInBytes,
+            preview = null,
+            width = size?.width ?: 0,
+            height = size?.height ?: 0,
+            digest = digest,
+            filename = file ?: "",
+            voiceNote = (kind == Kind.VOICE_MESSAGE),
+            caption = caption,
+            url = u
+        )
+    }
+}

app/src/main/java/org/session/libsession/messaging/sending_receiving/VisibleMessageHandler.kt

@@ -30,7 +30,6 @@ import org.session.libsession.utilities.upsertContact
 import org.session.libsession.utilities.withMutableUserConfigs
 import org.session.libsession.utilities.withUserConfigs
 import org.session.libsignal.utilities.Log
-import org.session.libsignal.utilities.guava.Optional
 import org.session.protos.SessionProtos
 import org.thoughtcrime.securesms.database.Storage
 import org.thoughtcrime.securesms.database.model.MessageId
@@ -109,11 +108,15 @@ class VisibleMessageHandler @Inject constructor(
         if (message.linkPreview != null && proto.dataMessage.previewCount > 0) {
             for (preview in proto.dataMessage.previewList) {
                 val thumbnail = PointerAttachment.forPointer(preview.image)
-                val url = Optional.fromNullable(preview.url)
-                val title = Optional.fromNullable(preview.title)
-                val hasContent = !TextUtils.isEmpty(title.or("")) || thumbnail.isPresent
+                val url = preview.url
+                val title = preview.title
+                val hasContent = !title.isNullOrEmpty() || thumbnail != null
                 if (hasContent) {
-                    val linkPreview = LinkPreview(url.get(), title.or(""), thumbnail)
+                    val linkPreview = LinkPreview(
+                        url = url.orEmpty(),
+                        title = title.orEmpty(),
+                        thumbnail = thumbnail
+                    )
                     linkPreviews.add(linkPreview)
                 } else {
                     Log.w("Loki", "Discarding an invalid link preview. hasContent: $hasContent")