Merge lp:~humpolec-team/humpolec/UbuntuInstaller-alfa-release-fixes into lp:humpolec

[Ondrej Kubik]

Fixing UI issue when sometimes Install activity was out of sync from service and showing fetching channels
Fixing UI issue when app tasked away during download, then auto install progress was dimmed
Cleanup of service state changes, now broadcasted whenever it changes.
Fixing CyanogenMod issue. CM su behaves differently and requires correction in scripts
Renaming tar to u_tar so when we use tar, it's not accidentally using platform (busybox) one
Cleaning install and download fail and following cleanup.
Fixing downloaded version and update command out of sync, causing non functional "resume install" state
Adding new ROOT permission used by CyanogenMod
Adding signing script

[Yuan-Chen Cheng (ycheng-twn)]

look good to me.

review: Approve

[Rex Tsai (chihchun)]

+1 for fixed fetching channels UI issues
+Adding new ROOT permission used by CyanogenMod
+Fixing CyanogenMod su issue.
+0 on Cleaning install and download fail and following cleanup
1. It should check if the original installation exist.
2. It should prompt a confirmation dialog to let user's know his/her installation will be deleted.

review: Needs Information

[Yuan-Chen Cheng (ycheng-twn)]

If we don't consider user install ubuntu phone by other method, as in InstallActivity, there always should not have any previous installtion. If yes, the disk space calculation will get confused.

We should use something like sudo to detect whether there exists previous installation in next version.

=== modified file 'AndroidManifest.xml'
--- AndroidManifest.xml	2013-12-18 13:27:15 +0000
+++ AndroidManifest.xml	2013-12-20 03:53:27 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.canonical.ubuntu.installer"
-    android:versionCode="1"
-    android:versionName="1.0" >
+    android:versionCode="19"
+    android:versionName="0.2" >
 
     <uses-sdk
         android:minSdkVersion="17"
@@ -22,6 +22,7 @@
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.ACCESS_CACHE_FILESYSTEM" />
     <uses-permission android:name="android.permission.REBOOT"/>
+    <uses-permission android:name="android.permission.ACCESS_SUPERUSER"/>
 
     <application
         android:allowBackup="true"
 
=== modified file 'assets/system-image-upgrader'
--- assets/system-image-upgrader	2013-12-18 01:01:21 +0000
+++ assets/system-image-upgrader	2013-12-20 03:53:27 +0000
@@ -3,6 +3,8 @@
 export PATH=$PATH:${PWD}
 UPDATE_FOLDER=${PWD}
 PRIVATE_DIR=$2
+BUSYBOX=busybox
+TAR=u_tar
 set -e
 
 if [ ! -e "$1" ]; then
@@ -61,9 +63,9 @@
     fi
 
     # Unpacking
-    TMPDIR=$(busybox mktemp -d ${TMP}/tempdir.XXXXXXXX)
+    TMPDIR=$($BUSYBOX mktemp -d ${TMP}/tempdir.XXXXXXXX)
     cd $TMPDIR
-    cat $1 | busybox unxz | tar xf -
+    cat $1 | $BUSYBOX unxz | $TAR xf -
     if [ ! -e keyring.json ] || [ ! -e keyring.gpg ]; then
         rm -Rf $TMPDIR
         echo "Invalid keyring: $1"
@@ -71,7 +73,7 @@
     fi
 
     # Extract the expiry
-    keyring_expiry=$(grep "^    \"expiry\": " keyring.json | busybox cut -d: -f2 | busybox sed -e "s/[ \",]//g")
+    keyring_expiry=$(grep "^    \"expiry\": " keyring.json | $BUSYBOX cut -d: -f2 | $BUSYBOX sed -e "s/[ \",]//g")
     if [ -n "$keyring_expiry" ] && [ "$keyring_expiry" -lt "$(date +%s)" ]; then
         rm -Rf $TMPDIR
         echo "Keyring expired: $1"
@@ -79,7 +81,7 @@
     fi
 
     # Extract the keyring type
-    keyring_type=$(grep "^    \"type\": " keyring.json | busybox cut -d: -f2 | busybox sed -e "s/[, \"]//g")
+    keyring_type=$(grep "^    \"type\": " keyring.json | $BUSYBOX cut -d: -f2 | $BUSYBOX sed -e "s/[, \"]//g")
     if [ -z "$keyring_type" ]; then
         rm -Rf $TMPDIR
         echo "Missing keyring type: $1"
@@ -153,8 +155,8 @@
                     FULL_IMAGE=1
                     rm -f /data/system.img
                     rm -f /data/.layout_version
