1 files changed, 5 insertions, 10 deletions
diff --git a/src/com/android/deskclock/DeskClockBackupAgent.java b/src/com/android/deskclock/DeskClockBackupAgent.java
index 6948f663e..791cb05a9 100644
--- a/src/com/android/deskclock/DeskClockBackupAgent.java
+++ b/src/com/android/deskclock/DeskClockBackupAgent.java
@@ -24,7 +24,6 @@ import android.app.backup.BackupDataOutput;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.ParcelFileDescriptor;
 import android.os.SystemClock;
 import android.support.annotation.NonNull;
@@ -43,8 +42,6 @@ public class DeskClockBackupAgent extends BackupAgent {
 
     private static final LogUtils.Logger LOGGER = new LogUtils.Logger("DeskClockBackupAgent");
 
-    private static final String KEY_RESTORE_FINISHED = "restore_finished";
-
     public static final String ACTION_COMPLETE_RESTORE =
             "com.android.deskclock.action.COMPLETE_RESTORE";
 
@@ -87,9 +84,8 @@ public class DeskClockBackupAgent extends BackupAgent {
             // the device-encrypted storage area
         }
 
-        // Write a preference to indicate a data restore has been completed.
-        final SharedPreferences prefs = DataModel.getSharedPreferences();
-        prefs.edit().putBoolean(KEY_RESTORE_FINISHED, true).apply();
+        // Indicate a data restore has been completed.
+        DataModel.getDataModel().setRestoreBackupFinished(true);
 
         // Create an Intent to send into DeskClock indicating restore is complete.
         final PendingIntent restoreIntent = PendingIntent.getBroadcast(this, 0,
@@ -111,9 +107,8 @@ public class DeskClockBackupAgent extends BackupAgent {
      * @return {@code true} if restore data was processed; {@code false} otherwise.
      */
     public static boolean processRestoredData(Context context) {
-        // If the preference indicates data was not recently restored, there is nothing to do.
-        final SharedPreferences prefs = DataModel.getSharedPreferences();
-        if (!prefs.getBoolean(KEY_RESTORE_FINISHED, false)) {
+        // If data was not recently restored, there is nothing to do.
+        if (!DataModel.getDataModel().isRestoreBackupFinished()) {
             return false;
         }
 
@@ -143,7 +138,7 @@ public class DeskClockBackupAgent extends BackupAgent {
         }
 
         // Remove the preference to avoid executing this logic multiple times.
-        prefs.edit().remove(KEY_RESTORE_FINISHED).apply();
+        DataModel.getDataModel().setRestoreBackupFinished(false);
 
         LOGGER.i("processRestoredData() completed");
         return true;