From 2315a1c6329e259f38b49b2f4fd6949b278af370 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Tue, 18 Oct 2022 10:48:25 -0300 Subject: [PATCH] Remove isFeatureAvailable and remove compatibility check. --- .../components/settings/app/AppSettingsFragment.kt | 4 ++-- .../securesms/database/RecipientDatabase.kt | 4 ++-- .../securesms/jobs/StoryOnboardingDownloadJob.kt | 4 ++-- .../messages/MessageContentProcessor.java | 8 ++++---- .../org/thoughtcrime/securesms/stories/Stories.kt | 14 +------------- 5 files changed, 11 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt index 49484d2f7..e7ed71524 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt @@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.components.settings.configure import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter import org.thoughtcrime.securesms.recipients.Recipient -import org.thoughtcrime.securesms.stories.Stories +import org.thoughtcrime.securesms.stories.Stories.isFeatureFlagEnabled import org.thoughtcrime.securesms.util.FeatureFlags import org.thoughtcrime.securesms.util.PlayServicesUtil import org.thoughtcrime.securesms.util.Util @@ -107,7 +107,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men } ) - if (Stories.isFeatureAvailable()) { + if (isFeatureFlagEnabled()) { clickPref( title = DSLSettingsText.from(R.string.preferences__stories), icon = DSLSettingsIcon.from(R.drawable.ic_stories_24), diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.kt index 90d4eca40..54a074636 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.kt @@ -85,7 +85,7 @@ import org.thoughtcrime.securesms.recipients.RecipientId import org.thoughtcrime.securesms.storage.StorageRecordUpdate import org.thoughtcrime.securesms.storage.StorageSyncHelper import org.thoughtcrime.securesms.storage.StorageSyncModels -import org.thoughtcrime.securesms.stories.Stories +import org.thoughtcrime.securesms.stories.Stories.isFeatureFlagEnabled import org.thoughtcrime.securesms.util.Base64 import org.thoughtcrime.securesms.util.FeatureFlags import org.thoughtcrime.securesms.util.GroupUtil @@ -1274,7 +1274,7 @@ open class RecipientDatabase(context: Context, databaseHelper: SignalDatabase) : * @return All storage IDs for synced records, excluding the ones that need to be deleted. */ fun getContactStorageSyncIdsMap(): Map { - val (inPart, args) = if (Stories.isFeatureAvailable()) { + val (inPart, args) = if (isFeatureFlagEnabled()) { "(?, ?)" to SqlUtil.buildArgs(GroupType.NONE.id, Recipient.self().id, GroupType.SIGNAL_V1.id, GroupType.DISTRIBUTION_LIST.id) } else { "(?)" to SqlUtil.buildArgs(GroupType.NONE.id, Recipient.self().id, GroupType.SIGNAL_V1.id) diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StoryOnboardingDownloadJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/StoryOnboardingDownloadJob.kt index 91f11fd78..e8e72e47b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StoryOnboardingDownloadJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StoryOnboardingDownloadJob.kt @@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.releasechannel.ReleaseChannel import org.thoughtcrime.securesms.s3.S3 -import org.thoughtcrime.securesms.stories.Stories +import org.thoughtcrime.securesms.stories.Stories.isFeatureFlagEnabled import org.thoughtcrime.securesms.transport.RetryLaterException import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException import java.util.Locale @@ -51,7 +51,7 @@ class StoryOnboardingDownloadJob private constructor(parameters: Parameters) : B } fun enqueueIfNeeded() { - if (SignalStore.storyValues().hasDownloadedOnboardingStory || !Stories.isFeatureAvailable()) { + if (SignalStore.storyValues().hasDownloadedOnboardingStory || !isFeatureFlagEnabled()) { return } diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java index d4aebca91..ce1020c8f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java +++ b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java @@ -1377,7 +1377,7 @@ public final class MessageContentProcessor { private void handleStoryMessage(@NonNull SignalServiceContent content, @NonNull SignalServiceStoryMessage message, @NonNull Recipient senderRecipient, @NonNull Recipient threadRecipient) throws StorageFailedException { log(content.getTimestamp(), "Story message."); - if (!Stories.isFeatureAvailable()) { + if (!Stories.isFeatureFlagEnabled()) { warn(content.getTimestamp(), "Dropping unsupported story."); return; } @@ -1519,7 +1519,7 @@ public final class MessageContentProcessor { private @Nullable MessageId handleStoryReaction(@NonNull SignalServiceContent content, @NonNull SignalServiceDataMessage message, @NonNull Recipient senderRecipient) throws StorageFailedException { log(content.getTimestamp(), "Story reaction."); - if (!Stories.isFeatureAvailable()) { + if (!Stories.isFeatureFlagEnabled()) { warn(content.getTimestamp(), "Dropping unsupported story reaction."); return null; } @@ -1620,7 +1620,7 @@ public final class MessageContentProcessor { private @Nullable MessageId handleStoryReply(@NonNull SignalServiceContent content, @NonNull SignalServiceDataMessage message, @NonNull Recipient senderRecipient, long receivedTime) throws StorageFailedException { log(content.getTimestamp(), "Story reply."); - if (!Stories.isFeatureAvailable()) { + if (!Stories.isFeatureFlagEnabled()) { warn(content.getTimestamp(), "Dropping unsupported story reply."); return null; } @@ -1901,7 +1901,7 @@ public final class MessageContentProcessor { private long handleSynchronizeSentStoryReply(@NonNull SentTranscriptMessage message, long envelopeTimestamp) throws MmsException, BadGroupIdException { - if (!Stories.isFeatureAvailable()) { + if (!Stories.isFeatureFlagEnabled()) { warn(envelopeTimestamp, "Dropping unsupported story reply sync message."); return -1L; } diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/Stories.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/Stories.kt index e5dbbd406..0844b40ec 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/Stories.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/Stories.kt @@ -74,24 +74,12 @@ object Stories { return SignalStore.account().isRegistered && (FeatureFlags.stories() || LocaleFeatureFlags.isInStoriesCountry()) } - /** - * Whether or not the user has access to stories. This checks: - * - * - Registration status - * - Flag status - * - Capabilities - */ - @JvmStatic - fun isFeatureAvailable(): Boolean { - return isFeatureFlagEnabled() && Recipient.self().storiesCapability == Recipient.Capability.SUPPORTED - } - /** * Whether or not the user has the Stories feature enabled. */ @JvmStatic fun isFeatureEnabled(): Boolean { - return isFeatureAvailable() && !SignalStore.storyValues().isFeatureDisabled + return isFeatureFlagEnabled() && !SignalStore.storyValues().isFeatureDisabled } fun getHeaderAction(onClick: () -> Unit): HeaderAction {