-                    busybox dd if=/dev/zero of=/data/system.img seek=500K bs=4096 count=1
-                    busybox mkfs.ext2 -F /data/system.img
+                    $BUSYBOX dd if=/dev/zero of=/data/system.img seek=500K bs=4096 count=1
+                    $BUSYBOX mkfs.ext2 -F /data/system.img
                 ;;
 
                 data)
@@ -233,7 +235,7 @@
 
             # Start by removing any file listed in "removed"
             if [ "$FULL_IMAGE" != "1" ]; then
-                cat $UPDATE_FOLDER/$2 | busybox unxz | tar xf - removed >/dev/null 2>&1 || true
+                cat $UPDATE_FOLDER/$2 | $BUSYBOX unxz | $TAR xf - removed >/dev/null 2>&1 || true
                 if [ -e removed ]; then
                     while read file; do
                         rm -Rf $file
@@ -243,7 +245,7 @@
             fi
 
             # Unpack everything else on top of the system partition
-            cat $UPDATE_FOLDER/$2 | busybox unxz | tar --checkpoint=200 -xf -
+            cat $UPDATE_FOLDER/$2 | $BUSYBOX unxz | $TAR --checkpoint=200 -xf -
             rm -f removed
 
             if [ -e "partitions/boot.img" ]; then
@@ -287,7 +289,7 @@
     echo "Moving SWAP device to final destination" >&2
     mv $PRIVATE_DIR/SWAP.img /data/
     echo "Calling mkswap on /data/SWAP.img" >&2
-    busybox mkswap /data/SWAP.img
+    $BUSYBOX mkswap /data/SWAP.img
 fi
 
 touch /data/.last_update || true
 
=== renamed file 'assets/tar' => 'assets/u_tar'
=== added file 'make_release.sh'
--- make_release.sh	1970-01-01 00:00:00 +0000
+++ make_release.sh	2013-12-20 03:53:27 +0000
@@ -0,0 +1,16 @@
+ #!/sbin/sh
+ KEY=$1
+ if [[ -z "$KEY" ]]; then
+   echo "Pass path to the keystore"
+   exit -1
+ fi
+ echo "Release tool, using key"
+ echo "Getting ready for build"
+ android update project --path .
+ echo "Removing old release"
+ rm -rf bin/ 
+ ant release
+ echo "Signing build"
+ jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore $KEY bin/MainActivity-release-unsigned.apk humpolec
+ mv bin/MainActivity-release-unsigned.apk bin/UbuntuInstaller.apk
+ echo "Signed relase is at bin/UbuntuInstaller.apk"
 \ No newline at end of file
 
=== modified file 'res/menu/installer_menu.xml'
--- res/menu/installer_menu.xml	2013-12-13 01:06:14 +0000
+++ res/menu/installer_menu.xml	2013-12-20 03:53:27 +0000
@@ -5,10 +5,10 @@
         android:orderInCategory="100"
         android:showAsAction="never"
         android:title="@string/action_detele_download"/>
-    <item
+<!--  <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
         android:showAsAction="never"
         android:title="@string/action_settings"/>
-    
+     -->
 </menu>
 
=== modified file 'res/menu/launcher_menu.xml'
--- res/menu/launcher_menu.xml	2013-12-13 01:06:14 +0000
+++ res/menu/launcher_menu.xml	2013-12-20 03:53:27 +0000
@@ -11,10 +11,10 @@
         android:showAsAction="never"
         android:title="@string/action_delete_user_data"/>
     
-    <item
+<!--    <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
         android:showAsAction="never"
         android:title="@string/action_settings"/>
-    
+-->
 </menu>
 
=== modified file 'res/values/strings.xml'
--- res/values/strings.xml	2013-12-19 09:09:25 +0000
+++ res/values/strings.xml	2013-12-20 03:53:27 +0000
@@ -11,11 +11,12 @@
     <string name="action_delete_udata_button">Delete</string>
     <string name="cancel">Cancel</string>
     <string name="welcome_world">Your life is about to change, welcome in Ubuntu installer</string>
-    <string name="install_button_label_install">Install Ubuntu</string>
+    <string name="install_button_label_install">Choose channel to install</string>
     <string name="install_button_label_fetching"><![CDATA[Install Ubuntu<br/><small>fetching channel list</small>]]></string>
     <string name="install_button_label_no_channel"><![CDATA[Install Ubuntu<br/><small>no available channels</small>]]></string>
     <string name="install_button_label_resume">Resume install</string>
