diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java index ea9283ce8a..c0672f8e90 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java @@ -76,7 +76,6 @@ import org.thoughtcrime.securesms.migrations.StickerMyDailyLifeMigrationJob; import org.thoughtcrime.securesms.migrations.StorageCapabilityMigrationJob; import org.thoughtcrime.securesms.migrations.StorageServiceMigrationJob; import org.thoughtcrime.securesms.migrations.StorageServiceSystemNameMigrationJob; -import org.thoughtcrime.securesms.migrations.StoryReadStateMigrationJob; import org.thoughtcrime.securesms.migrations.StoryViewedReceiptsStateMigrationJob; import org.thoughtcrime.securesms.migrations.Svr2MirrorMigrationJob; import org.thoughtcrime.securesms.migrations.SyncDistributionListsMigrationJob; @@ -262,7 +261,6 @@ public final class JobManagerFactories { put(StorageCapabilityMigrationJob.KEY, new StorageCapabilityMigrationJob.Factory()); put(StorageServiceMigrationJob.KEY, new StorageServiceMigrationJob.Factory()); put(StorageServiceSystemNameMigrationJob.KEY, new StorageServiceSystemNameMigrationJob.Factory()); - put(StoryReadStateMigrationJob.KEY, new StoryReadStateMigrationJob.Factory()); put(StoryViewedReceiptsStateMigrationJob.KEY, new StoryViewedReceiptsStateMigrationJob.Factory()); put(Svr2MirrorMigrationJob.KEY, new Svr2MirrorMigrationJob.Factory()); put(SyncDistributionListsMigrationJob.KEY, new SyncDistributionListsMigrationJob.Factory()); @@ -306,6 +304,7 @@ public final class JobManagerFactories { put("MmsReceiveJob", new FailingJob.Factory()); put("MmsDownloadJob", new FailingJob.Factory()); put("SmsReceiveJob", new FailingJob.Factory()); + put("StoryReadStateMigrationJob", new PassingMigrationJob.Factory()); }}; } diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/StoryValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/StoryValues.kt index 3c920e9d3d..626b297723 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/StoryValues.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/StoryValues.kt @@ -40,11 +40,6 @@ internal class StoryValues(store: KeyValueStore) : SignalStoreValues(store) { */ private const val USER_HAS_VIEWED_ONBOARDING_STORY = "stories.user.has.seen.onboarding" - /** - * Marks whether the user has seen the onboarding story in the stories landing page - */ - private const val USER_HAS_READ_ONBOARDING_STORY = "stories.user.has.read.onboarding" - /** * Whether or not the user will send and receive viewed receipts for stories */ @@ -66,7 +61,6 @@ internal class StoryValues(store: KeyValueStore) : SignalStoreValues(store) { USER_HAS_SEEN_FIRST_NAV_VIEW, HAS_DOWNLOADED_ONBOARDING_STORY, USER_HAS_VIEWED_ONBOARDING_STORY, - USER_HAS_READ_ONBOARDING_STORY, STORY_VIEWED_RECEIPTS, USER_HAS_SEEN_GROUP_STORY_EDUCATION_SHEET ) @@ -83,8 +77,6 @@ internal class StoryValues(store: KeyValueStore) : SignalStoreValues(store) { var userHasViewedOnboardingStory: Boolean by booleanValue(USER_HAS_VIEWED_ONBOARDING_STORY, false) - var userHasReadOnboardingStory: Boolean by booleanValue(USER_HAS_READ_ONBOARDING_STORY, false) - var viewedReceiptsEnabled: Boolean by booleanValue(STORY_VIEWED_RECEIPTS, false) var userHasSeenGroupStoryEducationSheet: Boolean by booleanValue(USER_HAS_SEEN_GROUP_STORY_EDUCATION_SHEET, false) @@ -93,10 +85,6 @@ internal class StoryValues(store: KeyValueStore) : SignalStoreValues(store) { return store.containsKey(STORY_VIEWED_RECEIPTS) } - fun hasUserOnboardingStoryReadBeenSet(): Boolean { - return store.containsKey(USER_HAS_READ_ONBOARDING_STORY) - } - fun setLatestStorySend(storySend: StorySend) { synchronized(this) { val storySends: List = getList(LATEST_STORY_SENDS, StorySendSerializer) diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java index 38883cc34e..0490652dcf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java +++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java @@ -110,7 +110,7 @@ public class ApplicationMigrations { static final int PNI_2 = 66; static final int SYSTEM_NAME_SYNC = 67; static final int STORY_VIEWED_STATE = 68; - static final int STORY_READ_STATE = 69; +// static final int STORY_READ_STATE = 69; static final int THREAD_MESSAGE_SCHEMA_CHANGE = 70; static final int SMS_MMS_MERGE = 71; static final int REBUILD_MESSAGE_FTS_INDEX = 72; @@ -517,9 +517,9 @@ public class ApplicationMigrations { jobs.put(Version.STORY_VIEWED_STATE, new StoryViewedReceiptsStateMigrationJob()); } - if (lastSeenVersion < Version.STORY_READ_STATE) { - jobs.put(Version.STORY_READ_STATE, new StoryReadStateMigrationJob()); - } +// if (lastSeenVersion < Version.STORY_READ_STATE) { +// jobs.put(Version.STORY_READ_STATE, new StoryReadStateMigrationJob()); +// } if (lastSeenVersion < Version.THREAD_MESSAGE_SCHEMA_CHANGE) { jobs.put(Version.THREAD_MESSAGE_SCHEMA_CHANGE, new DatabaseMigrationJob()); diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/StoryReadStateMigrationJob.kt b/app/src/main/java/org/thoughtcrime/securesms/migrations/StoryReadStateMigrationJob.kt deleted file mode 100644 index 85affff548..0000000000 --- a/app/src/main/java/org/thoughtcrime/securesms/migrations/StoryReadStateMigrationJob.kt +++ /dev/null @@ -1,44 +0,0 @@ -package org.thoughtcrime.securesms.migrations - -import org.thoughtcrime.securesms.database.SignalDatabase -import org.thoughtcrime.securesms.database.SignalDatabase.Companion.recipients -import org.thoughtcrime.securesms.jobmanager.Job -import org.thoughtcrime.securesms.keyvalue.SignalStore -import org.thoughtcrime.securesms.recipients.Recipient -import org.thoughtcrime.securesms.storage.StorageSyncHelper - -/** - * Added to initialize whether the user has seen the onboarding story - */ -internal class StoryReadStateMigrationJob( - parameters: Parameters = Parameters.Builder().build() -) : MigrationJob(parameters) { - - companion object { - const val KEY = "StoryReadStateMigrationJob" - } - - override fun getFactoryKey(): String = KEY - - override fun isUiBlocking(): Boolean = false - - override fun performMigration() { - if (!SignalStore.storyValues().hasUserOnboardingStoryReadBeenSet()) { - SignalStore.storyValues().userHasReadOnboardingStory = SignalStore.storyValues().userHasReadOnboardingStory - SignalDatabase.messages.markOnboardingStoryRead() - - if (SignalStore.account().isRegistered) { - recipients.markNeedsSync(Recipient.self().id) - StorageSyncHelper.scheduleSyncForDataChange() - } - } - } - - override fun shouldRetry(e: Exception): Boolean = false - - class Factory : Job.Factory { - override fun create(parameters: Parameters, serializedData: ByteArray?): StoryReadStateMigrationJob { - return StoryReadStateMigrationJob(parameters) - } - } -} diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/AccountRecordProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/storage/AccountRecordProcessor.java index 815e5ef319..2ec2fce0b1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/storage/AccountRecordProcessor.java +++ b/app/src/main/java/org/thoughtcrime/securesms/storage/AccountRecordProcessor.java @@ -124,12 +124,11 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor