mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-21 17:29:32 +01:00
Introduce core-models module.
Needed to share some key components with feature modules without having to depend on libsignal-service.
This commit is contained in:
committed by
jeffrey-signal
parent
abf32bf6ff
commit
706d89db87
@@ -1,7 +1,7 @@
|
||||
package org.thoughtcrime.securesms.conversation
|
||||
|
||||
import org.signal.core.models.ServiceId
|
||||
import org.thoughtcrime.securesms.recipients.Recipient
|
||||
import org.whispersystems.signalservice.api.push.ServiceId
|
||||
|
||||
/**
|
||||
* Represents metadata about a conversation.
|
||||
|
||||
@@ -21,7 +21,7 @@ import org.thoughtcrime.securesms.mms.TextSlide;
|
||||
import org.thoughtcrime.securesms.recipients.Recipient;
|
||||
import org.thoughtcrime.securesms.recipients.RecipientUtil;
|
||||
import org.thoughtcrime.securesms.util.MessageRecordUtil;
|
||||
import org.whispersystems.signalservice.api.push.ServiceId;
|
||||
import org.signal.core.models.ServiceId;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
|
||||
@@ -59,7 +59,7 @@ import org.thoughtcrime.securesms.util.Util;
|
||||
import org.thoughtcrime.securesms.util.ViewUtil;
|
||||
import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;
|
||||
import org.thoughtcrime.securesms.verify.VerifyIdentityActivity;
|
||||
import org.whispersystems.signalservice.api.push.ServiceId;
|
||||
import org.signal.core.models.ServiceId;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Locale;
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
|
||||
package org.thoughtcrime.securesms.conversation.colors
|
||||
|
||||
import org.signal.core.models.ServiceId
|
||||
import org.signal.core.util.CryptoUtil
|
||||
import org.thoughtcrime.securesms.groups.GroupId
|
||||
import org.whispersystems.signalservice.api.push.ServiceId
|
||||
|
||||
/**
|
||||
* Stolen from iOS. Utilizes a simple hash to map different characteristics to an avatar color index.
|
||||
|
||||
@@ -3,10 +3,10 @@ package org.thoughtcrime.securesms.conversation.colors
|
||||
import android.content.Context
|
||||
import androidx.annotation.ColorInt
|
||||
import androidx.core.content.ContextCompat
|
||||
import org.signal.core.models.ServiceId
|
||||
import org.thoughtcrime.securesms.R
|
||||
import org.thoughtcrime.securesms.recipients.Recipient
|
||||
import org.thoughtcrime.securesms.recipients.RecipientId
|
||||
import org.whispersystems.signalservice.api.push.ServiceId
|
||||
|
||||
/**
|
||||
* Helper class for all things ChatColors.
|
||||
|
||||
@@ -42,6 +42,7 @@ import kotlinx.coroutines.flow.mapNotNull
|
||||
import kotlinx.coroutines.flow.update
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.coroutines.rx3.asFlow
|
||||
import org.signal.core.models.ServiceId
|
||||
import org.signal.core.util.logging.Log
|
||||
import org.signal.core.util.orNull
|
||||
import org.signal.paging.ProxyPagingController
|
||||
@@ -98,7 +99,6 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences
|
||||
import org.thoughtcrime.securesms.util.hasGiftBadge
|
||||
import org.thoughtcrime.securesms.util.rx.RxStore
|
||||
import org.thoughtcrime.securesms.wallpaper.ChatWallpaper
|
||||
import org.whispersystems.signalservice.api.push.ServiceId
|
||||
import java.util.concurrent.TimeUnit
|
||||
import kotlin.time.Duration
|
||||
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
package org.thoughtcrime.securesms.conversation.v2.data
|
||||
|
||||
import androidx.annotation.WorkerThread
|
||||
import org.signal.core.util.UuidUtil
|
||||
import org.signal.core.util.concurrent.SignalExecutors
|
||||
import org.signal.core.util.roundedString
|
||||
import org.thoughtcrime.securesms.attachments.DatabaseAttachment
|
||||
@@ -24,7 +25,6 @@ import org.thoughtcrime.securesms.payments.Payment
|
||||
import org.thoughtcrime.securesms.polls.PollRecord
|
||||
import org.thoughtcrime.securesms.recipients.Recipient
|
||||
import org.thoughtcrime.securesms.recipients.RecipientId
|
||||
import org.whispersystems.signalservice.api.util.UuidUtil
|
||||
import java.util.UUID
|
||||
import java.util.concurrent.Callable
|
||||
import java.util.concurrent.ExecutorService
|
||||
@@ -80,7 +80,7 @@ object MessageDataFetcher {
|
||||
.filter { it.isMms && it.isPaymentNotification }
|
||||
.map { UuidUtil.parseOrNull(it.body) to it.id }
|
||||
.filter { it.first != null }
|
||||
.associate { it.first to it.second }
|
||||
.associate { it.first!! to it.second }
|
||||
|
||||
SignalDatabase
|
||||
.payments
|
||||
|
||||
Reference in New Issue
Block a user