-    <string name="install_button_label_cancel">Cancel install</string>
+    <string name="install_button_label_cancel_download">Cancel download</string>
+    <string name="install_button_label_cancel_install">Cancel install</string>
     <string name="channel_picker_dialog_title">Select channel to install</string>
     <string name="version_picker_dialog_title">Select version to install</string>
     <string name="bootstrap_check">bootstrap</string>
 
=== modified file 'src/com/canonical/ubuntu/installer/InstallActivity.java'
--- src/com/canonical/ubuntu/installer/InstallActivity.java	2013-12-19 12:57:21 +0000
+++ src/com/canonical/ubuntu/installer/InstallActivity.java	2013-12-20 03:53:27 +0000
@@ -32,7 +32,8 @@
 public class InstallActivity extends Activity {
     private static final String TAG = "UbuntuInstaller";
 
-    private UbuntuButton mInstallButton;    
+    private UbuntuButton mInstallButton;
+    private boolean mObserversRegistered;
 
     private InstallerState mStatus = InstallerState.READY;
     private VersionInfo mDownloadedVersion = null;
@@ -79,28 +80,31 @@
         filter.addAction(UbuntuInstallService.VERSION_UPDATE);
         filter.addAction(UbuntuInstallService.SERVICE_STATE);
         registerReceiver(mServiceObserver, filter);
+        mObserversRegistered = true;
 
         // do we know last activity
-        if (mStatus == InstallerState.READY) {
-            requestServiceState();
-            mDownloadedVersion = UbuntuInstallService.getDownloadedVersion(this.getApplicationContext());
-        } else if (mStatus == InstallerState.DOWNLOADING || mStatus == InstallerState.INSTALLING) {
+        if (mStatus == InstallerState.DOWNLOADING || mStatus == InstallerState.INSTALLING) {
             // request last progress / status. this will update UI accordingly
             startService(new Intent(UbuntuInstallService.GET_PROGRESS_STATUS));
         } else {
             // READY + mDownloadedVersion != null => READY_TO_INSTALL
             mDownloadedVersion = UbuntuInstallService.getDownloadedVersion(this.getApplicationContext());
-            mStatus = InstallerState.READY;
-            updateUiElements();
+            if (mDownloadedVersion == null) {
+                requestChannelList();
+            }
         }
+        requestServiceState();
     }
     
     @Override
     public void onPause() {
         super.onPause();
-        mInstallButton.setOnClickListener(null);
         // cancel observer if there is any
-        unregisterReceiver(mServiceObserver);
+        if (mObserversRegistered) {
+            mInstallButton.setOnClickListener(null);
+            unregisterReceiver(mServiceObserver);
+        }
+        mObserversRegistered = false;
     }
     
     @Override
@@ -114,10 +118,13 @@
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.action_delete_download:
+                // also attempt to uninstall ubuntu, since there should be none anyway, keep user data
+                Intent action = new Intent(UbuntuInstallService.UNINSTALL_UBUNTU);
+                action.putExtra(UbuntuInstallService.UNINSTALL_UBUNTU_EXTRA_REMOVE_USER_DATA, false);
+                startService(action);
                 deleteDownload();
                 mDownloadedVersion = null;
-                mStatus = InstallerState.READY;
-                updateUiElements();
+                requestServiceState();
                 break;
         }
         return super.onOptionsItemSelected(item);
@@ -184,8 +191,7 @@
                                      true /* default latest settings*/).show();
             } else {
                 // there are no channels to pick from, this was mistake, disable button
-                mStatus = InstallerState.READY;
-                updateUiElements();
+                requestServiceState();
             }
         }
     };
@@ -209,8 +215,6 @@
         Utils.showToast(this, "Starting Ubuntu installation");
         // reset progress bar
         mProgressBar.setProgress(0);
-        mStatus = InstallerState.INSTALLING;
-        updateUiElements();
     }
     
     TextPickerDialog.OnChannelPicktListener mInstallDialogListener 
@@ -238,8 +242,6 @@
         startService(startDownload);
         mTerminal.setText(R.string.downloading_starting);
         mProgressBar.setProgress(0);
