Merge lp:~humpolec-team/humpolec/UbuntuInstaller_lp1262034 into lp:humpolec

[Yuan-Chen Cheng]

1. Rename ServiceState to InstallerState in UbuntuInstallService.
2. Use InstallerState, mAvailableChannels.size() equals to zero or not
        and mDownloadedVersion to decide what to show on UI.
3. move some preference related function to UbuntuInstallService.
4. call requestServiceState() in onResume() of InstallActivity and
        update related code.

quick tested on n4. go back to andorid launcher as downloading image
and re-enter this app, the UI can goes back to downloading status
correctly.

[Rex Tsai (chihchun)]

LGTM, +1

review: Approve

[Ondrej Kubik (ondrak)]

Looks good
small comment for
 public static InstallerState fromOrdian(int ordian)
this can be done this way
 public static InstallerState fromOrdian(int ordian) {
    return InstallerState.values()[ordinal];
 }

[lp:~humpolec-team/humpolec/UbuntuInstaller_lp1262034]

21. By Yuan-Chen Cheng on 2013-12-18

cleaner way for doing fromOrdian for java enum

=== modified file 'src/com/canonical/ubuntu/installer/InstallActivity.java'
--- src/com/canonical/ubuntu/installer/InstallActivity.java	2013-12-16 13:16:32 +0000
+++ src/com/canonical/ubuntu/installer/InstallActivity.java	2013-12-18 11:59:13 +0000
@@ -7,6 +7,7 @@
 import com.canonical.ubuntu.installer.TextPickerDialog;
 import com.canonical.ubuntu.installer.UbuntuInstallService;
 import com.canonical.ubuntu.installer.JsonChannelParser.Image;
+import com.canonical.ubuntu.installer.UbuntuInstallService.InstallerState;
 import com.canonical.ubuntu.installer.VersionInfo.ReleaseType;
 import com.canonical.ubuntu.widget.UbuntuButton;
 
@@ -31,17 +32,16 @@
 public class InstallActivity extends Activity {
     private static final String TAG = "UbuntuInstaller";
 
-    private enum ActivityStatus {
-        NORMAL, FETCHING_CHANNELS, NO_CHANNELS, READY_TO_DOWNLOAD, DOWNLOADING, READY_TO_INSTALL, INSTALLING
-    };
-    
     private UbuntuButton mInstallButton;    
-    private ActivityStatus mStatus = ActivityStatus.NORMAL;
+
+    private InstallerState mStatus = InstallerState.READY;
+    private VersionInfo mDownloadedVersion = null;
+    
     private ProgressBar mProgressBar;
     private TextView mProgressText;
     
     private TextView mTerminal;
-    private HashMap<String, String> mAvailableChannels;
+    private HashMap<String, String> mAvailableChannels = new HashMap<String, String>();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -56,12 +56,10 @@
         mProgressText = (TextView) findViewById(R.id.status);     
         mTerminal = (TextView) findViewById(R.id.terminal);
         mTerminal.setMovementMethod(new ScrollingMovementMethod());
-        requestChannelList();
-        mStatus = ActivityStatus.FETCHING_CHANNELS;
         mProgressBar.setEnabled(false);
         mProgressBar.setProgress(0);
-        
-        SharedPreferences pref = getSharedPreferences( UbuntuInstallService.SHARED_PREF, Context.MODE_PRIVATE);
+
+        SharedPreferences pref = getSharedPreferences(UbuntuInstallService.SHARED_PREF, Context.MODE_PRIVATE);
         pref.edit().putBoolean(UbuntuInstallService.PREF_KEY_DEVELOPER, true).commit();
     }
     
@@ -81,15 +79,18 @@
         filter.addAction(UbuntuInstallService.VERSION_UPDATE);
         filter.addAction(UbuntuInstallService.SERVICE_STATE);
         registerReceiver(mServiceObserver, filter);
-        
+
         // do we know last activity
