Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd1f4c6a authored by Samuel Fufa's avatar Samuel Fufa
Browse files

Allow multiple hotseat restorations in single session

restoreBackup uses mBackupRestored to prevent multiple restorations happening at once. This change is required to reset the value of mBackupRestored if a new backup is created.

Bug: 160033826
Test: Manual
Change-Id: I33836b26cf3876955cc14dcc8ec06202f3fe7fac
parent a8c08584
Loading
Loading
Loading
Loading
+0 −3
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import com.android.launcher3.provider.LauncherDbUtils;
 */
public class HotseatRestoreHelper {
    private final Launcher mLauncher;
    private boolean mBackupRestored = false;

    HotseatRestoreHelper(Launcher context) {
        mLauncher = context;
@@ -62,7 +61,6 @@ public class HotseatRestoreHelper {
     * Finds and restores a previously saved snapshow of Favorites table
     */
    public void restoreBackup() {
        if (mBackupRestored) return;
        MODEL_EXECUTOR.execute(() -> {
            try (LauncherDbUtils.SQLiteTransaction transaction = (LauncherDbUtils.SQLiteTransaction)
                    LauncherSettings.Settings.call(
@@ -78,7 +76,6 @@ public class HotseatRestoreHelper {
                        idp.numRows);
                backupTable.restoreFromCustomBackupTable(HYBRID_HOTSEAT_BACKUP_TABLE, true);
                transaction.commit();
                mBackupRestored = true;
                mLauncher.getModel().forceReload();
            }
        });