-        mStatus = InstallerState.DOWNLOADING;
-        updateUiElements();
     }
     
     private void downloadVersion(final Context context, final String channel, final boolean bootstrap) {
@@ -284,50 +286,56 @@
     }
 
     private void updateUiElements() {
-        switch (mStatus) {
-            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("");
+        this.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                Log.v(TAG,"updateUiElements(" + mStatus + ")");
+                switch (mStatus) {
+                    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)));
+                        mInstallButton.setEnabled(false);
+                        mProgressBar.setEnabled(false);
+                        mProgressBar.setProgress(0);
+                        mProgressText.setText("");
+                        break;                
+                    case DOWNLOADING:
+                        mInstallButton.setText(R.string.install_button_label_cancel_download);
+                        mInstallButton.setEnabled(true);
+                        mProgressBar.setEnabled(true);
+                        mProgressText.setText(R.string.downloading_release);
+                        break;
+                    case INSTALLING:
+                        mInstallButton.setText(R.string.install_button_label_cancel_install);
+                        mInstallButton.setEnabled(true);
+                        mProgressBar.setEnabled(true);
+                        mProgressText.setText(R.string.installing_release);
+                        break;
                 }
             }
-                break;
-            case FETCHING_CHANNELS:
-                mInstallButton.setText(Html.fromHtml(getResources().getString(R.string.install_button_label_fetching)));
-                mInstallButton.setEnabled(false);
-                mProgressBar.setEnabled(false);
-                mProgressBar.setProgress(0);
-                mProgressText.setText("");
-                break;                
-            case DOWNLOADING:
-                mInstallButton.setText(R.string.install_button_label_cancel);
-                   mInstallButton.setEnabled(true);
-                   mProgressBar.setEnabled(true);
-                   mProgressText.setText(R.string.downloading_release);
-                   break;
-            case INSTALLING:
-                mInstallButton.setText(R.string.install_button_label_cancel);
-                   mInstallButton.setEnabled(true);
-                   mProgressBar.setEnabled(true);
-                mProgressText.setText(R.string.installing_release);
-                break;
-        }
+        });
     }
     
     BroadcastReceiver mServiceObserver = new BroadcastReceiver() {
@@ -335,8 +343,8 @@
         @SuppressWarnings("unchecked")
         @Override
         public void onReceive(Context context, Intent intent) {
-            
             String action = intent.getAction();
+            Log.v(TAG,"mServiceObserver.onReceive(" + action + ")");
             // List of available channels fetched 
             if (action.equals(UbuntuInstallService.AVAILABLE_CHANNELS)) {
                 // ignore channel list if we have already downloaded release
@@ -379,12 +387,10 @@
                     mDownloadedVersion = UbuntuInstallService.getDownloadedVersion(context);
                     if (UbuntuInstallService.checkifReadyToInstall(context)) {
                         mDownloadedVersion = UbuntuInstallService.getDownloadedVersion(context);
-                        mStatus = InstallerState.READY;
                     } else {
                         deleteDownload();
                         mDownloadedVersion = null;
                         requestChannelList();
-                        mStatus = InstallerState.FETCHING_CHANNELS;
                     }
                     updateUiElements();
                 }
@@ -405,8 +411,6 @@
                     updateInfoOnUiThread(reason);
                     // delete failed download
                     deleteDownload();
-                    mStatus = InstallerState.READY;
-                    updateUiElements();
                     requestChannelList();
                 }
             } else if (action.equals(UbuntuInstallService.VERSION_UPDATE)) {
@@ -415,7 +419,6 @@
                     // check what button should be shown
                     if (UbuntuInstallService.checkifReadyToInstall(context)) {
                         mDownloadedVersion = UbuntuInstallService.getDownloadedVersion(context);
-                        mStatus = InstallerState.READY;
                     }
                     updateUiElements();
                 }
@@ -423,12 +426,6 @@
                 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/UbuntuInstallService.java'
--- src/com/canonical/ubuntu/installer/UbuntuInstallService.java	2013-12-19 11:21:02 +0000
+++ src/com/canonical/ubuntu/installer/UbuntuInstallService.java	2013-12-20 03:53:27 +0000
@@ -148,7 +148,7 @@
     // =================================================================================================
     private static final String BUSYBOX = "busybox";
     private static final String GPG = "gpg";
-    private static final String TAR = "tar";
+    private static final String TAR = "u_tar";
     private static final String ANDROID_LOOP_MOUNT = "aloopmount";
     private static final String ANDROID_BOOTMGR = "bootmgr";
     private static final String UPDATE_SCRIPT = "system-image-upgrader";
@@ -187,7 +187,7 @@
     private long mProgress; // so far handled amount downloaded/processed 
     private int mLastSignalledProgress;
     private long mTotalSize; // calculated
