Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 00:29:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Convert some SignalServiceAttachment* classes to kotlin.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-08-02 16:45:06 -04:00
committed by mtang-signal
parent bb01c0501b
commit 8932eef991
40 changed files with 431 additions and 673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/attachments/Attachment.kt
View File

@@ -23,7 +23,7 @@ import java.util.UUID
*/
abstract class Attachment(
@JvmField
val contentType: String,
val contentType: String?,
@JvmField
val transferState: Int,
@JvmField

12
app/src/main/java/org/thoughtcrime/securesms/attachments/PointerAttachment.kt
View File

@@ -17,7 +17,7 @@ import java.util.UUID
class PointerAttachment : Attachment {
@VisibleForTesting
constructor(
contentType: String,
contentType: String?,
transferState: Int,
size: Long,
fileName: String?,
@@ -87,15 +87,11 @@ class PointerAttachment : Attachment {
@JvmStatic
@JvmOverloads
fun forPointer(pointer: Optional<SignalServiceAttachment>, stickerLocator: StickerLocator? = null, fastPreflightId: String? = null, transferState: Int = AttachmentTable.TRANSFER_PROGRESS_PENDING): Optional<Attachment> {
if (!pointer.isPresent || !pointer.get().isPointer) {
if (!pointer.isPresent || !pointer.get().isPointer()) {
return Optional.empty()
}
val encodedKey: String? = if (pointer.get().asPointer().key != null) {
encodeWithPadding(pointer.get().asPointer().key)
} else {
null
}
val encodedKey: String? = pointer.get().asPointer().key?.let { encodeWithPadding(it) }
return Optional.of(
PointerAttachment(
@@ -143,7 +139,7 @@ class PointerAttachment : Attachment {
fileName = quotedAttachment.fileName,
cdn = Cdn.fromCdnNumber(thumbnail?.asPointer()?.cdnNumber ?: 0),
location = thumbnail?.asPointer()?.remoteId?.toString() ?: "0",
key = if (thumbnail != null && thumbnail.asPointer().key != null) encodeWithPadding(thumbnail.asPointer().key) else null,
key = thumbnail?.asPointer()?.key?.let { encodeWithPadding(it) },
digest = thumbnail?.asPointer()?.digest?.orElse(null),
incrementalDigest = thumbnail?.asPointer()?.incrementalDigest?.orElse(null),
incrementalMacChunkSize = thumbnail?.asPointer()?.incrementalMacChunkSize ?: 0,