TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 19:38:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Persist the JobFactory key after job migrations.

Browse Source
This commit is contained in:
Greyson Parrelli 2019-09-27 14:18:15 -04:00
parent 5805539deb
commit b03eccec33
5 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/jobmanager/JobManager.java
View File

@ -33,7 +33,7 @@ public class JobManager implements ConstraintObserver.Notifier {
private static final String TAG = JobManager.class.getSimpleName(); private static final String TAG = JobManager.class.getSimpleName();
public static final int CURRENT_VERSION = 3; public static final int CURRENT_VERSION = 4;
private final Application application; private final Application application;
private final Configuration configuration; private final Configuration configuration;

2
src/org/thoughtcrime/securesms/jobmanager/JobMigrator.java
View File

@ -65,7 +65,7 @@ public class JobMigrator {
JobData originalJobData = new JobData(jobSpec.getFactoryKey(), jobSpec.getQueueKey(), data); JobData originalJobData = new JobData(jobSpec.getFactoryKey(), jobSpec.getQueueKey(), data);
JobData updatedJobData = migration.migrate(originalJobData); JobData updatedJobData = migration.migrate(originalJobData);
JobSpec updatedJobSpec = new JobSpec(jobSpec.getId(), JobSpec updatedJobSpec = new JobSpec(jobSpec.getId(),
jobSpec.getFactoryKey(), updatedJobData.getFactoryKey(),
updatedJobData.getQueueKey(), updatedJobData.getQueueKey(),
jobSpec.getCreateTime(), jobSpec.getCreateTime(),
jobSpec.getNextRunAttemptTime(), jobSpec.getNextRunAttemptTime(),

6
src/org/thoughtcrime/securesms/jobmanager/migrations/RecipientIdFollowUpJobMigration.java
View File

@ -13,7 +13,11 @@ import org.thoughtcrime.securesms.jobmanager.JobMigration;
public class RecipientIdFollowUpJobMigration extends JobMigration { public class RecipientIdFollowUpJobMigration extends JobMigration {
public RecipientIdFollowUpJobMigration() { public RecipientIdFollowUpJobMigration() {
super(3); this(3);
}
RecipientIdFollowUpJobMigration(int endVersion) {
super(endVersion);
} }
@Override @Override

11
src/org/thoughtcrime/securesms/jobmanager/migrations/RecipientIdFollowUpJobMigration2.java Normal file
View File

@ -0,0 +1,11 @@
package org.thoughtcrime.securesms.jobmanager.migrations;
/**
* Unfortunately there was a bug in {@link RecipientIdFollowUpJobMigration} that requires it to be
* run again.
*/
public class RecipientIdFollowUpJobMigration2 extends RecipientIdFollowUpJobMigration {
public RecipientIdFollowUpJobMigration2() {
super(4);
}
}

4
src/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
View File

@ -15,6 +15,7 @@ import org.thoughtcrime.securesms.jobmanager.impl.NetworkOrCellServiceConstraint
import org.thoughtcrime.securesms.jobmanager.impl.SqlCipherMigrationConstraint; import org.thoughtcrime.securesms.jobmanager.impl.SqlCipherMigrationConstraint;
import org.thoughtcrime.securesms.jobmanager.impl.SqlCipherMigrationConstraintObserver; import org.thoughtcrime.securesms.jobmanager.impl.SqlCipherMigrationConstraintObserver;
import org.thoughtcrime.securesms.jobmanager.migrations.RecipientIdFollowUpJobMigration; import org.thoughtcrime.securesms.jobmanager.migrations.RecipientIdFollowUpJobMigration;
import org.thoughtcrime.securesms.jobmanager.migrations.RecipientIdFollowUpJobMigration2;
import org.thoughtcrime.securesms.jobmanager.migrations.RecipientIdJobMigration; import org.thoughtcrime.securesms.jobmanager.migrations.RecipientIdJobMigration;
import org.thoughtcrime.securesms.migrations.DatabaseMigrationJob; import org.thoughtcrime.securesms.migrations.DatabaseMigrationJob;
import org.thoughtcrime.securesms.migrations.LegacyMigrationJob; import org.thoughtcrime.securesms.migrations.LegacyMigrationJob;
@ -110,6 +111,7 @@ public final class JobManagerFactories {
public static List<JobMigration> getJobMigrations(@NonNull Application application) { public static List<JobMigration> getJobMigrations(@NonNull Application application) {
return Arrays.asList(new RecipientIdJobMigration(application), return Arrays.asList(new RecipientIdJobMigration(application),
new RecipientIdFollowUpJobMigration()); new RecipientIdFollowUpJobMigration(),
new RecipientIdFollowUpJobMigration2());
} }
} }