-    private InstallerState mServiceState;
+    private InstallerState mInstallerState;
     
     public class Channel {
         String alias;
@@ -236,13 +236,13 @@
             mRootOfWorkPath = getFilesDir().toString(); //  "/data/data/com.canonical.ubuntuinstaller/files";
             workPathInCache = false;
         }
-        mServiceState = InstallerState.READY;
+        mInstallerState = 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 != InstallerState.READY) {
+        if (mInstallerState != InstallerState.READY) {
             String action = intent.getAction(); 
             if (action.equals(CANCEL_DOWNLOAD)) {
                 // set the cancel flag, but let it remove downloaded files on worker thread
@@ -250,7 +250,7 @@
             } else if (action.equals(GET_PROGRESS_STATUS)) {
                 broadcastProgress(mLastSignalledProgress, ""); 
             } else if (action.equals(GET_SERVICE_STATE)) {
-                broadcastServiceState();
+                broadcastInstallerState();
             }
         }
         return super.onStartCommand(intent, flags, startId);
@@ -263,10 +263,10 @@
 
         Log.d(TAG, this.toString() + " onHandleIntent: " + action);
         if (action.equals(GET_CHANNEL_LIST)) {
-            mServiceState = InstallerState.FETCHING_CHANNELS;
+            updateInstallerState(InstallerState.FETCHING_CHANNELS);
             result = doGetChannelList(intent);
         } else if (action.equals(DOWNLOAD_RELEASE)) {
-            mServiceState = InstallerState.DOWNLOADING;
+            updateInstallerState(InstallerState.DOWNLOADING);
             result = doDownloadRelease(intent);
         } else if (action.equals(CANCEL_DOWNLOAD)) {
             // download should be already cancelled, now delete all the files
@@ -274,22 +274,22 @@
         } else if (action.equals(PAUSE_DOWNLOAD)) {
             // TODO: handle download
         } else if (action.equals(RESUME_DOWNLOAD)) {
-            mServiceState = InstallerState.DOWNLOADING;
+            updateInstallerState(InstallerState.DOWNLOADING);
             // TODO: handle download
         } else if (action.equals(CLEAN_DOWNLOAD)) {
             result = doRemoreDownload(intent);
         } else if (action.equals(INSTALL_UBUNTU)) {
-            mServiceState = InstallerState.INSTALLING;
+            updateInstallerState(InstallerState.INSTALLING);
             result = doInstallUbuntu(intent);
         } else if (action.equals(CANCEL_INSTALL)) {
             // install should be already cancelled, try to delete it now
-            mServiceState = InstallerState.UNINSTALLING;
+            updateInstallerState(InstallerState.UNINSTALLING);
             result = doUninstallUbuntu(intent);
         } else if (action.equals(UNINSTALL_UBUNTU)) {
-            mServiceState = InstallerState.UNINSTALLING;
+            updateInstallerState(InstallerState.UNINSTALLING);
             result = doUninstallUbuntu(intent);
         } else if (action.equals(DELETE_UBUNTU_USER_DATA)) {  
-            mServiceState = InstallerState.DELETING_USER_DATA;
+            updateInstallerState(InstallerState.DELETING_USER_DATA);
             result = doDeleteUbuntuUserData(intent);
         } else if(action.equals(REBOOT_UBUNTU)) {
             Log.d(TAG, this.toString() + ": REBOOT_UBUNTU");
@@ -298,12 +298,12 @@
         } else {
             // for any other request broadcast service state
             result = new Intent(SERVICE_STATE);
-            result.putExtra(SERVICE_STATE_EXTRA_STATE, mServiceState.ordinal());
+            result.putExtra(SERVICE_STATE_EXTRA_STATE, mInstallerState.ordinal());
         }
         if (result != null) {
             sendBroadcast(result);
         }
-        mServiceState = InstallerState.READY;
+        updateInstallerState(InstallerState.READY);
         Log.d(TAG, this.toString() + " onHandleIntent: " + action + " END");
     }
 
@@ -335,7 +335,7 @@
                                     if (alias == null || alias.equals("")) {
                                         alias = key; // use key instead
                                     }
-                                    Log.v(TAG, "Channel:" + alias + "  url:" + url);                    
+                                    // Log.v(TAG, "Channel:" + alias + "  url:" + url);                    
                                     if (!hidden || includeHidden) {
                                         channels.put(alias, url);
                                     }
