Fix can create backups when timed backup is waiting for charging constraint.
parent
19c74c8872
commit
8de4290c5b
|
@ -41,6 +41,7 @@ public class BackupDialog {
|
||||||
CheckBox confirmationCheckBox = dialog.findViewById(R.id.confirmation_check);
|
CheckBox confirmationCheckBox = dialog.findViewById(R.id.confirmation_check);
|
||||||
if (confirmationCheckBox.isChecked()) {
|
if (confirmationCheckBox.isChecked()) {
|
||||||
BackupPassphrase.set(context, Util.join(password, " "));
|
BackupPassphrase.set(context, Util.join(password, " "));
|
||||||
|
TextSecurePreferences.setNextBackupTime(context, 0);
|
||||||
TextSecurePreferences.setBackupEnabled(context, true);
|
TextSecurePreferences.setBackupEnabled(context, true);
|
||||||
LocalBackupListener.schedule(context);
|
LocalBackupListener.schedule(context);
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package org.thoughtcrime.securesms.jobmanager;
|
package org.thoughtcrime.securesms.jobmanager;
|
||||||
|
|
||||||
import android.app.Application;
|
import android.app.Application;
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.annotation.Nullable;
|
import androidx.annotation.Nullable;
|
||||||
import androidx.annotation.WorkerThread;
|
import androidx.annotation.WorkerThread;
|
||||||
|
@ -23,7 +24,6 @@ import java.util.HashMap;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -158,9 +158,8 @@ class JobController {
|
||||||
|
|
||||||
@WorkerThread
|
@WorkerThread
|
||||||
synchronized void cancelAllInQueue(@NonNull String queue) {
|
synchronized void cancelAllInQueue(@NonNull String queue) {
|
||||||
Stream.of(runningJobs.values())
|
Stream.of(jobStorage.getJobsInQueue(queue))
|
||||||
.filter(j -> Objects.equals(j.getParameters().getQueue(), queue))
|
.map(JobSpec::getId)
|
||||||
.map(Job::getId)
|
|
||||||
.forEach(this::cancelJob);
|
.forEach(this::cancelJob);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -11,8 +11,10 @@ import org.thoughtcrime.securesms.backup.FullBackupExporter;
|
||||||
import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider;
|
import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider;
|
||||||
import org.thoughtcrime.securesms.database.DatabaseFactory;
|
import org.thoughtcrime.securesms.database.DatabaseFactory;
|
||||||
import org.thoughtcrime.securesms.database.NoExternalStorageException;
|
import org.thoughtcrime.securesms.database.NoExternalStorageException;
|
||||||
|
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
|
||||||
import org.thoughtcrime.securesms.jobmanager.Data;
|
import org.thoughtcrime.securesms.jobmanager.Data;
|
||||||
import org.thoughtcrime.securesms.jobmanager.Job;
|
import org.thoughtcrime.securesms.jobmanager.Job;
|
||||||
|
import org.thoughtcrime.securesms.jobmanager.JobManager;
|
||||||
import org.thoughtcrime.securesms.jobmanager.impl.ChargingConstraint;
|
import org.thoughtcrime.securesms.jobmanager.impl.ChargingConstraint;
|
||||||
import org.thoughtcrime.securesms.logging.Log;
|
import org.thoughtcrime.securesms.logging.Log;
|
||||||
import org.thoughtcrime.securesms.notifications.NotificationChannels;
|
import org.thoughtcrime.securesms.notifications.NotificationChannels;
|
||||||
|
@ -34,24 +36,24 @@ public final class LocalBackupJob extends BaseJob {
|
||||||
|
|
||||||
private static final String TAG = Log.tag(LocalBackupJob.class);
|
private static final String TAG = Log.tag(LocalBackupJob.class);
|
||||||
|
|
||||||
|
private static final String QUEUE = "__LOCAL_BACKUP__";
|
||||||
|
|
||||||
public static final String TEMP_BACKUP_FILE_PREFIX = ".backup";
|
public static final String TEMP_BACKUP_FILE_PREFIX = ".backup";
|
||||||
public static final String TEMP_BACKUP_FILE_SUFFIX = ".tmp";
|
public static final String TEMP_BACKUP_FILE_SUFFIX = ".tmp";
|
||||||
|
|
||||||
public LocalBackupJob(boolean forceNow) {
|
public static void enqueue(boolean force) {
|
||||||
this(buildParameters(forceNow));
|
JobManager jobManager = ApplicationDependencies.getJobManager();
|
||||||
}
|
Parameters.Builder parameters = new Parameters.Builder()
|
||||||
|
.setQueue(QUEUE)
|
||||||
private static @NonNull Job.Parameters buildParameters(boolean forceNow) {
|
.setMaxInstances(1)
|
||||||
Job.Parameters.Builder builder = new Job.Parameters.Builder()
|
.setMaxAttempts(3);
|
||||||
.setQueue("__LOCAL_BACKUP__")
|
if (force) {
|
||||||
.setMaxInstances(1)
|
jobManager.cancelAllInQueue(QUEUE);
|
||||||
.setMaxAttempts(3);
|
} else {
|
||||||
|
parameters.addConstraint(ChargingConstraint.KEY);
|
||||||
if (!forceNow) {
|
|
||||||
builder.addConstraint(ChargingConstraint.KEY);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return builder.build();
|
jobManager.add(new LocalBackupJob(parameters.build()));
|
||||||
}
|
}
|
||||||
|
|
||||||
private LocalBackupJob(@NonNull Job.Parameters parameters) {
|
private LocalBackupJob(@NonNull Job.Parameters parameters) {
|
||||||
|
|
|
@ -18,7 +18,6 @@ import org.thoughtcrime.securesms.R;
|
||||||
import org.thoughtcrime.securesms.backup.BackupDialog;
|
import org.thoughtcrime.securesms.backup.BackupDialog;
|
||||||
import org.thoughtcrime.securesms.backup.FullBackupBase.BackupEvent;
|
import org.thoughtcrime.securesms.backup.FullBackupBase.BackupEvent;
|
||||||
import org.thoughtcrime.securesms.components.SwitchPreferenceCompat;
|
import org.thoughtcrime.securesms.components.SwitchPreferenceCompat;
|
||||||
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
|
|
||||||
import org.thoughtcrime.securesms.jobs.LocalBackupJob;
|
import org.thoughtcrime.securesms.jobs.LocalBackupJob;
|
||||||
import org.thoughtcrime.securesms.logging.Log;
|
import org.thoughtcrime.securesms.logging.Log;
|
||||||
import org.thoughtcrime.securesms.permissions.Permissions;
|
import org.thoughtcrime.securesms.permissions.Permissions;
|
||||||
|
@ -152,8 +151,8 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment {
|
||||||
.request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
|
.request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
|
||||||
.ifNecessary()
|
.ifNecessary()
|
||||||
.onAllGranted(() -> {
|
.onAllGranted(() -> {
|
||||||
Log.i(TAG, "Queing backup...");
|
Log.i(TAG, "Starting backup from user");
|
||||||
ApplicationDependencies.getJobManager().add(new LocalBackupJob(true));
|
LocalBackupJob.enqueue(true);
|
||||||
})
|
})
|
||||||
.withPermanentDenialDialog(getString(R.string.ChatsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups))
|
.withPermanentDenialDialog(getString(R.string.ChatsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups))
|
||||||
.execute();
|
.execute();
|
||||||
|
|
|
@ -6,7 +6,6 @@ import android.content.Intent;
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
|
|
||||||
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
|
|
||||||
import org.thoughtcrime.securesms.jobs.LocalBackupJob;
|
import org.thoughtcrime.securesms.jobs.LocalBackupJob;
|
||||||
import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
||||||
|
|
||||||
|
@ -24,7 +23,7 @@ public class LocalBackupListener extends PersistentAlarmManagerListener {
|
||||||
@Override
|
@Override
|
||||||
protected long onAlarm(Context context, long scheduledTime) {
|
protected long onAlarm(Context context, long scheduledTime) {
|
||||||
if (TextSecurePreferences.isBackupEnabled(context)) {
|
if (TextSecurePreferences.isBackupEnabled(context)) {
|
||||||
ApplicationDependencies.getJobManager().add(new LocalBackupJob(false));
|
LocalBackupJob.enqueue(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
return setNextBackupTimeToIntervalFromNow(context);
|
return setNextBackupTimeToIntervalFromNow(context);
|
||||||
|
|
Loading…
Reference in New Issue