-        if (mStatus == ActivityStatus.DOWNLOADING || mStatus == ActivityStatus.INSTALLING) {
+        if (mStatus == InstallerState.READY) {
+            requestServiceState();
+            mDownloadedVersion = UbuntuInstallService.getDownloadedVersion(this.getApplicationContext());
+        } else if (mStatus == InstallerState.DOWNLOADING || mStatus == InstallerState.INSTALLING) {
             // request last progress / status. this will update UI accordingly
-               startService(new Intent(UbuntuInstallService.GET_PROGRESS_STATUS));            
+            startService(new Intent(UbuntuInstallService.GET_PROGRESS_STATUS));
         } else {
-            if (Utils.checkifReadyToInstall(this)) {
-                mStatus = ActivityStatus.READY_TO_INSTALL;
-            }
+            // READY + mDownloadedVersion != null => READY_TO_INSTALL
+            mDownloadedVersion = UbuntuInstallService.getDownloadedVersion(this.getApplicationContext());
+            mStatus = InstallerState.READY;
             updateUiElements();
         }
     }
@@ -114,7 +115,8 @@
         switch (item.getItemId()) {
             case R.id.action_delete_download:
                 deleteDownload();
-                mStatus = ActivityStatus.READY_TO_DOWNLOAD;
+                mDownloadedVersion = null;
+                mStatus = InstallerState.READY;
                 updateUiElements();
                 break;
         }
@@ -126,20 +128,23 @@
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         context.startActivity(intent);
     }
-    
+
     private void checkIfUbuntuIsInstalled() {
         // check is there is Ubuntu installed
-        SharedPreferences pref = getSharedPreferences( UbuntuInstallService.SHARED_PREF, Context.MODE_PRIVATE);
-        if (VersionInfo.hasValidVersion(pref, UbuntuInstallService.PREF_KEY_INSTALLED_VERSION)) {
+        if (UbuntuInstallService.isUbuntuInstalled(this.getApplicationContext())) {
             // go to launch screen
-            LaunchActivity.startFrom(this);;
+            LaunchActivity.startFrom(this);
         }
     }
-    
+
     private void requestChannelList() {
         startService(new Intent(UbuntuInstallService.GET_CHANNEL_LIST));
     }
     
+    private void requestServiceState() {
+        startService(new Intent(UbuntuInstallService.GET_SERVICE_STATE));
+    }
+    
     private void deleteDownload() {
         Intent action = new Intent(UbuntuInstallService.CLEAN_DOWNLOAD);
         startService(action);
@@ -151,13 +156,13 @@
             // do we need to download release, or there is already one downloaded
             // user might have missed SU request, then we have downloaded release and we just need deploy it
             // TODO: we will need to handle also download resume
-            if (mStatus == ActivityStatus.DOWNLOADING) {
+            if (mStatus == InstallerState.DOWNLOADING) {
                 Intent startInstall = new Intent(UbuntuInstallService.CANCEL_DOWNLOAD);
                 startService(startInstall);
-            } else if (mStatus == ActivityStatus.INSTALLING) {
+            } else if (mStatus == InstallerState.INSTALLING) {
                 Intent startInstall = new Intent(UbuntuInstallService.CANCEL_INSTALL);
                 startService(startInstall);
-            } else if (Utils.checkifReadyToInstall(v.getContext())) {                
+            } else if (UbuntuInstallService.checkifReadyToInstall(v.getContext())) {
                 startInstallationIfPossible();
             } else if (0 != mAvailableChannels.size()) {
                 // get list of aliases as array
@@ -178,7 +183,7 @@
                                      true /* default latest settings*/).show();
             } else {
                 // there are no channels to pick from, this was mistake, disable button
-                mStatus = ActivityStatus.NO_CHANNELS;
+                mStatus = InstallerState.READY;
                 updateUiElements();
             }
         }
@@ -202,7 +207,7 @@
         Utils.showToast(this, "Starting Ubuntu installation");
         // reset progress bar
         mProgressBar.setProgress(0);
-        mStatus = ActivityStatus.INSTALLING;
+        mStatus = InstallerState.INSTALLING;
         updateUiElements();
     }
     