@@ -354,12 +354,14 @@
     }
     
     private Intent doRemoreDownload(Intent intent) {
-        Intent result = new Intent();
+        Intent result = new Intent(SERVICE_STATE);
         String s = deleteRelease();
         if (s!= null) {
+            broadcastProgress(-1, s);
             // delete failed
         }
-        return result; 
+        result.putExtra(SERVICE_STATE, InstallerState.READY.ordinal());
+        return result;
     }
 
     private Intent doInstallUbuntu(Intent intent) {
@@ -367,14 +369,11 @@
         Intent result = new Intent(INSTALL_RESULT);
         // get update command file
         SharedPreferences pref = getSharedPreferences( SHARED_PREF, Context.MODE_PRIVATE);
-        String updateCommand = // "/cache/ubuntu_release/update_command";
-          pref.getString(PREF_KEY_UPDATE_COMMAND,"");
+        String updateCommand = pref.getString(PREF_KEY_UPDATE_COMMAND,"");
         mTotalSize = pref.getInt(PREF_KEY_ESTIMATED_CHECKPOINTS, 0);
         mLastSignalledProgress = 0;
         if (updateCommand.equals("") || ! new File(updateCommand).exists()) {
-            result.putExtra(INSTALL_RESULT_EXTRA_INT, -1);
-            result.putExtra(INSTALL_RESULT_EXTRA_STR, "Missing update command");
-            return result;
+            return handleInstallFail(result, -1, "Missing update command");
         }
         mWakeLock = mPowerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "ubuntu-installing");
         try {
@@ -394,9 +393,7 @@
                 Utils.extractExecutableAsset(this, U_REBOOT_APP_ASC, supportingFiles.toString(), false);
             } catch (IOException e) {
                 e.printStackTrace();
-                result.putExtra(INSTALL_RESULT_EXTRA_INT, -1);
-                result.putExtra(INSTALL_RESULT_EXTRA_STR, "Failed to extract supporting assets");
-                return result;
+                return handleInstallFail(result, -1, "Failed to extract supporting assets");
             }
             // get superuser and run update script
             broadcastProgress(-1, "Starting update script");
@@ -405,30 +402,34 @@
                 DataOutputStream os = new DataOutputStream(process.getOutputStream());
                 // debug purpose.
                 // os.writeBytes("set -x\n");
+                // make sure we are in work folder
+                os.writeBytes(String.format("cd %s\n", supportingFiles.getAbsolutePath()));
+                os.writeBytes("echo \"SU granted\"\n");
                 // run system-image-upgrader.
                 os.writeBytes(String.format("sh %s %s %s\n",
                         UPDATE_SCRIPT,
                         updateCommand,
-                        getFilesDir().toString()
+                        getFilesDir().getAbsolutePath()
                         ));
