blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Schedule first backup after restore for 24hrs time.

master
Alan Evans 2019-11-11 13:00:01 -05:00 committed by GitHub
parent 778b2a0d27
commit e4fc6f41b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/thoughtcrime/securesms/registration/fragments/RestoreBackupFragment.java
View File

@ -33,6 +33,7 @@ import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.backup.BackupPassphrase;
import org.thoughtcrime.securesms.backup.FullBackupBase;
import org.thoughtcrime.securesms.backup.FullBackupImporter;
import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider;
@ -41,6 +42,7 @@ import org.thoughtcrime.securesms.database.NoExternalStorageException;
import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.notifications.NotificationChannels;
import org.thoughtcrime.securesms.permissions.Permissions;
import org.thoughtcrime.securesms.service.LocalBackupListener;
import org.thoughtcrime.securesms.util.BackupUtil;
import org.thoughtcrime.securesms.util.DateUtils;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
@ -204,8 +206,10 @@ public final class RestoreBackupFragment extends BaseRegistrationFragment {
DatabaseFactory.upgradeRestored(context, database);
NotificationChannels.restoreContactNotificationChannels(context);
LocalBackupListener.setNextBackupTimeToIntervalFromNow(context);
BackupPassphrase.set(context, passphrase);
TextSecurePreferences.setBackupEnabled(context, true);
TextSecurePreferences.setBackupPassphrase(context, passphrase);
LocalBackupListener.schedule(context);
Log.i(TAG, "Backup restore complete.");
return BackupImportResult.SUCCESS;

15
src/org/thoughtcrime/securesms/service/LocalBackupListener.java
View File

@ -4,7 +4,8 @@ package org.thoughtcrime.securesms.service;
import android.content.Context;
import android.content.Intent;
import org.thoughtcrime.securesms.ApplicationContext;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobs.LocalBackupJob;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
@ -26,10 +27,7 @@ public class LocalBackupListener extends PersistentAlarmManagerListener {
ApplicationDependencies.getJobManager().add(new LocalBackupJob());
}
long nextTime = System.currentTimeMillis() + INTERVAL;
TextSecurePreferences.setNextBackupTime(context, nextTime);
return nextTime;
return setNextBackupTimeToIntervalFromNow(context);
}
public static void schedule(Context context) {
@ -37,4 +35,11 @@ public class LocalBackupListener extends PersistentAlarmManagerListener {
new LocalBackupListener().onReceive(context, new Intent());
}
}
public static long setNextBackupTimeToIntervalFromNow(@NonNull Context context) {
long nextTime = System.currentTimeMillis() + INTERVAL;
TextSecurePreferences.setNextBackupTime(context, nextTime);
return nextTime;
}
}