@@ -231,7 +236,7 @@
         startService(startDownload);
         mTerminal.setText(R.string.downloading_starting);
         mProgressBar.setProgress(0);
-        mStatus = ActivityStatus.DOWNLOADING;
+        mStatus = InstallerState.DOWNLOADING;
         updateUiElements();
     }
     
@@ -278,12 +283,28 @@
 
     private void updateUiElements() {
         switch (mStatus) {
-            case NORMAL:
-                mInstallButton.setText(Html.fromHtml(getResources().getString(R.string.install_button_label_fetching)));
-                mInstallButton.setEnabled(false);
-                mProgressBar.setEnabled(false);
-                mProgressBar.setProgress(0);
-                mProgressText.setText("");
+            case READY:
+            {
+                if (mDownloadedVersion != null) {
+                    mInstallButton.setText(R.string.install_button_label_resume);
+                    mInstallButton.setEnabled(true);
+                    mProgressBar.setEnabled(false);
+                    mProgressBar.setProgress(0);
+                    mProgressText.setText("");
+                } else if (mAvailableChannels.size() > 0) {
+                    mInstallButton.setText(R.string.install_button_label_install);
+                    mInstallButton.setEnabled(true);
+                    mProgressBar.setEnabled(false);
+                    mProgressBar.setProgress(0);
+                    mProgressText.setText("");
+                } else {
+                    mInstallButton.setText(Html.fromHtml(getResources().getString(R.string.install_button_label_no_channel)));
+                    mInstallButton.setEnabled(false);
+                    mProgressBar.setEnabled(false);
+                    mProgressBar.setProgress(0);
+                    mProgressText.setText("");
+                }
+            }
                 break;
             case FETCHING_CHANNELS:
                 mInstallButton.setText(Html.fromHtml(getResources().getString(R.string.install_button_label_fetching)));
@@ -292,27 +313,6 @@
                 mProgressBar.setProgress(0);
                 mProgressText.setText("");
                 break;                
-            case NO_CHANNELS:
-                mInstallButton.setText(Html.fromHtml(getResources().getString(R.string.install_button_label_no_channel)));
-                mInstallButton.setEnabled(false);
-                mProgressBar.setEnabled(false);
-                mProgressBar.setProgress(0);
-                mProgressText.setText("");
-                break;
-            case READY_TO_DOWNLOAD:
-                mInstallButton.setText(R.string.install_button_label_install);
-                mInstallButton.setEnabled(true);
-                mProgressBar.setEnabled(false);
-                mProgressBar.setProgress(0);
-                mProgressText.setText("");
-                break;
-            case READY_TO_INSTALL:
-                mInstallButton.setText(R.string.install_button_label_resume);
-                   mInstallButton.setEnabled(true);
-                   mProgressBar.setEnabled(false);
-                   mProgressBar.setProgress(0);
-                   mProgressText.setText("");
-                   break;
             case DOWNLOADING:
                 mInstallButton.setText(R.string.install_button_label_cancel);
                    mInstallButton.setEnabled(true);
@@ -338,19 +338,12 @@
             // List of available channels fetched 
             if (action.equals(UbuntuInstallService.AVAILABLE_CHANNELS)) {
                 // ignore channel list if we have already downloaded release
-                if (!Utils.checkifReadyToInstall(context)) {
+                if (!UbuntuInstallService.checkifReadyToInstall(context)) {
                     mAvailableChannels = (HashMap<String, String>) 
                             intent.getSerializableExtra(UbuntuInstallService.AVAILABLE_CHANNELS_EXTRA_CHANNELS);
-                    if (0 != mAvailableChannels.size()) {
-                        mStatus = ActivityStatus.READY_TO_DOWNLOAD;
-                        updateUiElements();
-                    } else {
-                        // we have no channels to choose from
-                        mStatus = ActivityStatus.NO_CHANNELS;
-                        updateUiElements();
-                    }
+                    mStatus = InstallerState.READY;
+                    updateUiElements();
                 }
-
             // Handle progress
             } else if (action.equals(UbuntuInstallService.PROGRESS)) {
                 String p = intent.getStringExtra(UbuntuInstallService.PROGRESS_EXTRA_TEXT);
@@ -379,12 +372,15 @@
                     updateInfoOnUiThread(reason);
                     // if we still have download go back to resume installation
                     // TODO: we should distinguish between resume/retry
-                    if (Utils.checkifReadyToInstall(context)) {
-                        mStatus = ActivityStatus.READY_TO_INSTALL;
+                    mDownloadedVersion = UbuntuInstallService.getDownloadedVersion(context);
+                    if (UbuntuInstallService.checkifReadyToInstall(context)) {
+                        mDownloadedVersion = UbuntuInstallService.getDownloadedVersion(context);
+                        mStatus = InstallerState.READY;
                     } else {
-                        mStatus = ActivityStatus.NORMAL;
                         deleteDownload();
+                        mDownloadedVersion = null;
                         requestChannelList();
+                        mStatus = InstallerState.FETCHING_CHANNELS;
                     }
                     updateUiElements();
                 }
@@ -405,18 +401,31 @@
                     updateInfoOnUiThread(reason);
                     // delete failed download
                     deleteDownload();
-                    mStatus = ActivityStatus.NORMAL;
+                    mStatus = InstallerState.READY;
                     updateUiElements();
                     requestChannelList();
                 }
-            } else if (action.equals(UbuntuInstallService.VERSION_UPDATE)
-                    || action.equals(UbuntuInstallService.SERVICE_STATE)) {
+            } else if (action.equals(UbuntuInstallService.VERSION_UPDATE)) {
                 checkIfUbuntuIsInstalled();
                 if (!isFinishing()) {
                     // check what button should be shown
-                    if (Utils.checkifReadyToInstall(context)) {
-                           mStatus = ActivityStatus.READY_TO_INSTALL;
-                    }
+                    if (UbuntuInstallService.checkifReadyToInstall(context)) {
+                        mDownloadedVersion = UbuntuInstallService.getDownloadedVersion(context);
+                        mStatus = InstallerState.READY;
+                    }
+                    updateUiElements();
+                }
+            } else if (action.equals(UbuntuInstallService.SERVICE_STATE)) {
+                checkIfUbuntuIsInstalled();
+                if (!isFinishing()) {
+                    mStatus = InstallerState.fromOrdian(intent.getIntExtra(UbuntuInstallService.SERVICE_STATE, 0));
+                    if (mStatus != InstallerState.FETCHING_CHANNELS &&
+                            mStatus != InstallerState.DOWNLOADING &&
+                            mStatus != InstallerState.INSTALLING) {
+                        requestChannelList();
+                        mStatus = InstallerState.FETCHING_CHANNELS;
+                    }
+                    mDownloadedVersion = UbuntuInstallService.getDownloadedVersion(context);
                     updateUiElements();
                 }
             }
 
=== modified file 'src/com/canonical/ubuntu/installer/LaunchActivity.java'
--- src/com/canonical/ubuntu/installer/LaunchActivity.java	2013-12-18 01:01:21 +0000
+++ src/com/canonical/ubuntu/installer/LaunchActivity.java	2013-12-18 11:59:13 +0000
@@ -12,7 +12,6 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.PowerManager;
 import android.view.Menu;
@@ -149,7 +148,6 @@
     }
 
     private void fillInstalledVersionInfo() {
-        SharedPreferences pref = getSharedPreferences( UbuntuInstallService.SHARED_PREF, Context.MODE_PRIVATE);        
         mTextChannel.setText(mUbuntuVersion.getChannelAlias());
         mTextVersion.setText(Integer.toString(mUbuntuVersion.getVersion()));
         mTextDescription.setText(mUbuntuVersion.getDescription());
@@ -159,12 +157,12 @@
     }
     
     private void ensureUbuntuIsInstalled() {
-        SharedPreferences pref = getSharedPreferences( UbuntuInstallService.SHARED_PREF, Context.MODE_PRIVATE);
-        if (!VersionInfo.hasValidVersion(pref, UbuntuInstallService.PREF_KEY_INSTALLED_VERSION)) {
+        VersionInfo v = UbuntuInstallService.getInstalledVersion(this.getApplicationContext());
+        if (v == null) {
             // go back to install screen
-        InstallActivity.startFrom(this);
+            InstallActivity.startFrom(this);
         } else {
-        mUbuntuVersion = new VersionInfo(pref, UbuntuInstallService.PREF_KEY_INSTALLED_VERSION);
+            mUbuntuVersion = v;
         }
     }
     
 
=== modified file 'src/com/canonical/ubuntu/installer/UbuntuInstallService.java'
--- src/com/canonical/ubuntu/installer/UbuntuInstallService.java	2013-12-18 01:07:42 +0000
+++ src/com/canonical/ubuntu/installer/UbuntuInstallService.java	2013-12-18 11:59:13 +0000
@@ -44,9 +44,9 @@
     // Key for string value: absolute path to update file
     public final static String PREF_KEY_UPDATE_COMMAND = "update_command";
     // Key for String set value: version information: alias, Json, version, description 
-    public final static String PREF_KEY_DOWNLOADED_VERSION = "d_version";
+    private final static String PREF_KEY_DOWNLOADED_VERSION = "d_version";
     // Key for String set value: version information: alias, Json, version, description
-    public final static String PREF_KEY_INSTALLED_VERSION = "i_version";
+    private final static String PREF_KEY_INSTALLED_VERSION = "i_version";
     // Key for boolean value: true if developer option is enabled
     public final static String PREF_KEY_DEVELOPER = "developer";
     // Key for int value: estimated number of checkpoints for installation
@@ -93,7 +93,7 @@
     // Service broadcast
     // =================================================================================================
     public static final String SERVICE_STATE = "com.canonical.ubuntuinstaller.UbuntuInstallService.SERVICE_STATE";
-    public static final String SERVICE_STATE_EXTRA_STATE = "state"; // ServiceState enum
+    public static final String SERVICE_STATE_EXTRA_STATE = "state"; // InstallerState enum
     public static final String AVAILABLE_CHANNELS = "com.canonical.ubuntuinstaller.UbuntuInstallService.AVAILABLE_CHANNELS";
     public static final String AVAILABLE_CHANNELS_EXTRA_CHANNELS = "channels"; // HashMap<String,String> channel aliases and json url
     public static final String DOWNLOAD_RESULT = "com.canonical.ubuntuinstaller.UbuntuInstallService.DOWNLOAD_RESULT";
@@ -128,10 +128,13 @@
     /**
      * State of the service 
      */
-    public enum ServiceState {
-        READY, FETCHING_CHANNELS, DOWNLOADING, INSTALLING, UNINSTALLING_UBUNTU, DELETING_USER_DATA 
+    public enum InstallerState {
+        READY, FETCHING_CHANNELS, DOWNLOADING, INSTALLING, UNINSTALLING, DELETING_USER_DATA;
+        public static InstallerState fromOrdian(int ordianl) {
+            return InstallerState.values()[ordianl];
+         }
     }
-    
+
     // =================================================================================================
     // Packed assets
     // =================================================================================================
@@ -175,7 +178,7 @@
     private long mProgress; // so far handled amount downloaded/processed 
     private int mLastSignalledProgress;
     private long mTotalSize; // calculated
-    private ServiceState mServiceState;
+    private InstallerState mServiceState;
     
     public class Channel {
         String alias;
@@ -224,13 +227,13 @@
             mRootOfWorkPath = getFilesDir().toString(); //  "/data/data/com.canonical.ubuntuinstaller/files";
             workPathInCache = false;
         }
-        mServiceState = ServiceState.READY;
+        mServiceState = InstallerState.READY;
     }
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         // if service is not in ready state, handle specific requests here
-        if (mServiceState != ServiceState.READY) {
+        if (mServiceState != InstallerState.READY) {
             String action = intent.getAction(); 
             if (action.equals(CANCEL_DOWNLOAD)) {
                 // set the cancel flag, but let it remove downloaded files on worker thread
@@ -248,44 +251,36 @@
     protected void onHandleIntent(Intent intent) {
         String action = intent.getAction();
         Intent result = null;
+
+        Log.d(TAG, this.toString() + " onHandleIntent: " + action);
         if (action.equals(GET_CHANNEL_LIST)) {
-            mServiceState = ServiceState.FETCHING_CHANNELS;
-            Log.d(TAG, this.toString() + ": GET_CHANNEL_LIST");
+            mServiceState = InstallerState.FETCHING_CHANNELS;
             result = doGetChannelList(intent);
         } else if (action.equals(DOWNLOAD_RELEASE)) {
-            Log.d(TAG, this.toString() + ": DOWNLOAD_RELEASE");
-            mServiceState = ServiceState.DOWNLOADING;
+            mServiceState = InstallerState.DOWNLOADING;
             result = doDownloadRelease(intent);
         } else if (action.equals(CANCEL_DOWNLOAD)) {
-            Log.d(TAG, this.toString() + ": CANCEL_DOWNLOAD");
             // download should be already cancelled, now delete all the files
             result = doRemoreDownload(intent);
         } else if (action.equals(PAUSE_DOWNLOAD)) {
-            Log.d(TAG, this.toString() + ": PAUSE_DOWNLOAD");
             // TODO: handle download
         } else if (action.equals(RESUME_DOWNLOAD)) {
-            Log.d(TAG, this.toString() + ": RESUME_DOWNLOAD");
-            mServiceState = ServiceState.DOWNLOADING;
+            mServiceState = InstallerState.DOWNLOADING;
             // TODO: handle download
         } else if (action.equals(CLEAN_DOWNLOAD)) {
-            Log.d(TAG, this.toString() + ": CLEAN_DOWNLOAD");
             result = doRemoreDownload(intent);
         } else if (action.equals(INSTALL_UBUNTU)) {
-            Log.d(TAG, this.toString() + ": INSTALL_UBUNTU");
-            mServiceState = ServiceState.INSTALLING;
+            mServiceState = InstallerState.INSTALLING;
             result = doInstallUbuntu(intent);
         } else if (action.equals(CANCEL_INSTALL)) {
-            Log.d(TAG, this.toString() + ": CANCEL_INSTALL");
             // install should be already cancelled, try to delete it now
-            mServiceState = ServiceState.UNINSTALLING_UBUNTU;
+            mServiceState = InstallerState.UNINSTALLING;
             result = doUninstallUbuntu(intent);
         } else if (action.equals(UNINSTALL_UBUNTU)) {
-            Log.d(TAG, this.toString() + ": UNINSTALL_UBUNTU");
-            mServiceState = ServiceState.UNINSTALLING_UBUNTU;
+            mServiceState = InstallerState.UNINSTALLING;
             result = doUninstallUbuntu(intent);
         } else if (action.equals(DELETE_UBUNTU_USER_DATA)) {  
-            Log.d(TAG, this.toString() + ": DELETE_UBUNTU_USER_DATA");
-            mServiceState = ServiceState.DELETING_USER_DATA;
+            mServiceState = InstallerState.DELETING_USER_DATA;
             result = doDeleteUbuntuUserData(intent);
         } else {
             // for any other request broadcast service state
@@ -295,7 +290,8 @@
         if (result != null) {
             sendBroadcast(result);
         }
-        mServiceState = ServiceState.READY;
+        mServiceState = InstallerState.READY;
+        Log.d(TAG, this.toString() + " onHandleIntent: " + action + " END");
     }
     
     private Intent doGetChannelList(Intent intent) {
@@ -920,7 +916,7 @@
                 Log.w(TAG, "failed to remove old download");
                 return "failed to remove old download";
             }
-            SharedPreferences pref = getSharedPreferences( SHARED_PREF, Context.MODE_PRIVATE);
+            SharedPreferences pref = getSharedPreferences(SHARED_PREF, Context.MODE_PRIVATE);
             SharedPreferences.Editor editor = pref.edit();
             editor.putString(PREF_KEY_UPDATE_COMMAND, "");
             VersionInfo.storeEmptyVersion(editor, PREF_KEY_DOWNLOADED_VERSION);
@@ -970,4 +966,49 @@
         return true;
     }
 
+    private static VersionInfo getVersionWithPrefKey(Context c, String prefKey) {
+        SharedPreferences pref = c.getSharedPreferences(SHARED_PREF, Context.MODE_PRIVATE);
+
+        if (VersionInfo.hasValidVersion(pref, prefKey)) {
+            return new VersionInfo(pref, prefKey);
+        }
+        return null;
+    }
+    
+    public static VersionInfo getDownloadedVersion(Context c) {
+        return getVersionWithPrefKey(c, PREF_KEY_DOWNLOADED_VERSION);
+    }
+
+    public static VersionInfo getInstalledVersion(Context c) {
+        return getVersionWithPrefKey(c, PREF_KEY_INSTALLED_VERSION);
+    }
+    public static boolean isUbuntuInstalled(Context c) {
+        SharedPreferences pref = c.getSharedPreferences(SHARED_PREF, Context.MODE_PRIVATE);
+        if (VersionInfo.hasValidVersion(pref, PREF_KEY_INSTALLED_VERSION)) {
+            // go to launch screen
+            return true;
+        }
+        return false;
+    }
+    
+    /**
+     * Check if there is downloaded release ready to install
+     * @param context
+     * @return true if there is downloaded release ready to install
+     */
+    public static boolean checkifReadyToInstall(Context context) {
+        SharedPreferences pref = context.getSharedPreferences(SHARED_PREF, Context.MODE_PRIVATE);
+        String command = pref.getString(PREF_KEY_UPDATE_COMMAND, "");
+        boolean ready = false;
+        if (!command.equals("")){
+            File f = new File(command);
+            if (f.exists()) {
+                return true;
+            } else {
+                pref.edit().putString(PREF_KEY_UPDATE_COMMAND, "").commit();
+                return false;
+            }
+        }
+        return false;
+    }
 }
 
=== modified file 'src/com/canonical/ubuntu/installer/Utils.java'
--- src/com/canonical/ubuntu/installer/Utils.java	2013-12-18 01:07:42 +0000
+++ src/com/canonical/ubuntu/installer/Utils.java	2013-12-18 11:59:13 +0000
@@ -74,7 +74,7 @@
 				String result= convertStreamToString(instream);
 				// now you have the string representation of the HTML request
 
-				Log.i(TAG, result);
+				// Log.i(TAG, result);
 
 				instream.close();
 
@@ -184,27 +184,6 @@
     	}
     	return size;
     }
-    
-    /**
-     * Check if there is downloaded release ready to install
-     * @param context
-     * @return true if there is downloaded release ready to install
-     */
-    public static boolean checkifReadyToInstall(Context context) {
-        SharedPreferences pref = context.getSharedPreferences( UbuntuInstallService.SHARED_PREF, Context.MODE_PRIVATE);
-        String command = pref.getString(UbuntuInstallService.PREF_KEY_UPDATE_COMMAND, "");
-        boolean ready = false;
-        if (!command.equals("")){
-            File f = new File(command);
-            if (f.exists()) {
-            	return true;
-            } else {
-            	pref.edit().putString(UbuntuInstallService.PREF_KEY_UPDATE_COMMAND, "").commit();
-            	return false;
-            }
-        }
-        return false;
-    }
 
     @SuppressWarnings("deprecation")
     public static long getFreeSpaceInBytes(String fsPath) {
@@ -225,7 +204,7 @@
         }
         return "";
     }
-    
+
     public static String getRecoveryPartitionPath() {
         String deviceModel = Build.DEVICE.toLowerCase(Locale.US);
         if ("mako".equals(deviceModel)) {