Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 12:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid uploading onboarding story media during restore.

Browse Source
This commit is contained in:
Michelle Tang
2025-06-16 15:00:22 -04:00
parent b35b1db4bc
commit 2c752ab5ba
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt
View File

@@ -86,6 +86,7 @@ import org.thoughtcrime.securesms.jobmanager.Job
import org.thoughtcrime.securesms.jobs.AvatarGroupsV2DownloadJob import org.thoughtcrime.securesms.jobs.AvatarGroupsV2DownloadJob
import org.thoughtcrime.securesms.jobs.BackupDeleteJob import org.thoughtcrime.securesms.jobs.BackupDeleteJob
import org.thoughtcrime.securesms.jobs.CheckRestoreMediaLeftJob import org.thoughtcrime.securesms.jobs.CheckRestoreMediaLeftJob
import org.thoughtcrime.securesms.jobs.CreateReleaseChannelJob
import org.thoughtcrime.securesms.jobs.RequestGroupV2InfoJob import org.thoughtcrime.securesms.jobs.RequestGroupV2InfoJob
import org.thoughtcrime.securesms.jobs.RestoreAttachmentJob import org.thoughtcrime.securesms.jobs.RestoreAttachmentJob
import org.thoughtcrime.securesms.jobs.RestoreOptimizedMediaJob import org.thoughtcrime.securesms.jobs.RestoreOptimizedMediaJob
@@ -1082,6 +1083,8 @@ object BackupRepository {
RetrieveProfileJob.enqueue(recipientIds) RetrieveProfileJob.enqueue(recipientIds)
AppDependencies.jobManager.add(CreateReleaseChannelJob.create())
val groupJobs = SignalDatabase.groups.getGroups().use { groups -> val groupJobs = SignalDatabase.groups.getGroups().use { groups ->
val jobs = mutableListOf<Job>() val jobs = mutableListOf<Job>()
groups groups

3
app/src/main/java/org/thoughtcrime/securesms/jobs/StoryOnboardingDownloadJob.kt
View File

@@ -49,7 +49,8 @@ class StoryOnboardingDownloadJob private constructor(parameters: Parameters) : B
} }
fun enqueueIfNeeded() { fun enqueueIfNeeded() {
if (SignalStore.story.hasDownloadedOnboardingStory) { if (SignalStore.story.hasDownloadedOnboardingStory || SignalStore.story.userHasViewedOnboardingStory) {
Log.i(TAG, "Skipping because user has already viewed the onboarding story or it is already downloaded")
return return
} }

2
app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerFragment.kt
View File

@@ -135,7 +135,7 @@ class StoryViewerFragment :
} else { } else {
viewModel.refresh() viewModel.refresh()
if (!SignalStore.story.userHasSeenFirstNavView) { if (!SignalStore.story.userHasSeenFirstNavView && !SignalStore.story.userHasViewedOnboardingStory) {
StoryFirstTimeNavigationFragment().show(childFragmentManager, null) StoryFirstTimeNavigationFragment().show(childFragmentManager, null)
} }
} }