From 542a820e229e6d0b0ac10086f6864f9aba099704 Mon Sep 17 00:00:00 2001 From: Jesse Weinstein Date: Fri, 20 Mar 2026 15:11:08 -0400 Subject: [PATCH] Remove UriSerializer typealias -- it is only used in two places --- .../org/thoughtcrime/securesms/badges/models/Badge.kt | 2 +- .../securesms/conversation/ConversationArgs.kt | 2 +- .../securesms/serialization/UriSerializer.kt | 11 ----------- 3 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/serialization/UriSerializer.kt diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt index ca55df1b1f..36f46eb6d7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt @@ -13,11 +13,11 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.load.resource.bitmap.DownsampleStrategy import kotlinx.parcelize.Parcelize import kotlinx.serialization.Serializable +import org.signal.core.models.UriSerializer import org.signal.core.ui.util.ThemeUtil import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.badges.load.BadgeSpriteTransformation import org.thoughtcrime.securesms.components.settings.PreferenceModel -import org.thoughtcrime.securesms.serialization.UriSerializer import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationArgs.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationArgs.kt index 28594e6621..bffa34aaa1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationArgs.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationArgs.kt @@ -9,6 +9,7 @@ import android.os.Parcelable import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.Parcelize import kotlinx.serialization.Serializable +import org.signal.core.models.UriSerializer import org.signal.core.models.media.Media import org.thoughtcrime.securesms.badges.models.Badge import org.thoughtcrime.securesms.conversation.ConversationIntents.ConversationScreenType @@ -16,7 +17,6 @@ import org.thoughtcrime.securesms.conversation.colors.ChatColors import org.thoughtcrime.securesms.mms.SlideFactory import org.thoughtcrime.securesms.recipients.Recipient.Companion.resolved import org.thoughtcrime.securesms.recipients.RecipientId -import org.thoughtcrime.securesms.serialization.UriSerializer import org.thoughtcrime.securesms.stickers.StickerLocator import org.thoughtcrime.securesms.wallpaper.ChatWallpaper diff --git a/app/src/main/java/org/thoughtcrime/securesms/serialization/UriSerializer.kt b/app/src/main/java/org/thoughtcrime/securesms/serialization/UriSerializer.kt deleted file mode 100644 index 94f9070087..0000000000 --- a/app/src/main/java/org/thoughtcrime/securesms/serialization/UriSerializer.kt +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2025 Signal Messenger, LLC - * SPDX-License-Identifier: AGPL-3.0-only - */ - -package org.thoughtcrime.securesms.serialization - -/** - * Typealias to the core UriSerializer class for backward compatibility. - */ -typealias UriSerializer = org.signal.core.models.UriSerializer