kopia lustrzana https://github.com/ryukoposting/Signal-Android
Inline group migration job feature flag.
rodzic
69884935f3
commit
cb0e10c7ab
|
@ -61,11 +61,6 @@ public class GroupV1MigrationJob extends BaseJob {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void enqueuePossibleAutoMigrate(@NonNull RecipientId recipientId) {
|
public static void enqueuePossibleAutoMigrate(@NonNull RecipientId recipientId) {
|
||||||
if (!FeatureFlags.groupsV1MigrationJob()) {
|
|
||||||
Log.w(TAG, "Migration job is disabled.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
SignalExecutors.BOUNDED.execute(() -> {
|
SignalExecutors.BOUNDED.execute(() -> {
|
||||||
if (Recipient.resolved(recipientId).isPushV1Group()) {
|
if (Recipient.resolved(recipientId).isPushV1Group()) {
|
||||||
ApplicationDependencies.getJobManager().add(new GroupV1MigrationJob(recipientId));
|
ApplicationDependencies.getJobManager().add(new GroupV1MigrationJob(recipientId));
|
||||||
|
@ -74,11 +69,6 @@ public class GroupV1MigrationJob extends BaseJob {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void enqueueRoutineMigrationsIfNecessary(@NonNull Application application) {
|
public static void enqueueRoutineMigrationsIfNecessary(@NonNull Application application) {
|
||||||
if (!FeatureFlags.groupsV1MigrationJob()) {
|
|
||||||
Log.w(TAG, "Migration job is disabled.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!SignalStore.registrationValues().isRegistrationComplete() ||
|
if (!SignalStore.registrationValues().isRegistrationComplete() ||
|
||||||
!TextSecurePreferences.isPushRegistered(application) ||
|
!TextSecurePreferences.isPushRegistered(application) ||
|
||||||
TextSecurePreferences.getLocalUuid(application) == null)
|
TextSecurePreferences.getLocalUuid(application) == null)
|
||||||
|
|
|
@ -64,7 +64,6 @@ public final class FeatureFlags {
|
||||||
private static final String VIEWED_RECEIPTS = "android.viewed.receipts";
|
private static final String VIEWED_RECEIPTS = "android.viewed.receipts";
|
||||||
private static final String GROUP_CALLING = "android.groupsv2.calling.2";
|
private static final String GROUP_CALLING = "android.groupsv2.calling.2";
|
||||||
private static final String GV1_FORCED_MIGRATE = "android.groupsV1Migration.forced";
|
private static final String GV1_FORCED_MIGRATE = "android.groupsV1Migration.forced";
|
||||||
private static final String GV1_MIGRATION_JOB = "android.groupsV1Migration.job";
|
|
||||||
private static final String SEND_VIEWED_RECEIPTS = "android.sendViewedReceipts";
|
private static final String SEND_VIEWED_RECEIPTS = "android.sendViewedReceipts";
|
||||||
private static final String CUSTOM_VIDEO_MUXER = "android.customVideoMuxer";
|
private static final String CUSTOM_VIDEO_MUXER = "android.customVideoMuxer";
|
||||||
private static final String CDS_REFRESH_INTERVAL = "cds.syncInterval.seconds";
|
private static final String CDS_REFRESH_INTERVAL = "cds.syncInterval.seconds";
|
||||||
|
@ -93,7 +92,6 @@ public final class FeatureFlags {
|
||||||
RESEARCH_MEGAPHONE_1,
|
RESEARCH_MEGAPHONE_1,
|
||||||
DONATE_MEGAPHONE,
|
DONATE_MEGAPHONE,
|
||||||
VIEWED_RECEIPTS,
|
VIEWED_RECEIPTS,
|
||||||
GV1_MIGRATION_JOB,
|
|
||||||
GV1_FORCED_MIGRATE,
|
GV1_FORCED_MIGRATE,
|
||||||
GROUP_CALLING,
|
GROUP_CALLING,
|
||||||
SEND_VIEWED_RECEIPTS,
|
SEND_VIEWED_RECEIPTS,
|
||||||
|
@ -139,7 +137,6 @@ public final class FeatureFlags {
|
||||||
VERIFY_V2,
|
VERIFY_V2,
|
||||||
CLIENT_EXPIRATION,
|
CLIENT_EXPIRATION,
|
||||||
GROUP_CALLING,
|
GROUP_CALLING,
|
||||||
GV1_MIGRATION_JOB,
|
|
||||||
CUSTOM_VIDEO_MUXER,
|
CUSTOM_VIDEO_MUXER,
|
||||||
CDS_REFRESH_INTERVAL,
|
CDS_REFRESH_INTERVAL,
|
||||||
GROUP_NAME_MAX_LENGTH,
|
GROUP_NAME_MAX_LENGTH,
|
||||||
|
@ -278,11 +275,6 @@ public final class FeatureFlags {
|
||||||
return Build.VERSION.SDK_INT > 19 && getBoolean(GROUP_CALLING, false);
|
return Build.VERSION.SDK_INT > 19 && getBoolean(GROUP_CALLING, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Whether or not we should run the job to proactively migrate groups. */
|
|
||||||
public static boolean groupsV1MigrationJob() {
|
|
||||||
return getBoolean(GV1_MIGRATION_JOB, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Whether or not forced migration from GV1->GV2 is enabled. */
|
/** Whether or not forced migration from GV1->GV2 is enabled. */
|
||||||
public static boolean groupsV1ForcedMigration() {
|
public static boolean groupsV1ForcedMigration() {
|
||||||
return getBoolean(GV1_FORCED_MIGRATE, false);
|
return getBoolean(GV1_FORCED_MIGRATE, false);
|
||||||
|
|
Ładowanie…
Reference in New Issue