From 6088f26f5305976e0ba54066837b9f22ef23cf76 Mon Sep 17 00:00:00 2001
From: Gabriele M <moto.falcon.git@gmail.com>
Date: Thu, 30 Nov 2017 23:40:59 +0100
Subject: [PATCH] Wait for the UPDATED_NEED_REBOOT status

Consider an update as installed only when update engine reports that
the device needs to be rebooted. This change also move the entire
logic in onStatusUpdate(), which reports all we need to properly
track the progress of the installation.

Change-Id: Ic8db00cccdd19fd62ba4dee31fd1dccc9037193d
---
 .../updater/controller/ABUpdateInstaller.java | 43 ++++++++-----------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/src/org/lineageos/updater/controller/ABUpdateInstaller.java b/src/org/lineageos/updater/controller/ABUpdateInstaller.java
index 16320b93..c8a632fa 100644
--- a/src/org/lineageos/updater/controller/ABUpdateInstaller.java
+++ b/src/org/lineageos/updater/controller/ABUpdateInstaller.java
@@ -16,6 +16,7 @@
 package org.lineageos.updater.controller;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.os.UpdateEngine;
 import android.os.UpdateEngineCallback;
 import android.support.v7.preference.PreferenceManager;
@@ -47,7 +48,6 @@ class ABUpdateInstaller {
     private final Context mContext;
 
     private final UpdateEngineCallback mUpdateEngineCallback = new UpdateEngineCallback() {
-
         @Override
         public void onStatusUpdate(int status, float percent) {
             switch (status) {
@@ -60,41 +60,34 @@ class ABUpdateInstaller {
                 break;
 
                 case UpdateEngine.UpdateStatusConstants.REPORTING_ERROR_EVENT: {
+                    sDownloadId = null;
                     Update update = mUpdaterController.getActualUpdate(mDownloadId);
                     update.setInstallProgress(0);
                     update.setStatus(UpdateStatus.INSTALLATION_FAILED);
                     mUpdaterController.notifyUpdateChange(mDownloadId);
                 }
                 break;
+
+                case UpdateEngine.UpdateStatusConstants.UPDATED_NEED_REBOOT: {
+                    sDownloadId = null;
+                    Update update = mUpdaterController.getActualUpdate(mDownloadId);
+                    update.setInstallProgress(0);
+                    update.setStatus(UpdateStatus.INSTALLED);
+                    mUpdaterController.notifyUpdateChange(mDownloadId);
+                    SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(
+                            mContext);
+                    boolean deleteUpdate = pref.getBoolean(Constants.PREF_AUTO_UPDATES_CHECK,
+                            false);
+                    if (deleteUpdate) {
+                        mUpdaterController.deleteUpdate(mDownloadId);
+                    }
+                }
+                break;
             }
         }
 
         @Override
         public void onPayloadApplicationComplete(int errorCode) {
-            sDownloadId = null;
-            switch (errorCode) {
-                case UpdateEngine.ErrorCodeConstants.SUCCESS: {
-                    Update update = mUpdaterController.getActualUpdate(mDownloadId);
-                    update.setInstallProgress(0);
-                    update.setStatus(UpdateStatus.INSTALLED);
-                    mUpdaterController.notifyUpdateChange(mDownloadId);
-                }
-                break;
-
-                default: {
-                    Update update = mUpdaterController.getActualUpdate(mDownloadId);
-                    update.setInstallProgress(0);
-                    update.setStatus(UpdateStatus.INSTALLATION_FAILED);
-                    mUpdaterController.notifyUpdateChange(mDownloadId);
-                }
-                break;
-            }
-
-            boolean deleteUpdate = PreferenceManager.getDefaultSharedPreferences(mContext)
-                    .getBoolean(Constants.PREF_AUTO_UPDATES_CHECK, false);
-            if (deleteUpdate) {
-                mUpdaterController.deleteUpdate(mDownloadId);
-            }
         }
     };