Remove TextSecurePreferences.getAvatarId()

This commit is contained in:
Greyson Parrelli
2020-03-25 18:43:02 -04:00
parent 6aac3baa55
commit e6f9cb9929
15 changed files with 120 additions and 44 deletions

View File

@@ -39,7 +39,7 @@ public class ApplicationMigrations {
private static final int LEGACY_CANONICAL_VERSION = 455;
public static final int CURRENT_VERSION = 12;
public static final int CURRENT_VERSION = 13;
private static final class Version {
static final int LEGACY = 1;
@@ -54,6 +54,7 @@ public class ApplicationMigrations {
static final int SWOON_STICKERS = 10;
static final int STORAGE_SERVICE = 11;
static final int STORAGE_KEY_ROTATE = 12;
static final int REMOVE_AVATAR_ID = 13;
}
/**
@@ -215,6 +216,10 @@ public class ApplicationMigrations {
jobs.put(Version.STORAGE_KEY_ROTATE, new StorageKeyRotationMigrationJob());
}
if (lastSeenVersion < Version.REMOVE_AVATAR_ID) {
jobs.put(Version.REMOVE_AVATAR_ID, new AvatarIdRemovalMigrationJob());
}
return jobs;
}

View File

@@ -0,0 +1,59 @@
package org.thoughtcrime.securesms.migrations;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobmanager.Data;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.JobManager;
import org.thoughtcrime.securesms.jobs.MultiDeviceKeysUpdateJob;
import org.thoughtcrime.securesms.jobs.RefreshOwnProfileJob;
import org.thoughtcrime.securesms.jobs.StorageSyncJob;
import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
/**
* We just want to make sure that the user has a profile avatar set in the RecipientDatabase, so
* we're refreshing their own profile.
*/
public class AvatarIdRemovalMigrationJob extends MigrationJob {
private static final String TAG = Log.tag(AvatarIdRemovalMigrationJob.class);
public static final String KEY = "AvatarIdRemovalMigrationJob";
AvatarIdRemovalMigrationJob() {
this(new Parameters.Builder().build());
}
private AvatarIdRemovalMigrationJob(@NonNull Parameters parameters) {
super(parameters);
}
@Override
public boolean isUiBlocking() {
return false;
}
@Override
public @NonNull String getFactoryKey() {
return KEY;
}
@Override
public void performMigration() {
ApplicationDependencies.getJobManager().add(new RefreshOwnProfileJob());
}
@Override
boolean shouldRetry(@NonNull Exception e) {
return false;
}
public static class Factory implements Job.Factory<AvatarIdRemovalMigrationJob> {
@Override
public @NonNull AvatarIdRemovalMigrationJob create(@NonNull Parameters parameters, @NonNull Data data) {
return new AvatarIdRemovalMigrationJob(parameters);
}
}
}