mirror of
https://github.com/oxen-io/session-android.git
synced 2025-06-08 16:48:34 +00:00
Add an application migration to do a CDS refresh.
This commit is contained in:
parent
84ec6dd458
commit
089656e5c4
@ -30,6 +30,7 @@ import org.thoughtcrime.securesms.migrations.AvatarIdRemovalMigrationJob;
|
|||||||
import org.thoughtcrime.securesms.migrations.AvatarMigrationJob;
|
import org.thoughtcrime.securesms.migrations.AvatarMigrationJob;
|
||||||
import org.thoughtcrime.securesms.migrations.CachedAttachmentsMigrationJob;
|
import org.thoughtcrime.securesms.migrations.CachedAttachmentsMigrationJob;
|
||||||
import org.thoughtcrime.securesms.migrations.DatabaseMigrationJob;
|
import org.thoughtcrime.securesms.migrations.DatabaseMigrationJob;
|
||||||
|
import org.thoughtcrime.securesms.migrations.DirectoryRefreshMigrationJob;
|
||||||
import org.thoughtcrime.securesms.migrations.KbsEnclaveMigrationJob;
|
import org.thoughtcrime.securesms.migrations.KbsEnclaveMigrationJob;
|
||||||
import org.thoughtcrime.securesms.migrations.LegacyMigrationJob;
|
import org.thoughtcrime.securesms.migrations.LegacyMigrationJob;
|
||||||
import org.thoughtcrime.securesms.migrations.MigrationCompleteJob;
|
import org.thoughtcrime.securesms.migrations.MigrationCompleteJob;
|
||||||
@ -135,6 +136,7 @@ public final class JobManagerFactories {
|
|||||||
put(AvatarMigrationJob.KEY, new AvatarMigrationJob.Factory());
|
put(AvatarMigrationJob.KEY, new AvatarMigrationJob.Factory());
|
||||||
put(CachedAttachmentsMigrationJob.KEY, new CachedAttachmentsMigrationJob.Factory());
|
put(CachedAttachmentsMigrationJob.KEY, new CachedAttachmentsMigrationJob.Factory());
|
||||||
put(DatabaseMigrationJob.KEY, new DatabaseMigrationJob.Factory());
|
put(DatabaseMigrationJob.KEY, new DatabaseMigrationJob.Factory());
|
||||||
|
put(DirectoryRefreshMigrationJob.KEY, new DirectoryRefreshMigrationJob.Factory());
|
||||||
put(KbsEnclaveMigrationJob.KEY, new KbsEnclaveMigrationJob.Factory());
|
put(KbsEnclaveMigrationJob.KEY, new KbsEnclaveMigrationJob.Factory());
|
||||||
put(LegacyMigrationJob.KEY, new LegacyMigrationJob.Factory());
|
put(LegacyMigrationJob.KEY, new LegacyMigrationJob.Factory());
|
||||||
put(MigrationCompleteJob.KEY, new MigrationCompleteJob.Factory());
|
put(MigrationCompleteJob.KEY, new MigrationCompleteJob.Factory());
|
||||||
|
@ -39,7 +39,7 @@ public class ApplicationMigrations {
|
|||||||
|
|
||||||
private static final int LEGACY_CANONICAL_VERSION = 455;
|
private static final int LEGACY_CANONICAL_VERSION = 455;
|
||||||
|
|
||||||
public static final int CURRENT_VERSION = 21;
|
public static final int CURRENT_VERSION = 22;
|
||||||
|
|
||||||
private static final class Version {
|
private static final class Version {
|
||||||
static final int LEGACY = 1;
|
static final int LEGACY = 1;
|
||||||
@ -63,6 +63,7 @@ public class ApplicationMigrations {
|
|||||||
static final int THUMBNAIL_CLEANUP = 19;
|
static final int THUMBNAIL_CLEANUP = 19;
|
||||||
static final int GV2 = 20;
|
static final int GV2 = 20;
|
||||||
static final int GV2_2 = 21;
|
static final int GV2_2 = 21;
|
||||||
|
static final int CDS = 22;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -262,6 +263,10 @@ public class ApplicationMigrations {
|
|||||||
jobs.put(Version.GV2_2, new AttributesMigrationJob());
|
jobs.put(Version.GV2_2, new AttributesMigrationJob());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (lastSeenVersion < Version.CDS) {
|
||||||
|
jobs.put(Version.CDS, new DirectoryRefreshMigrationJob());
|
||||||
|
}
|
||||||
|
|
||||||
return jobs;
|
return jobs;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -0,0 +1,68 @@
|
|||||||
|
package org.thoughtcrime.securesms.migrations;
|
||||||
|
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
|
||||||
|
import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
|
||||||
|
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
|
||||||
|
import org.thoughtcrime.securesms.jobmanager.Data;
|
||||||
|
import org.thoughtcrime.securesms.jobmanager.Job;
|
||||||
|
import org.thoughtcrime.securesms.jobs.RefreshAttributesJob;
|
||||||
|
import org.thoughtcrime.securesms.jobs.RefreshOwnProfileJob;
|
||||||
|
import org.thoughtcrime.securesms.keyvalue.SignalStore;
|
||||||
|
import org.thoughtcrime.securesms.logging.Log;
|
||||||
|
import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Does a full directory refresh.
|
||||||
|
*/
|
||||||
|
public final class DirectoryRefreshMigrationJob extends MigrationJob {
|
||||||
|
|
||||||
|
private static final String TAG = Log.tag(DirectoryRefreshMigrationJob.class);
|
||||||
|
|
||||||
|
public static final String KEY = "DirectoryRefreshMigrationJob";
|
||||||
|
|
||||||
|
DirectoryRefreshMigrationJob() {
|
||||||
|
this(new Parameters.Builder().build());
|
||||||
|
}
|
||||||
|
|
||||||
|
private DirectoryRefreshMigrationJob(@NonNull Parameters parameters) {
|
||||||
|
super(parameters);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isUiBlocking() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public @NonNull String getFactoryKey() {
|
||||||
|
return KEY;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void performMigration() throws IOException {
|
||||||
|
if (!TextSecurePreferences.isPushRegistered(context) ||
|
||||||
|
!SignalStore.registrationValues().isRegistrationComplete() ||
|
||||||
|
TextSecurePreferences.getLocalUuid(context) == null)
|
||||||
|
{
|
||||||
|
Log.w(TAG, "Not registered! Skipping.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
DirectoryHelper.refreshDirectory(context, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
boolean shouldRetry(@NonNull Exception e) {
|
||||||
|
return e instanceof IOException;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class Factory implements Job.Factory<DirectoryRefreshMigrationJob> {
|
||||||
|
@Override
|
||||||
|
public @NonNull DirectoryRefreshMigrationJob create(@NonNull Parameters parameters, @NonNull Data data) {
|
||||||
|
return new DirectoryRefreshMigrationJob(parameters);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user