+                os.writeBytes(String.format("cd %s\n", supportingFiles.getAbsolutePath()));
                 // backup original recovery.
                 if(!new File(getFilesDir().toString(), ANDROID_REOCVERY_IMG).exists()) {
-                    os.writeBytes(String.format("%s/%s -b %s %s/%s\n",
-                            supportingFiles.toString(),
+                    os.writeBytes(String.format("./%s -b %s %s/%s\n",
                             ANDROID_BOOTMGR,
                             Utils.getRecoveryPartitionPath(),
-                            getFilesDir().toString(),
+                            getFilesDir().getAbsolutePath(),
                             ANDROID_REOCVERY_IMG
                             ));
                 }
+                os.writeBytes(String.format("cd %s\n", supportingFiles.getAbsolutePath()));
                 // overwrite the recovery partition.
-                os.writeBytes(String.format("%s/%s -b %s/%s %s\n",
-                        supportingFiles.toString(),
+                os.writeBytes(String.format("./%s -b %s/%s %s\n",
                         ANDROID_BOOTMGR,
-                        getFilesDir().toString(),
+                        getFilesDir().getAbsolutePath(),
                         UBUNTU_BOOT_IMG,
                         Utils.getRecoveryPartitionPath()
                         ));
+
                 // close terminal
                 os.writeBytes("exit\n");
                 os.flush();
@@ -474,13 +475,9 @@
                         Log.v(TAG, "Worker thread exited with: " + ret);
                           // if script was not executed, then user did not granted SU permissions
                         if (ret == 255 || !scriptExecuted ) {
-                            result.putExtra(INSTALL_RESULT_EXTRA_INT, -1);
-                            result.putExtra(INSTALL_RESULT_EXTRA_STR, "Failed to get SU permissions");
-                            return result;
+                            return handleInstallFail(result, -1, "Failed to get SU permissions");
                         } else if (ret != 0) {
-                            result.putExtra(INSTALL_RESULT_EXTRA_INT, -1);
-                            result.putExtra(INSTALL_RESULT_EXTRA_STR, "Instalation failed");
-                            return result;
+                            return handleInstallFail(result, -1, "Instalation failed");
                         }
                         running =false;
                     } catch (IllegalThreadStateException e) {
@@ -491,9 +488,7 @@
             } catch (IOException e) {
                 e.printStackTrace();
                 Log.w(TAG, "Update failed");
-                result.putExtra(INSTALL_RESULT_EXTRA_INT, -1);
-                result.putExtra(INSTALL_RESULT_EXTRA_STR, "Install failed");
-                return result;
+                return handleInstallFail(result, -1, "Install failed");
             }
         } finally {
             if (mWakeLock != null && mWakeLock.isHeld()) {
@@ -508,6 +503,13 @@
         result.putExtra(INSTALL_RESULT_EXTRA_INT, 0);
         return result;
     }
+    
+    private Intent handleInstallFail(Intent i, int res, String failReason) {
+        i.putExtra(INSTALL_RESULT_EXTRA_INT, -1);
+        i.putExtra(INSTALL_RESULT_EXTRA_STR, "Missing update command");
+        doUninstallUbuntu(i);
+        return i;
+    }
 
     private Intent doUninstallUbuntu(Intent intent) {
         File workingFolder = new File(mRootOfWorkPath, TEMP_FOLDER);
@@ -588,13 +590,13 @@
             try {
                 Process process = Runtime.getRuntime().exec("su", null, getFilesDir());
                 DataOutputStream os = new DataOutputStream(process.getOutputStream());
-
+                
                 Utils.extractExecutableAsset(this, ANDROID_BOOTMGR, getFilesDir().toString(), true);
                 // overwrite the recovery partition.
                 os.writeBytes(String.format("%s/%s -b %s/%s %s\n",
-                        getFilesDir().toString(),
+                        getFilesDir().getAbsolutePath(),
                         ANDROID_BOOTMGR,
-                        getFilesDir().toString(),
+                        getFilesDir().getAbsolutePath(),
                         UBUNTU_BOOT_IMG,
                         Utils.getRecoveryPartitionPath()
                         ));
@@ -643,9 +645,12 @@
         try {
             Process process = Runtime.getRuntime().exec("su", null, workingFolder);
             DataOutputStream os = new DataOutputStream(process.getOutputStream());
+            // make sure we are in work folder
             os.writeBytes("echo \"SU granted\"\n");
             for (String c : commands) {
                 Log.v(TAG, "Executing:" + c);
+                // make sure we are always at working folder before running next command
+                os.writeBytes(String.format("cd %s\n", workingFolder.getAbsolutePath()));
                 os.writeBytes(c);
             }
             os.writeBytes(String.format("rm -rf %s\n", workingFolder.getAbsolutePath()));
@@ -728,9 +733,7 @@
             if (releases.size() == 0 || releases.get(0).files.length == 0 ) {
                 // something is wrong, empty release
                 Log.e(TAG, "Empty releas");
-                result.putExtra(DOWNLOAD_RESULT_EXTRA_INT, -1);
-                result.putExtra(DOWNLOAD_RESULT_EXTRA_STR, "Empty release");
-                return result;
+                return handleDownloadError(result, -1, "Empty release");
             }
             // get right version, otherwise first since that is most recent one
             Image choosenRelease = null;
@@ -744,9 +747,7 @@
                 }
                 if (choosenRelease == null) {
                     Log.e(TAG, "wrong release vwersion");
-                    result.putExtra(DOWNLOAD_RESULT_EXTRA_INT, -1);
-                    result.putExtra(DOWNLOAD_RESULT_EXTRA_STR, "wrong release vwersion");
-                    return result;
+                    return handleDownloadError(result, -1, "wrong release vwersion");
                 }
             } else {
                 choosenRelease = releases.get(0);
@@ -771,9 +772,7 @@
             String s = deleteRelease();
             if (s != null) {
                 // remove failed
-                result.putExtra(DOWNLOAD_RESULT_EXTRA_INT, -1);
-                result.putExtra(DOWNLOAD_RESULT_EXTRA_STR, s);
-                return result;  
+                return handleDownloadError(result, -1, s);
             }
             // make sure release folder exists
             File release = new File(rootFolder,RELEASE_FOLDER);
@@ -794,10 +793,7 @@
                     msg += "/data need 2.5G for system plus " + String.valueOf(mTotalSize) + " bytes for download";
                 }
                 Log.i(TAG, msg);
-
-                result.putExtra(DOWNLOAD_RESULT_EXTRA_INT, -1);
-                result.putExtra(DOWNLOAD_RESULT_EXTRA_STR, msg);
-                return result;
+                return handleDownloadError(result, -1, msg);
             }
 
             // mProgressSteps = mTotalDownloadSize / 100; // we want 1% steps
@@ -832,29 +828,19 @@
                 }
             } catch (MalformedURLException e) {
                 Log.e(TAG, "Failed to download release:", e);
-                result.putExtra(DOWNLOAD_RESULT_EXTRA_INT, -1);
-                result.putExtra(DOWNLOAD_RESULT_EXTRA_STR, "Malformed release url");
-                return result;
+                return handleDownloadError(result, -1, "Malformed release url");
             } catch (FileNotFoundException e) {
                 Log.e(TAG, "Failed to download release:", e);
-                result.putExtra(DOWNLOAD_RESULT_EXTRA_INT, -1);
-                result.putExtra(DOWNLOAD_RESULT_EXTRA_STR, "File not found");
-                return result;
+                return handleDownloadError(result, -1, "File not found");
             } catch (IOException e){
                 Log.e(TAG, "Failed to download release:", e);
-                result.putExtra(DOWNLOAD_RESULT_EXTRA_INT, -1);
-                result.putExtra(DOWNLOAD_RESULT_EXTRA_STR, "IO Error");
-                return result;
+                return handleDownloadError(result, -1, "IO Error");
             } catch (ESumNotMatchException e) {
                 // Download file check sum error !!
-                result.putExtra(DOWNLOAD_RESULT_EXTRA_INT, -1);
-                result.putExtra(DOWNLOAD_RESULT_EXTRA_STR, "Download check sum error");
-                return result;
+                return handleDownloadError(result, -1, "Download check sum error");
             } catch (ECancelException e) {
                 // Download was cancelled by user
-                result.putExtra(DOWNLOAD_RESULT_EXTRA_INT, -2);
-                result.putExtra(DOWNLOAD_RESULT_EXTRA_STR, "Download cancelled by user");
-                return result;
+                return handleDownloadError(result, -2, "Download cancelled by user");
             }
 
             Log.i(TAG, "Download done in " + (System.currentTimeMillis() - time )/1000 + " seconds");
@@ -907,9 +893,7 @@
                 }
             } catch (IOException e) {
                 e.printStackTrace();
-                result.putExtra(DOWNLOAD_RESULT_EXTRA_INT, -1);
-                result.putExtra(DOWNLOAD_RESULT_EXTRA_STR, "Failed to generate update command");
-                return result;
+                return handleDownloadError(result, -1, "Failed to generate update command");
             }
             broadcastProgress(-1, "Download done in " + (System.currentTimeMillis() - time )/1000 + " seconds");
             int estimatedCheckCount = 0;
@@ -939,9 +923,11 @@
         return result;
     }
     
-    class DownloadTask {
-        URL url;
-        File targetFolder;
+    private Intent handleDownloadError(Intent i, int res, String reason) {
+        i.putExtra(DOWNLOAD_RESULT_EXTRA_INT, -1);
+        i.putExtra(DOWNLOAD_RESULT_EXTRA_STR, "Failed to generate update command");
+        deleteRelease();
+        return i;
     }
 
     private String doDownloadUrl(URL url, File targerLocation) throws MalformedURLException,
@@ -1018,12 +1004,19 @@
         return null;
     }
     
-    private void broadcastServiceState() {
+    private void broadcastInstallerState() {
         Intent i = new Intent(SERVICE_STATE);
-        i.putExtra(SERVICE_STATE, mServiceState.ordinal());
+        i.putExtra(SERVICE_STATE, mInstallerState.ordinal());
         sendBroadcast(i);
     }
     
+    private void updateInstallerState(InstallerState newState) {
+        mInstallerState = newState;
+        Intent i = new Intent(SERVICE_STATE);
+        i.putExtra(SERVICE_STATE, mInstallerState.ordinal());
+        sendBroadcast(i);        
+    }
+    
     private void broadcastProgress(int val, String progress) {
         Intent i = new Intent(PROGRESS);
         i.putExtra(PROGRESS_EXTRA_INT, val);
@@ -1092,16 +1085,17 @@
     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();
+                VersionInfo.storeEmptyVersion(pref.edit(), PREF_KEY_DOWNLOADED_VERSION);
                 return false;
             }
         }
+        VersionInfo.storeEmptyVersion(pref.edit(), PREF_KEY_DOWNLOADED_VERSION);
         return false;
     }
 }