Merge lp:~humpolec-team/humpolec/UbuntuInstaller-refactor into lp:humpolec

[Ondrej Kubik]

[Ondrej Kubik (ondrak)]

This has been dog food tested and released as version 1.0

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2013-12-08 16:01:23 +0000
+++ .bzrignore	2014-06-09 11:59:50 +0000
@@ -1,6 +1,6 @@
+.DS_Store
 .project
 local.properties
 bin
 gen
-android-ubuntu-launcher.apk
 
 
=== modified file 'Android.mk'
--- Android.mk	2013-12-08 16:01:23 +0000
+++ Android.mk	2014-06-09 11:59:50 +0000
@@ -1,4 +1,4 @@
-# UFA updater
+# Dualboot installer
 LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
 
=== modified file 'AndroidManifest.xml'
--- AndroidManifest.xml	2014-03-05 15:35:14 +0000
+++ AndroidManifest.xml	2014-06-09 11:59:50 +0000
@@ -1,12 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * This file is part of Ubuntu dualboot installer for Android.
+ * Copyright 2013 Canonical Ltd.
+ * 
+ * Ubuntu dualboot installer is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ *
+ * Ubuntu dualboot installer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Ubuntu dualboot installer. If not, see <http://www.gnu.org/licenses/>.
+ */
+-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.canonical.ubuntu.installer"
     android:versionCode="20"
+<<<<<<< TREE
     android:versionName="0.3" >
+=======
+    android:versionName="1.0.0" >
+>>>>>>> MERGE-SOURCE
 
     <uses-sdk
         android:minSdkVersion="17"
-        android:targetSdkVersion="18" />
+        android:targetSdkVersion="19" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
     <uses-permission android:name="android.permission.ACCESS_SUPERUSER"/>
@@ -20,8 +42,6 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <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
@@ -46,23 +66,29 @@
             android:label="@string/app_name">
         </activity>
         
-        <service android:name="com.canonical.ubuntu.installer.UbuntuInstallService">
+        <receiver android:name=".BootReceiver" >
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+        
+        <service android:name="com.canonical.ubuntu.installer.UbuntuInstallService"
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.canonical.ubuntuinstaller.UbuntuInstallService.GET_CHANNEL_LIST" />
                 <action android:name="com.canonical.ubuntuinstaller.UbuntuInstallService.DOWNLOAD_RELEASE" />
-                <action android:name="com.canonical.ubuntuinstaller.UbuntuInstallService.CANCEL_DOWNLOAD" />
+                <action android:name="com.canonical.ubuntuinstaller.UbuntuInstallService.DOWNLOAD_UPDATE" />
                 <action android:name="com.canonical.ubuntuinstaller.UbuntuInstallService.PAUSE_DOWNLOAD" />
                 <action android:name="com.canonical.ubuntuinstaller.UbuntuInstallService.RESUME_DOWNLOAD" />
-                <action android:name="com.canonical.ubuntuinstaller.UbuntuInstallService.CLEAN_DOWNLOADED" />
+                <action android:name="com.canonical.ubuntuinstaller.UbuntuInstallService.DELETE_DOWNLOAD" />
                 <action android:name="com.canonical.ubuntuinstaller.UbuntuInstallService.INSTALL_UBUNTU" />
-                <action android:name="com.canonical.ubuntuinstaller.UbuntuInstallService.CANCEL_INSTALL" />
                 <action android:name="com.canonical.ubuntuinstaller.UbuntuInstallService.UINSTALL_UBUNTU" />
-                <action android:name="com.canonical.ubuntuinstaller.UbuntuInstallService.CHECK_FOR_UPDATE" />
-                <action android:name="com.canonical.ubuntuinstaller.UbuntuInstallService.DELETE_USER_DATA" />
-                <action android:name="com.canonical.ubuntuinstaller.UbuntuInstallService.GET_SERVICE_STATE" />
-                <action android:name="com.canonical.ubuntuinstaller.UbuntuInstallService.GET_PROGRESS_STATUS" />
+                <action android:name="com.canonical.ubuntuinstaller.UbuntuInstallService.DELETE_UBUNTU_USER_DATA" />
                 <action android:name="com.canonical.ubuntuinstaller.UbuntuInstallService.REBOOT_UBUNTU" />
-                <action android:name="com.canonical.ubuntuinstaller.UbuntuInstallService.IS_UBUNTU_UPGRADABLE" />
+                <action android:name="com.canonical.ubuntuinstaller.UbuntuInstallService.UPDATE_STORAGE_USE" />
+                <action android:name="com.canonical.ubuntuinstaller.UbuntuInstallService.CHECK_IF_UPDATE_AVAILABLE" />
+                <action android:name="com.canonical.ubuntuinstaller.UbuntuInstallService.CHECK_PENDING_UPDATES" />
+                <action android:name="com.canonical.ubuntuinstaller.UbuntuInstallService.PREPARE_ANDROID_UPDATE" />
             </intent-filter>
         </service>
     </application>
 
=== added file 'ant.properties'
--- ant.properties	1970-01-01 00:00:00 +0000
+++ ant.properties	2014-06-09 11:59:50 +0000
@@ -0,0 +1,21 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked in Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+#  'source.dir' for the location of your java source folder and
+#  'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+#  'key.store' for the location of your keystore and
+#  'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.
+
+java.encoding=UTF-8
+
+key.store=../humpolec.keystore
+key.alias=humpolec
 
=== removed file 'assets/archive-master.tar.xz'
 Binary files assets/archive-master.tar.xz	2013-12-08 16:01:23 +0000 and assets/archive-master.tar.xz	1970-01-01 00:00:00 +0000 differ
=== removed file 'assets/archive-master.tar.xz.asc'
--- assets/archive-master.tar.xz.asc	2013-12-08 16:01:23 +0000
+++ assets/archive-master.tar.xz.asc	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-iQIcBAABAgAGBQJRzXznAAoJEAv7hH8/Jy9b9MEP/iTl7lfFQNOu+bR+hRHOh40B
-trXCwTeKYGLL98h7pbqrqFD5QppGWZ5Kpyh5QeNB7yU8Jk5bcIQg3iTBg4kQhbjZ
-CvfBAk5goKDzHF+tx2HWFmHie3kxDlOQ39dWqr38Q78elC1VtRfiWQNbz7E2955D
-d5/Lo+THwKS0aYD8RR/wHbiEnIiOSxZLZo9Bdkxlty9LXbY16SUPY3R7POGdds0S
-OvQmsmFsjoD4b68aTjw0Fx12EQ1fDBycBmxNbgQ6E/xKf78Ttsp8gRaoopdr6odH
-FZWUCv0Vr7mrbSr8MrotydVRth5K/FJv4xnfTI9rY50PZqA72xFNfQyQa35/qfuZ
-3E+d9DdPk8KtovNCploTufRG5zvkXOn+rGJQCicLh4H2L7+YO5ZwHbDQFTDUrAhl
-0wlqaqUuwYOC7fxk3SHA3IINZ97LCUYfPWZRUUVOM2uia4BhI0TfRj09I+HnJM+I
-cNlfjmzCedlLjMwgBOw6tj1l3FEPl/aEwCTs1Oc7dc05JPDNcRqdks45NnSS/Xg7
-pNHPS6wED0zYAKQeBDkji7Gf+9gR3eVWWbArSzbkqyCeWhgPyqwjTUQNMx6PIPNm
-0lszQWe50Y9mOuwcRd2gA293zVjsnr7NxOJPhgZsHB9fRaZtSg7vWVOo1jopkPPZ
-Vt1nrVFGkrss7EJ+Vc53
-=Sszb
------END PGP SIGNATURE-----
 
=== added file 'assets/recovery-remount.tar.xz'
 Binary files assets/recovery-remount.tar.xz	1970-01-01 00:00:00 +0000 and assets/recovery-remount.tar.xz	2014-06-09 11:59:50 +0000 differ
=== modified file 'assets/system-image-upgrader'
--- assets/system-image-upgrader	2014-01-08 06:21:14 +0000
+++ assets/system-image-upgrader	2014-06-09 11:59:50 +0000
@@ -9,7 +9,7 @@
 fi
 
 BUSYBOX=busybox
-COMMAND_FILE=$1.applying
+COMMAND_FILE=$1
 PRIVATE_DIR=$2
 REMOVE_LIST="$COMMAND_FILE"
 TAR=u_tar
@@ -22,129 +22,14 @@
 
 # switch to the update command folder, which has the images
 cd $UPDATE_FOLDER
-mv $1 $1.applying
-
 
 # Functions
-verify_signature() {
-    return 0
-    # $1 => validation keyring name
-    # $2 => path to validate
-
-    if [ ! -e $2 ]; then
-        echo "File doesn't exist: $2"
-        return 1
-    fi
-
-    # Check against the blacklist
-    if [ -e ${TMP}/system-image/blacklist/pubring.gpg ]; then
-        export GNUPGHOME=${TMP}/system-image/blacklist/
-        if gpg --verify $2 >/dev/null 2>&1; then
-            echo "File signed by a blacklisted key: $2"
-            return 1
-        fi
-    fi
-
-    # Check against the keyring
-    export GNUPGHOME=${TMP}/system-image/$1/
-    if [ ! -e "$GNUPGHOME" ]; then
-        echo "Keyring doesn't exist: $1"
-        return 1
-    fi
-
-    if gpg --verify $2 >/dev/null 2>&1; then
-        return 0
-    fi
-}
-
-install_keyring() {
-    # $1 => full path to tarball
-    # $2 => full path to signature
-
-    # Some basic checks
-    if [ ! -e "$1" ] || [ ! -e "$2" ]; then
-        echo "Missing keyring files: $1 => $2"
-        return 1
-    fi
-
-    # Unpacking
-    TMPDIR=$($BUSYBOX mktemp -d ${TMP}/tempdir.XXXXXXXX)
-    cd $TMPDIR
-    cat $1 | $BUSYBOX unxz | $TAR xf -
-    if [ ! -e keyring.json ] || [ ! -e keyring.gpg ]; then
-        rm -Rf $TMPDIR
-        echo "Invalid keyring: $1"
-        return 1
-    fi
-
-    # Extract the expiry
-    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"
-        return 1
-    fi
-
-    # Extract the keyring type
-    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"
-        return 1
-    fi
-
-    if [ -e ${TMP}/system-image/$keyring_type ]; then
-        rm -Rf $TMPDIR
-        echo "Keyring already loaded: $1"
-        return 1
-    fi
-
-    signer="unknown"
-    case "$keyring_type" in
-        archive-master)
-            signer=""
-        ;;
-
-        image-master)
-            signer="archive-master"
-        ;;
-
-        image-signing|blacklist)
-            signer="image-master"
-        ;;
-
-        device-signing)
-            signer="image-signing"
-        ;;
-    esac
-
-    if [ -n "$signer" ] && ! verify_signature $signer $2; then
-        rm -Rf $TMPDIR
-        echo "Invalid signature: $1"
-        return 1
-    fi
-
-    mkdir ${TMP}/system-image/$keyring_type
-    chmod 700 ${TMP}/system-image/$keyring_type
-    mv $TMPDIR/keyring.gpg ${TMP}/system-image/$keyring_type/pubring.gpg
-    chmod 600 ${TMP}/system-image/$keyring_type/pubring.gpg
-    chown 0:0 ${TMP}/system-image/$keyring_type/pubring.gpg
-    rm -Rf $TMPDIR
-    return 0
-}
-
-# print out if we will need to create SWAP file
-if [ ! -e /data/SWAP.img ]; then
-    echo "SWAP-file-missing" >&2
-fi
+
 
 # Initialize GPG
 rm -Rf ${TMP}/system-image
 mkdir -p ${TMP}/system-image
-if [ -e ${PWD}/archive-master.tar.xz ]; then
-    echo "Loading keyring: archive-master.tar.xz"
-    install_keyring ${PWD}/archive-master.tar.xz ${PWD}/archive-master.tar.xz.asc
-fi
+
 
 # Process the command file
 FULL_IMAGE=0
@@ -159,11 +44,14 @@
                 system)
                     FULL_IMAGE=1
                     rm -f /data/system.img
+		    echo "Creating new system filesystem"
                     $BUSYBOX dd if=/dev/zero of=/data/system.img seek=500K bs=4096 count=1
                     $BUSYBOX mkfs.ext2 -F /data/system.img
+                    echo "New system filesystem created"
                 ;;
 
                 data)
+		    # formatting data partion -> just detele ubuntu bits 
                     rm -f /data/SWAP.img
                     rm -Rf /data/system-data
                     rm -Rf /data/user-data
@@ -176,25 +64,11 @@
         ;;
 
         load_keyring)
-            if [ ! -e "$UPDATE_FOLDER/$2" ] || [ ! -e "$UPDATE_FOLDER/$3" ]; then
-                echo "Skipping missing file: $2"
-                continue
-            fi
-            REMOVE_LIST="$REMOVE_LIST $UPDATE_FOLDER/$2 $UPDATE_FOLDER/$3"
-
-            echo "Loading keyring: $2"
-            install_keyring $UPDATE_FOLDER/$2 $UPDATE_FOLDER/$3
-
-            if [ -e ${TMP}/system-image/image-master/pubring.gpg ] && \
-               [ ! -e ${TMP}/system-image/blacklist/pubring.gpg ] && \
-               [ -e /data/system-data/var/lib/system-image/blacklist.tar.xz ] && \
-               [ -e /data/system-data/var/lib/system-image/blacklist.tar.xz.asc ]; then
-                echo "Loading blacklist keyring"
-                install_keyring /data/system-data/var/lib/system-image/blacklist.tar.xz /data/system-data/var/lib/system-image/blacklist.tar.xz.asc
-            fi
+            echo "Loading keys: $2 $3"
         ;;
 
         mount)
+            echo "Mounting: $2"
             case "$2" in
                 system)
                     mkdir -p /cache/system
@@ -208,8 +82,11 @@
         ;;
 
         unmount)
+            echo "Unmounting: $2"
             case "$2" in
                 system)
+                    # print out version info
+                    cat /cache/system/etc/system-image/channel.ini || true
                     aloopmount umount /cache/system && echo .
                     rmdir /cache/system
                 ;;
@@ -221,17 +98,13 @@
         ;;
 
         update)
-            if [ ! -e "$UPDATE_FOLDER/$2" ] || [ ! -e "$UPDATE_FOLDER/$3" ]; then
+            if [ ! -e "$UPDATE_FOLDER/$2" ]; then
                 echo "Skipping missing file: $2"
                 continue
             fi
 
-            REMOVE_LIST="$REMOVE_LIST $UPDATE_FOLDER/$2 $UPDATE_FOLDER/$3"
-            if ! verify_signature device-signing $UPDATE_FOLDER/$2 && \
-               ! verify_signature image-signing $UPDATE_FOLDER/$2; then
-                echo "Invalid signature"
-                continue
-            fi
+            REMOVE_LIST="$REMOVE_LIST $UPDATE_FOLDER/$2"
+
 
             echo "Applying update: $2"
             cd /cache
@@ -239,17 +112,19 @@
 
             # 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
+                $BUSYBOX cat $UPDATE_FOLDER/$2 | $BUSYBOX unxz | $TAR --checkpoint=400 -xf - removed >/dev/null || true
                 if [ -e removed ]; then
-                    while read file; do
+                    echo "Removing old files..."
+                    while read file; do 
                         rm -Rf $file
                     done < removed
                 fi
                 rm -f removed
+                echo "Adding new files..."
             fi
 
             # Unpack everything else on top of the system partition
-            cat $UPDATE_FOLDER/$2 | $BUSYBOX unxz | $TAR --checkpoint=200 -xf -
+            $BUSYBOX cat $UPDATE_FOLDER/$2 | $BUSYBOX unxz | $TAR --checkpoint=200 -xf -
             rm -f removed
 
             if [ -e "partitions/boot.img" ]; then
@@ -281,20 +156,17 @@
 
 # Remove the update files
 for file in $REMOVE_LIST; do
-    echo rm $file
+    rm $file
 done
 
-# Create the SWAP image if missing
-if [ ! -e /data/SWAP.img ]; then
-    echo "Creating SWAP device."
-    echo "SWAP Checkpoint 0" >&2
-    # create swap file in private folder, so service can watch progress
-    dd if=/dev/zero of=$PRIVATE_DIR/SWAP.img bs=4096 count=131072
-    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
-fi
+# Ensure we have sane permissions
+chmod 600 /data/system.img
+chown 0:0 /data/system.img
+
+# calculate sizes
+busybox du -sm /data/system.img || true
+busybox du -sm /data/system-data || true
+busybox du -sm /data/user-data || true
 
 touch /data/.last_update || true
 sync
 
=== removed file 'assets/u-reboot-app.tar.xz.asc'
--- assets/u-reboot-app.tar.xz.asc	2013-12-12 02:02:35 +0000
+++ assets/u-reboot-app.tar.xz.asc	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-iQIcBAABAgAGBQJRzXznAAoJEAv7hH8/Jy9b9MEP/iTl7lfFQNOu+bR+hRHOh40B
-trXCwTeKYGLL98h7pbqrqFD5QppGWZ5Kpyh5QeNB7yU8Jk5bcIQg3iTBg4kQhbjZ
-CvfBAk5goKDzHF+tx2HWFmHie3kxDlOQ39dWqr38Q78elC1VtRfiWQNbz7E2955D
-d5/Lo+THwKS0aYD8RR/wHbiEnIiOSxZLZo9Bdkxlty9LXbY16SUPY3R7POGdds0S
-OvQmsmFsjoD4b68aTjw0Fx12EQ1fDBycBmxNbgQ6E/xKf78Ttsp8gRaoopdr6odH
-FZWUCv0Vr7mrbSr8MrotydVRth5K/FJv4xnfTI9rY50PZqA72xFNfQyQa35/qfuZ
-3E+d9DdPk8KtovNCploTufRG5zvkXOn+rGJQCicLh4H2L7+YO5ZwHbDQFTDUrAhl
-0wlqaqUuwYOC7fxk3SHA3IINZ97LCUYfPWZRUUVOM2uia4BhI0TfRj09I+HnJM+I
-cNlfjmzCedlLjMwgBOw6tj1l3FEPl/aEwCTs1Oc7dc05JPDNcRqdks45NnSS/Xg7
-pNHPS6wED0zYAKQeBDkji7Gf+9gR3eVWWbArSzbkqyCeWhgPyqwjTUQNMx6PIPNm
-0lszQWe50Y9mOuwcRd2gA293zVjsnr7NxOJPhgZsHB9fRaZtSg7vWVOo1jopkPPZ
-Vt1nrVFGkrss7EJ+Vc53
-=Sszb
------END PGP SIGNATURE-----
 
=== removed file 'assets/upgrade-checker'
--- assets/upgrade-checker	2013-12-25 11:32:41 +0000
+++ assets/upgrade-checker	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-#!/system/bin/sh
-# Copyright (C) 2013 Canonical Ltd.
-#
-# Check if ubuntu_command exist
-# print the path and exit 0 if found.
-
-FILES=$@
-
-for file in $FILES ; do 
-    if [[ -f $file ]] ; then
-        echo $file
-        exit 1
-    fi
-done
-
-exit 0
 
=== modified file 'build.xml'
--- build.xml	2013-12-08 16:01:23 +0000
+++ build.xml	2014-06-09 11:59:50 +0000
@@ -1,31 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="MainActivity" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
+<project name="UbuntuInstaller" default="help">
+
+    <description>
+    *** Humpolec - Ubuntu Dual Boot for Android ***
+
+    http://launchpad.net/humpolec
+
+    Ubuntu Dual Boot is provided to developers who want to contribute to development
+    of Ubuntu for Phones and give them an ability to run Ubuntu and Android on
+    a single device. It is not intended to be used by regular users.
+
+    Make sure you have Android SDK installed!
+
+    Contact:
+    Ondrej Kubik     [e-mail]
+    Michal Karnicki  [e-mail]
+    </description>
+
+    <!-- Check if android is present. -->
+    <exec executable="./check-sdk.sh" failonerror="true">
+    </exec>
+
+    <property file="project.properties" />
+
+    <exec executable="android">
+        <arg value="update" />
+        <arg value="project" />
+        <arg value="-p" />
+        <arg value="." />
+        <arg value="-t" />
+        <arg value="${target}" />
+    <!-- Watch out: using name argument will ignore the custom build.xml version-tag! -->
+    </exec>
+
     <property file="local.properties" />
 
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
     <property file="ant.properties" />
 
     <!-- if sdk.dir was not set from one of the property file, then
@@ -37,17 +46,6 @@
         <isset property="env.ANDROID_HOME" />
     </condition>
 
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
     <!-- quick check on sdk.dir -->
     <fail
             message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
@@ -86,7 +84,7 @@
          In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
          in order to avoid having your file be overridden by tools such as "android update project"
     -->
-    <!-- version-tag: 1 -->
+    <!-- version-tag: custom -->
     <import file="${sdk.dir}/tools/ant/build.xml" />
 
 </project>
 
=== added file 'check-sdk.sh'
--- check-sdk.sh	1970-01-01 00:00:00 +0000
+++ check-sdk.sh	2014-06-09 11:59:50 +0000
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+ANDROIDBIN=$(which android)
+if test -z "${ANDROIDBIN}"; then
+        echo "Android SDK tools not in PATH, fix with:" >&2
+        echo "   PATH=\$PATH:/PathToSDK/tools" >&2
+        exit 1
+fi
+
+exit 0
 
=== removed file 'make_release.sh'
--- make_release.sh	2013-12-20 03:39:53 +0000
+++ make_release.sh	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
- #!/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 'project.properties'
--- project.properties	2013-12-12 02:02:35 +0000
+++ project.properties	2014-06-09 11:59:50 +0000
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=Google Inc.:Google APIs:19
+target=android-19
 
=== added file 'res/drawable-hdpi/ic_action_discard.png'
 Binary files res/drawable-hdpi/ic_action_discard.png	1970-01-01 00:00:00 +0000 and res/drawable-hdpi/ic_action_discard.png	2014-06-09 11:59:50 +0000 differ
=== added file 'res/drawable-hdpi/ic_action_refresh.png'
 Binary files res/drawable-hdpi/ic_action_refresh.png	1970-01-01 00:00:00 +0000 and res/drawable-hdpi/ic_action_refresh.png	2014-06-09 11:59:50 +0000 differ
=== added file 'res/drawable-hdpi/ic_action_share.png'
 Binary files res/drawable-hdpi/ic_action_share.png	1970-01-01 00:00:00 +0000 and res/drawable-hdpi/ic_action_share.png	2014-06-09 11:59:50 +0000 differ
=== added directory 'res/drawable-ldpi'
=== added file 'res/drawable-mdpi/ic_action_discard.png'
 Binary files res/drawable-mdpi/ic_action_discard.png	1970-01-01 00:00:00 +0000 and res/drawable-mdpi/ic_action_discard.png	2014-06-09 11:59:50 +0000 differ
=== added file 'res/drawable-mdpi/ic_action_refresh.png'
 Binary files res/drawable-mdpi/ic_action_refresh.png	1970-01-01 00:00:00 +0000 and res/drawable-mdpi/ic_action_refresh.png	2014-06-09 11:59:50 +0000 differ
=== added file 'res/drawable-mdpi/ic_action_share.png'
 Binary files res/drawable-mdpi/ic_action_share.png	1970-01-01 00:00:00 +0000 and res/drawable-mdpi/ic_action_share.png	2014-06-09 11:59:50 +0000 differ
=== added file 'res/drawable-xhdpi/ic_action_discard.png'
 Binary files res/drawable-xhdpi/ic_action_discard.png	1970-01-01 00:00:00 +0000 and res/drawable-xhdpi/ic_action_discard.png	2014-06-09 11:59:50 +0000 differ
=== added file 'res/drawable-xhdpi/ic_action_refresh.png'
 Binary files res/drawable-xhdpi/ic_action_refresh.png	1970-01-01 00:00:00 +0000 and res/drawable-xhdpi/ic_action_refresh.png	2014-06-09 11:59:50 +0000 differ
=== added file 'res/drawable-xhdpi/ic_action_share.png'
 Binary files res/drawable-xhdpi/ic_action_share.png	1970-01-01 00:00:00 +0000 and res/drawable-xhdpi/ic_action_share.png	2014-06-09 11:59:50 +0000 differ
=== added file 'res/drawable-xhdpi/ic_stat_notify_ubuntu.png'
 Binary files res/drawable-xhdpi/ic_stat_notify_ubuntu.png	1970-01-01 00:00:00 +0000 and res/drawable-xhdpi/ic_stat_notify_ubuntu.png	2014-06-09 11:59:50 +0000 differ
=== added file 'res/drawable-xxhdpi/ic_action_discard.png'
 Binary files res/drawable-xxhdpi/ic_action_discard.png	1970-01-01 00:00:00 +0000 and res/drawable-xxhdpi/ic_action_discard.png	2014-06-09 11:59:50 +0000 differ
=== added file 'res/drawable-xxhdpi/ic_action_refresh.png'
 Binary files res/drawable-xxhdpi/ic_action_refresh.png	1970-01-01 00:00:00 +0000 and res/drawable-xxhdpi/ic_action_refresh.png	2014-06-09 11:59:50 +0000 differ
=== added file 'res/drawable-xxhdpi/ic_action_share.png'
 Binary files res/drawable-xxhdpi/ic_action_share.png	1970-01-01 00:00:00 +0000 and res/drawable-xxhdpi/ic_action_share.png	2014-06-09 11:59:50 +0000 differ
=== modified file 'res/layout/ubuntu_dualboot_launch.xml'
--- res/layout/ubuntu_dualboot_launch.xml	2013-12-12 02:02:35 +0000
+++ res/layout/ubuntu_dualboot_launch.xml	2014-06-09 11:59:50 +0000
@@ -10,18 +10,6 @@
     android:background="#FFFFFF"
     android:orientation="vertical" >
 
-    <com.canonical.ubuntu.widget.UbuntuButton
-        android:id="@+id/download"
-        style="@style/Button.Grey"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_gravity="center_horizontal"
-        android:adjustViewBounds="true"
-        android:text="hi"
-        android:textColor="@color/text"
-        u1f:customFont="Ubuntu-R.ttf" />
-
     <com.canonical.ubuntu.widget.UbuntuTextView
         android:id="@+id/title"
         android:layout_width="wrap_content"
@@ -54,7 +42,7 @@
                 android:layout_alignParentLeft="true"
                 android:layout_centerHorizontal="true"
                 android:layout_margin="2dp"
-                android:text="Info:"
+                android:text="Build number:"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textColor="@color/ubuntuorange"
                 android:textStyle="bold"
@@ -84,7 +72,7 @@
                 android:layout_alignParentLeft="true"
                 android:layout_centerHorizontal="true"
                 android:layout_margin="2dp"
-                android:text="Info:"
+                android:text="Channel:"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textColor="@color/ubuntuorange"
                 android:textStyle="bold"
@@ -97,7 +85,7 @@
                 android:layout_margin="2dp"
                 android:layout_toRightOf="@id/channel_label"
                 android:singleLine="true"
-                android:text="add version"
+                android:text="add channel"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textColor="@color/text"
                 u1f:customFont="Ubuntu-R.ttf" />
@@ -108,13 +96,43 @@
             android:layout_height="wrap_content" >
 
             <com.canonical.ubuntu.widget.UbuntuTextView
+                android:id="@+id/ref_channel_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_centerHorizontal="true"
+                android:layout_margin="2dp"
+                android:text="Target Channel:"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@color/ubuntuorange"
+                android:textStyle="bold"
+                u1f:customFont="Ubuntu-R.ttf" />
+
+            <com.canonical.ubuntu.widget.UbuntuTextView
+                android:id="@+id/ref_channel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="2dp"
+                android:layout_toRightOf="@id/ref_channel_label"
+                android:singleLine="true"
+                android:text="add channel"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@color/text"
+                u1f:customFont="Ubuntu-R.ttf" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" >
+
+            <com.canonical.ubuntu.widget.UbuntuTextView
                 android:id="@+id/description_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
                 android:layout_centerHorizontal="true"
                 android:layout_margin="2dp"
-                android:text="Info:"
+                android:text="Description:"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textColor="@color/ubuntuorange"
                 android:textStyle="bold"
@@ -125,43 +143,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="2dp"
-                android:layout_toRightOf="@id/description_label"
-                android:singleLine="true"
-                android:text="add version"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="@color/text"
-                u1f:customFont="Ubuntu-R.ttf" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" >
-
-            <com.canonical.ubuntu.widget.UbuntuTextView
-                android:id="@+id/total_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_centerHorizontal="true"
-                android:layout_margin="2dp"
-                android:text="Info:"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="@color/ubuntuorange"
-                android:textStyle="bold"
-                u1f:customFont="Ubuntu-R.ttf" />
-
-            <com.canonical.ubuntu.widget.UbuntuTextView
-                android:id="@+id/total"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="2dp"
-                android:layout_toRightOf="@id/total_label"
-                android:singleLine="true"
-                android:text="add version"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="@color/text"
-                u1f:customFont="Ubuntu-R.ttf" />
-        </RelativeLayout>
+                android:layout_below="@id/description_label"
+                android:singleLine="true"
+                android:text="add description"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@color/text"
+                u1f:customFont="Ubuntu-R.ttf" />
+        </RelativeLayout>
+
 
         <View
             android:id="@+id/divider"
@@ -175,61 +164,120 @@
             android:layout_marginLeft="10dp" >
 
             <com.canonical.ubuntu.widget.UbuntuTextView
-                android:id="@+id/app_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_centerHorizontal="true"
-                android:layout_margin="2dp"
-                android:text="Info:"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="@color/text"
-                android:textStyle="bold"
-                u1f:customFont="Ubuntu-R.ttf" />
-
-            <com.canonical.ubuntu.widget.UbuntuTextView
-                android:id="@+id/appsize"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="2dp"
-                android:layout_toRightOf="@id/app_label"
-                android:singleLine="true"
-                android:text="add version"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="@color/text"
-                u1f:customFont="Ubuntu-R.ttf" />
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp" >
-
-            <com.canonical.ubuntu.widget.UbuntuTextView
-                android:id="@+id/data_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_centerHorizontal="true"
-                android:layout_margin="2dp"
-                android:text="Info:"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="@color/text"
-                android:textStyle="bold"
-                u1f:customFont="Ubuntu-R.ttf" />
-
-            <com.canonical.ubuntu.widget.UbuntuTextView
-                android:id="@+id/datasize"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="2dp"
-                android:layout_toRightOf="@id/data_label"
-                android:singleLine="true"
-                android:text="add version"
+                android:id="@+id/rootfs_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_centerHorizontal="true"
+                android:layout_margin="2dp"
+                android:text="rootfs:"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@color/text"
+                android:textStyle="bold"
+                u1f:customFont="Ubuntu-R.ttf" />
+
+            <com.canonical.ubuntu.widget.UbuntuTextView
+                android:id="@+id/rootfssize"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="2dp"
+                android:layout_toRightOf="@id/rootfs_label"
+                android:singleLine="true"
+                android:text="used MB"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@color/text"
+                u1f:customFont="Ubuntu-R.ttf" />
+        </RelativeLayout>
+
+
+        
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp" >
+
+            <com.canonical.ubuntu.widget.UbuntuTextView
+                android:id="@+id/system_data_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_centerHorizontal="true"
+                android:layout_margin="2dp"
+                android:text="System-data:"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@color/text"
+                android:textStyle="bold"
+                u1f:customFont="Ubuntu-R.ttf" />
+
+            <com.canonical.ubuntu.widget.UbuntuTextView
+                android:id="@+id/system_data_size"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="2dp"
+                android:layout_toRightOf="@id/system_data_label"
+                android:singleLine="true"
+                android:text="used MB"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@color/text"
+                u1f:customFont="Ubuntu-R.ttf" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp" >
+
+            <com.canonical.ubuntu.widget.UbuntuTextView
+                android:id="@+id/user_data_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_centerHorizontal="true"
+                android:layout_margin="2dp"
+                android:text="User-data:"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@color/text"
+                android:textStyle="bold"
+                u1f:customFont="Ubuntu-R.ttf" />
+
+            <com.canonical.ubuntu.widget.UbuntuTextView
+                android:id="@+id/user_datasize"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="2dp"
+                android:layout_toRightOf="@id/user_data_label"
+                android:singleLine="true"
+                android:text="used MB"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textColor="@color/text"
                 u1f:customFont="Ubuntu-R.ttf" />
         </RelativeLayout>
     </LinearLayout>
 
+    <com.canonical.ubuntu.widget.UbuntuButton
+        android:id="@+id/upgrade"
+        style="@style/Button.Grey"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="14dp"
+        android:layout_above="@+id/reboot"
+        android:adjustViewBounds="true"
+        android:text="Install Upgrade"
+        android:textColor="@color/text"
+        u1f:customFont="Ubuntu-R.ttf" />
+        
+    <com.canonical.ubuntu.widget.UbuntuButton
+        android:id="@+id/reboot"
+        style="@style/Button.Grey"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="14dp"
+        android:adjustViewBounds="true"
+        android:text="Boot Ubuntu"
+        android:textColor="@color/text"
+        u1f:customFont="Ubuntu-R.ttf" />
+
 </RelativeLayout>
 \ No newline at end of file
 
=== modified file 'res/menu/installer_menu.xml'
--- res/menu/installer_menu.xml	2013-12-25 03:13:44 +0000
+++ res/menu/installer_menu.xml	2014-06-09 11:59:50 +0000
@@ -1,19 +1,15 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <item
-        android:id="@+id/action_delete_download"
+        android:id="@+id/menu_action_delete_download"
         android:orderInCategory="100"
-        android:showAsAction="never"
+        android:showAsAction="ifRoom"
+        android:icon="@drawable/ic_action_discard"
         android:title="@string/action_detele_download"/>
     <item
-        android:id="@+id/action_dump_terminal"
+        android:id="@+id/menu_action_dump_terminal"
         android:orderInCategory="100"
-        android:showAsAction="never"
+        android:showAsAction="ifRoom"
+        android:icon="@drawable/ic_action_share"
         android:title="@string/action_dump_terminal"/>
-<!--  <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-20 03:39:53 +0000
+++ res/menu/launcher_menu.xml	2014-06-09 11:59:50 +0000
@@ -1,20 +1,29 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/action_uninstall"
+    <item
+        android:id="@+id/menu_action_update_android"
+        android:orderInCategory="100"
+        android:showAsAction="never"
+        android:title="@string/android_update_menu_option"/>
+    <item
+        android:id="@+id/menu_action_uninstall"
         android:orderInCategory="100"
         android:showAsAction="never"
         android:title="@string/action_uninstall"/>
     <item
-        android:id="@+id/action_del_user_data"
+        android:id="@+id/menu_action_del_user_data"
         android:orderInCategory="100"
-        android:showAsAction="never"
+        android:showAsAction="ifRoom"
+        android:icon="@drawable/ic_action_discard"
         android:title="@string/action_delete_user_data"/>
-    
-<!--    <item
-        android:id="@+id/action_settings"
+    <item
+        android:id="@+id/menu_action_update_storage_use"
         android:orderInCategory="100"
         android:showAsAction="never"
-        android:title="@string/action_settings"/>
--->
+        android:title="@string/action_update_storage_use"/>
+    <item
+        android:id="@+id/menu_action_check_for_update"
+        android:orderInCategory="100"
+        android:showAsAction="ifRoom"
+        android:icon="@drawable/ic_action_refresh"
+        android:title="@string/action_check_for_update"/>
 </menu>
 
=== modified file 'res/values/attrs.xml'
--- res/values/attrs.xml	2013-12-10 14:26:08 +0000
+++ res/values/attrs.xml	2014-06-09 11:59:50 +0000
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 /*
- * This file is part of Ubuntu for Android.
+ * This file is part of Ubuntu dualboot installer for Android.
  * Copyright 2013 Canonical Ltd.
  * 
- * Ubuntu for Android is free software: you can redistribute it and/or modify
+ * Ubuntu dualboot installer is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation.
  *
- * Ubuntu for Android is distributed in the hope that it will be useful,
+ * Ubuntu dualboot installer is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Ubuntu for Android. If not, see <http://www.gnu.org/licenses/>.
+ * along with Ubuntu dualboot installer. If not, see <http://www.gnu.org/licenses/>.
  */
 -->
 
 
=== modified file 'res/values/colors.xml'
--- res/values/colors.xml	2013-12-10 14:26:08 +0000
+++ res/values/colors.xml	2014-06-09 11:59:50 +0000
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 /*
- * This file is part of Ubuntu for Android.
+ * This file is part of Ubuntu dualboot installer for Android.
  * Copyright 2013 Canonical Ltd.
  * 
- * Ubuntu for Android is free software: you can redistribute it and/or modify
+ * Ubuntu dualboot installer is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation.
  *
- * Ubuntu for Android is distributed in the hope that it will be useful,
+ * Ubuntu dualboot installer is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Ubuntu for Android. If not, see <http://www.gnu.org/licenses/>.
+ * along with Ubuntu dualboot installer. If not, see <http://www.gnu.org/licenses/>.
  */
 -->
 
 
=== added file 'res/values/ids.xml'
--- res/values/ids.xml	1970-01-01 00:00:00 +0000
+++ res/values/ids.xml	2014-06-09 11:59:50 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * This file is part of Ubuntu dualboot installer for Android.
+ * Copyright 2013 Canonical Ltd.
+ * 
+ * Ubuntu dualboot installer is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ *
+ * Ubuntu dualboot installer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Ubuntu dualboot installer. If not, see <http://www.gnu.org/licenses/>.
+ */
+-->
+
+<resources>
+    <item type="id" name="ubuntu_notification" />
+    <item type="id" name="ubuntu_progress_notification" />
+    <item type="id" name="ubuntu_update_notification" />
+    <item type="id" name="android_update_notification" />
+</resources>
 \ No newline at end of file
 
=== modified file 'res/values/strings.xml'
--- res/values/strings.xml	2014-01-09 08:54:46 +0000
+++ res/values/strings.xml	2014-06-09 11:59:50 +0000
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * This file is part of Ubuntu dualboot installer for Android.
+ * Copyright 2013 Canonical Ltd.
+ * 
+ * Ubuntu dualboot installer is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ *
+ * Ubuntu dualboot installer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Ubuntu dualboot installer. If not, see <http://www.gnu.org/licenses/>.
+ */
+-->
+
 <resources>
     <string name="yes">Yes</string>
     <string name="no">No</string>
@@ -11,50 +30,87 @@
     <string name="action_dump_terminal">Dump Terminal</string>
     <string name="action_install">Install</string>
     <string name="action_uninstall">Uninstall Ubuntu</string>
+    
     <string name="action_uninstall_button">Uninstall</string>
-    <string name="action_delete_user_data">Delete Ubuntu user data</string>
+    <string name="action_uninstall_ubuntu">Uninstall Ubuntu</string>
+    <string name="action_delete_user_data">Delete Ubuntu data</string>
+    <string name="action_update_storage_use">Update storage use</string>
+    <string name="action_check_for_update">Check for update</string>
     <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">Choose channel to install</string>
+    <string name="welcome_world">Your life is about to change, welcome to the Ubuntu installer</string>
+    <string name="install_button_label_install">Choose which 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_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="install_button_label_resume_download">Resume download</string>
+    <string name="install_button_label_pause_download">Pause download</string>
+    <string name="install_button_label_installing">Installing....</string>
+    <string name="channel_picker_dialog_title">Select which channel to install</string>
+    <string name="version_picker_dialog_title">Select which version to install</string>
     <string name="bootstrap_check">bootstrap</string>
     <string name="latest_check">latest version</string>
     <string name="downloading_release">Downloading Ubuntu</string>
-    <string name="downloading_index">Downloading images data</string>
+    <string name="downloading_index">Downloading image data</string>
     <string name="downloading_starting">Starting download</string>
     <string name="installing_release">Installing Ubuntu</string>
     <string name="uninstall_dialog_title">Uninstall Ubuntu?</string>
+    <string name="uninstall_dialog_description">Ubuntu installation will be removed and resources freed. If not specified Ubuntu user data will not be deleted</string>
     <string name="uninstalling_ubuntu">Uninstalling Ubuntu</string>
     <string name="deleting_user_data">Deleting Ubuntu user data</string>
+    <string name="deleting_download">Deleting download</string>
     <string name="fail_fetching_versions">Fail to fetch available versions</string>
-    <string name="uninstall_dialog_message">This will remove all Ubuntu system files and Ubuntu swap file</string>
-    <string name="terminal_is_empty">Terminal is emtpy.</string>
-    <string name="terminal_dump_succ">Dump Terminal successfully to file on sdcard</string>
-    <string name="terminal_dump_fail">Dump Terminal failed to file on sdcard</string>
+    <string name="uninstall_dialog_message">This will remove all Ubuntu system files and the Ubuntu swap file</string>
+    <string name="terminal_is_empty">Terminal is empty.</string>
+    <string name="terminal_dump_succ">Dump Terminal to file on sdcard successful</string>
+    <string name="terminal_dump_fail">Dump Terminal to file on sdcard failed</string>
     <string name="external_storage_unavailable">External Storage is not available</string>
 
     <string name="not_supported_title">Not supported</string>
-    <string name="not_supported_message_fmt">It appears that your device (%s) is not on the supported list of Ubuntu for Phone dual boot installer. Visit <a href="https://wiki.ubuntu.com/Touch/DualBootInstallation">https://wiki.ubuntu.com/Touch/DualBootInstallation</a> to see phones that is supported.</string>
+    <string name="not_supported_message_fmt">It appears that your device (%s) is not supported by the Ubuntu for Phone dual boot installer. Visit <a href="https://wiki.ubuntu.com/Touch/DualBootInstallation">https://wiki.ubuntu.com/Touch/DualBootInstallation</a> to see which phones are supported.</string>
 
     <string name="no_network_dialog_title">Network not available</string>
     <string name="enable_network">Enable WiFi</string>
+    <string name="not_available">Not available</string>
+    
+    <string name="android_update_dialog_title">Android system update detected</string>
+    <string name="android_update_dialog_possitive">Prepare for update</string>
+    <string name="android_update_menu_option">Prepare for Android update</string>
+    <string name="android_update_dialog_description">Android system update has been detected. Original recovery needs to be restored to complete system update. This will not afect existing Ubuntu installation. Once system is prepared start Settings application and complete system update. It is likely update removes SuperUser capability, requiring reinstall of superuser(dualboot application), existing Ubuntu installation will be preserved.</string>
 
     <!-- Strings for LaunchActivity screen -->
     <string name="launch_title">Ubuntu</string>
     <string name="label_channel">Channel:</string>
+    <string name="label_channel_target">Target channel:</string>
     <string name="label_version">Version:</string>
     <string name="label_description">Description:</string>
+    <string name="label_rootfs">rootfs:</string>
+    <string name="label_system_data">system-data:</string>
+    <string name="label_user_data">user-data:</string>
     <string name="reboot_button_label">Reboot to Ubuntu</string>
-
+    <string name="button_install_ubuntu_update">Install Ubuntu update</string>
+    <string name="button_install_android_update">Install pending Android update</string>
+    
+    <string name="notification_title">Ubuntu</string>
+    <string name="notification_update_available">Ubuntu update available</string>
+    <string name="notification_update_installed">Ubuntu update installed</string>
+    <string name="notification_ubuntu_installed">Ubuntu installed</string>
+    <string name="notification_download_failed">Ubuntu download failed</string>
+    <string name="notification_installation_failed">Ubuntu installation failed</string>
+    <string name="notification_downloading_release">Downloading Ubuntu release</string>
+    <string name="notification_downloading_update">Downloading Ubuntu update</string>
+    <string name="notification_installing_release">Installing Ubuntu release</string>
+    <string name="notification_installing_update">Installing Ubuntu update</string>
+    <string name="notification_android_update">Android update available</string>
+    <string name="not_enough_charge_warning">Battery level is too low to continue with installation</string>
+    
     <string-array name="uninstall_options">
         <item>Delete user data</item>
     </string-array>
+    
+    <string-array name="update_android_options">
+        <item>Never ask again</item>
+    </string-array>
+    
 </resources>
 
 
=== modified file 'res/values/styles.xml'
--- res/values/styles.xml	2013-12-10 14:26:08 +0000
+++ res/values/styles.xml	2014-06-09 11:59:50 +0000
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 /*
- * This file is part of Ubuntu for Android.
+ * This file is part of Ubuntu dualboot installer for Android.
  * Copyright 2013 Canonical Ltd.
  * 
- * Ubuntu for Android is free software: you can redistribute it and/or modify
+ * Ubuntu dualboot installer is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation.
  *
- * Ubuntu for Android is distributed in the hope that it will be useful,
+ * Ubuntu dualboot installer is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Ubuntu for Android. If not, see <http://www.gnu.org/licenses/>.
+ * along with Ubuntu dualboot installer. If not, see <http://www.gnu.org/licenses/>.
  */
 -->
 
 
=== added file 'src/com/canonical/ubuntu/installer/BaseActivity.java'
--- src/com/canonical/ubuntu/installer/BaseActivity.java	1970-01-01 00:00:00 +0000
+++ src/com/canonical/ubuntu/installer/BaseActivity.java	2014-06-09 11:59:50 +0000
@@ -0,0 +1,70 @@
+/*
+ * This file is part of Ubuntu dualboot installer for Android.
+ * Copyright 2013 Canonical Ltd.
+ * 
+ * Ubuntu dualboot installer is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ *
+ * Ubuntu dualboot installer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Ubuntu dualboot installer. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.canonical.ubuntu.installer;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.IBinder;
+
+public class BaseActivity extends Activity {
+    public UbuntuInstallService mInstallerService;
+    private boolean mServiceIsBound;
+    
+    public BaseActivity() {
+    }
+     
+    private ServiceConnection mConnection = new ServiceConnection() {
+        public void onServiceConnected(ComponentName className, IBinder service) {
+            mInstallerService = ((UbuntuInstallService.LocalBinder)service).getService();
+            onInstallerServiceConnected();
+        }
+
+        public void onServiceDisconnected(ComponentName className) {
+            mInstallerService = null;
+            onInstallerServiceDisconnected();
+        }
+    };
+    
+    void doBindService() {
+        bindService(new Intent(this, UbuntuInstallService.class), mConnection, Context.BIND_AUTO_CREATE);
+        mServiceIsBound = true;        
+    }
+
+    void doUnbindService() {
+        if (mServiceIsBound) {
+            // Detach our existing connection.
+            unbindService(mConnection);
+            mServiceIsBound = false;
+        }
+    }
+
+    /**
+     * Overwrite this function to handle service connected
+     */
+    protected void onInstallerServiceConnected() {        
+    }
+    
+    /**
+     * Overwrite this function to handle service disconnected
+     */
+    protected void onInstallerServiceDisconnected() {        
+    }
+}
 
=== added file 'src/com/canonical/ubuntu/installer/BootReceiver.java'
--- src/com/canonical/ubuntu/installer/BootReceiver.java	1970-01-01 00:00:00 +0000
+++ src/com/canonical/ubuntu/installer/BootReceiver.java	2014-06-09 11:59:50 +0000
@@ -0,0 +1,39 @@
+/*
+ * This file is part of Ubuntu dualboot installer for Android.
+ * Copyright 2013 Canonical Ltd.
+ * 
+ * Ubuntu dualboot installer is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ *
+ * Ubuntu dualboot installer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Ubuntu dualboot installer. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.canonical.ubuntu.installer;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.util.Log;
+
+public class BootReceiver extends BroadcastReceiver {
+	private static final String TAG = "UbuntuBootReceiver";
+
+	@Override
+	public void onReceive(Context context, Intent intent) {
+	    // check if there is any Ubuntu update pending
+        SharedPreferences sp = context.getSharedPreferences( UbuntuInstallService.SHARED_PREF, Context.MODE_PRIVATE);
+        if (sp.getBoolean(UbuntuInstallService.PREF_KEY_UBUNTU_INSTALLED, false)) {
+            // register alarm for periodical update checks
+            Log.d(TAG, "Setting up alarm for update checks");
+            Utils.registerUpdateCheckAlarm(context, sp);
+        }	    
+	}
+}
 
=== modified file 'src/com/canonical/ubuntu/installer/InstallActivity.java'
--- src/com/canonical/ubuntu/installer/InstallActivity.java	2014-01-09 08:54:46 +0000
+++ src/com/canonical/ubuntu/installer/InstallActivity.java	2014-06-09 11:59:50 +0000
@@ -1,3 +1,20 @@
+/*
+ * This file is part of Ubuntu dualboot installer for Android.
+ * Copyright 2013 Canonical Ltd.
+ * 
+ * Ubuntu dualboot installer is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ *
+ * Ubuntu dualboot installer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Ubuntu dualboot installer. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package com.canonical.ubuntu.installer;
 
 import java.io.File;
@@ -13,7 +30,7 @@
 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.installer.UbuntuInstallService.ReleaseType;
 import com.canonical.ubuntu.widget.UbuntuButton;
 
 import android.net.ConnectivityManager;
@@ -22,7 +39,6 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
@@ -44,36 +60,53 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.ViewTreeObserver;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-public class InstallActivity extends Activity {
+public class InstallActivity extends BaseActivity {
     private static final String TAG = "UbuntuInstaller";
 
     private UbuntuButton mInstallButton;
-    private boolean mObserversRegistered;
-
-    private InstallerState mStatus = InstallerState.READY;
-    private VersionInfo mDownloadedVersion = null;
-    
     private ProgressBar mProgressBar;
-    private TextView mProgressText;
-    
+    private TextView mProgressText;   
     private TextView mTerminal;
-    private HashMap<String, String> mAvailableChannels = new HashMap<String, String>();
+    private ViewTreeObserver.OnGlobalLayoutListener mTerminalLayoutObserver;
+
+    private String mServerUrl;
+    private boolean mObserversRegistered;   
+    private HashMap<String, String> mAvailableChannels = null;
+    private SharedPreferences mSp;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        doBindService();        
         if (! Utils.isDeviceSupported()) {
             Log.d(TAG, "Device is not supported: " + Build.DEVICE);
             showNotCompatibleDialog();
         }
-
+        mSp = getSharedPreferences(UbuntuInstallService.SHARED_PREF, Context.MODE_PRIVATE);
+        // Pick default server URL
+        mServerUrl = Utils.getReleaseServerUrl(this);
+        
         // check is there is already Ubuntu installed
-        checkIfUbuntuIsInstalled();
         if (isFinishing()) return;
 
+        Intent i = getIntent();
+        String updateCommand = i.getStringExtra("updateCommand");
+        if (updateCommand != null) {
+            Log.e(TAG,"Started with upadteCommand:" + updateCommand);
+            File updateCommandFile = new File(updateCommand);
+            if (updateCommandFile.exists()) {
+                mSp.edit()
+                .putString(UbuntuInstallService.PREF_KEY_UPDATE_COMMAND, updateCommand)
+                .putInt(UbuntuInstallService.PREF_KEY_DOWNLOAD_TYPE, UbuntuInstallService.ReleaseType.FULL.getValue())
+                .commit();
+                Utils.parseAndUpdateInstallCommand(this, updateCommandFile);
+            }
+        }
+
         setContentView(R.layout.ubuntu_dualboot_install);
         mInstallButton = (UbuntuButton) findViewById(R.id.download);
         mProgressBar = (ProgressBar) findViewById(R.id.progress);
@@ -82,44 +115,55 @@
         mTerminal.setMovementMethod(new ScrollingMovementMethod());
         mProgressBar.setEnabled(false);
         mProgressBar.setProgress(0);
-
-        SharedPreferences pref = getSharedPreferences(UbuntuInstallService.SHARED_PREF, Context.MODE_PRIVATE);
-        pref.edit().putBoolean(UbuntuInstallService.PREF_KEY_DEVELOPER, true).commit();
-    }
-
+        mTerminalLayoutObserver = new ViewTreeObserver.OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+               // update scrolling
+               final int scrollAmount = mTerminal.getLayout().getLineTop(mTerminal.getLineCount()) - mTerminal.getHeight();
+               mTerminal.scrollTo(0, scrollAmount);
+
+            }
+        };
+        mSp.edit().putBoolean(UbuntuInstallService.PREF_KEY_DEVELOPER, true).commit();
+    }
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        doUnbindService();
+    }
+    
     @Override
     public void onResume() {
         super.onResume();
         // check is there is already Ubuntu installed
-        checkIfUbuntuIsInstalled();
+        checkActivityStillValid();
         if (isFinishing()) return;
 
-        // verify if network is available for download.
-        isNetworkAvailable();
-
         mInstallButton.setOnClickListener(mInstallButtonListener);
         IntentFilter filter = new IntentFilter();
         filter.addAction(UbuntuInstallService.AVAILABLE_CHANNELS);
         filter.addAction(UbuntuInstallService.DOWNLOAD_RESULT);
         filter.addAction(UbuntuInstallService.PROGRESS);
+        filter.addAction(UbuntuInstallService.PROGRESS_OUPUT);
         filter.addAction(UbuntuInstallService.INSTALL_RESULT);
-        filter.addAction(UbuntuInstallService.VERSION_UPDATE);
-        filter.addAction(UbuntuInstallService.SERVICE_STATE);
+        filter.addAction(UbuntuInstallService.SERVICE_STATE_CHANGED);
         registerReceiver(mServiceObserver, filter);
         mObserversRegistered = true;
 
         // do we know last activity
-        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());
-            if (mDownloadedVersion == null) {
-                requestChannelList();
+        if (mInstallerService != null) {
+            InstallerState state = mInstallerService.getServiceState();
+            if (state == InstallerState.DOWNLOADING || state == InstallerState.INSTALLING) {
+                // request last progress / status. this will update UI accordingly
+                mProgressBar.setProgress(mInstallerService.getActionProgress());
             }
+            updateUiElements();
+            updateOuputTextview();
         }
-        requestServiceState();
+        // register view tree observer for terminal
+        ViewTreeObserver vto = mTerminal.getViewTreeObserver();
+        vto.addOnGlobalLayoutListener(mTerminalLayoutObserver);
+
     }
     
     @Override
@@ -131,6 +175,8 @@
             unregisterReceiver(mServiceObserver);
         }
         mObserversRegistered = false;
+        ViewTreeObserver vto = mTerminal.getViewTreeObserver();
+        vto.removeOnGlobalLayoutListener(mTerminalLayoutObserver);
     }
 
     @Override
@@ -143,16 +189,12 @@
     @Override
     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);
+            case R.id.menu_action_delete_download:
+                Intent action = new Intent(UbuntuInstallService.DELETE_DOWNLOAD);
                 startService(action);
-                deleteDownload();
-                mDownloadedVersion = null;
-                requestServiceState();
+                Utils.showToast(this.getApplicationContext(), R.string.deleting_download);
                 break;
-            case R.id.action_dump_terminal:
+            case R.id.menu_action_dump_terminal:
                 CharSequence terminalText = mTerminal.getText();
                 if (terminalText.length() == 0) {
                     Utils.showToast(this.getApplicationContext(), R.string.terminal_is_empty);
@@ -200,45 +242,42 @@
         context.startActivity(intent);
     }
 
-    private void checkIfUbuntuIsInstalled() {
+    /**
+     * Check is this activity is still valid, or we should switch to another one
+     */
+    protected void checkActivityStillValid() {
         // check is there is Ubuntu installed or is upgradeable
-        if (UbuntuInstallService.isUbuntuInstalled(getApplicationContext())) {
-            if(!UbuntuInstallService.isUpgradeable(getApplicationContext())) {
-                Log.d(TAG, "go to launch screen, and kill Install activity");
-                LaunchActivity.startFrom(this);
-                finish();
-            }
-        }
+        if (mInstallerService != null 
+            && mSp.getBoolean(UbuntuInstallService.PREF_KEY_UBUNTU_INSTALLED, false)
+            && mInstallerService.getServiceState() != InstallerState.INSTALLING
+            && mInstallerService.getServiceState() != InstallerState.DOWNLOADING ) {
+            Log.d(TAG, "go to launch screen, and kill Install activity");
+            LaunchActivity.startFrom(this);
+            mAvailableChannels = null;
+            finish();            
+        }        
     }
 
     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);
-    }
-    
+    	mAvailableChannels = null;
+    	Intent i = new Intent(UbuntuInstallService.GET_CHANNEL_LIST);
+    	i.putExtra(UbuntuInstallService.GET_CHANNEL_LIST_EXTRA_SERVER_URL, mServerUrl);
+        startService(i);
+    }
+        
     OnClickListener mInstallButtonListener = new OnClickListener() {
         @Override
         public void onClick(View v) {
             // 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 == InstallerState.DOWNLOADING) {
-                Intent startInstall = new Intent(UbuntuInstallService.CANCEL_DOWNLOAD);
-                startService(startInstall);
-            } else if (mStatus == InstallerState.INSTALLING) {
-                Intent startInstall = new Intent(UbuntuInstallService.CANCEL_INSTALL);
-                startService(startInstall);
-            } else if (UbuntuInstallService.checkifReadyToInstall(v.getContext())) {
-                startInstallationIfPossible();
-            } else if (0 != mAvailableChannels.size()) {
+            // we need to handle also download resume
+            if (mInstallerService.getServiceState() == InstallerState.DOWNLOADING) {
+                mInstallerService.pauseDownload();
+            } else if (UbuntuInstallService.isReadyToInstall(mSp)) {
+                UbuntuInstallService.startInstallationIfPossible(v.getContext());
+            } else if (UbuntuInstallService.isDownloadActive(mSp)) {
+                startService(new Intent(UbuntuInstallService.RESUME_DOWNLOAD));
+            } else if (mAvailableChannels != null && 0 != mAvailableChannels.size()) {
                 // get list of aliases as array
                 String channels[] = mAvailableChannels.keySet().toArray(new String[mAvailableChannels.size()]);
                 // look for "trusty" as default channel
@@ -257,32 +296,21 @@
                                      true /* default latest settings*/).show();
             } else {
                 // there are no channels to pick from, this was mistake, disable button
-                requestServiceState();
+            	mAvailableChannels = null;
+                updateUiElements();
             }
         }
     };
     
-    private void updateInfoOnUiThread(final String text) {
+    private void updateOuputTextview() {
         this.runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                // keep old text in there 
-                mTerminal.setText(mTerminal.getText().toString() + "\n" + text);
-                final int scrollAmount = mTerminal.getLayout().getLineTop(mTerminal.getLineCount()) - mTerminal.getHeight();
-                mTerminal.scrollTo(0, scrollAmount);
+                mTerminal.setText(mInstallerService.getActionOutput());
             }
         });
     }
-
-    private void startInstallationIfPossible() {
-        // TODO: check if we have battery and progress to install
-        Intent startInstall = new Intent(UbuntuInstallService.INSTALL_UBUNTU);
-        startService(startInstall);
-        Utils.showToast(this, "Starting Ubuntu installation");
-        // reset progress bar
-        mProgressBar.setProgress(0);
-    }
-
+    
     TextPickerDialog.OnChannelPicktListener mInstallDialogListener 
                                 = new TextPickerDialog.OnChannelPicktListener() {
         public void onChannelPicked(Context context, String channel, boolean bootstrap, boolean latest) {
@@ -297,16 +325,16 @@
 
     private void startDownload(final String channel, final boolean bootstrap, final int version) {
         Intent startDownload = new Intent(UbuntuInstallService.DOWNLOAD_RELEASE);
-        startDownload.putExtra(UbuntuInstallService.DOWNLOAD_RELEASE_EXTRA_CHANNEL_ALIAS, channel);
+        startDownload.putExtra(UbuntuInstallService.DOWNLOAD_RELEASE_EXTRA_SERVER_URL, 
+                mServerUrl);
         startDownload.putExtra(UbuntuInstallService.DOWNLOAD_RELEASE_EXTRA_CHANNEL_URL, 
-              mAvailableChannels.get(channel));
+                mAvailableChannels.get(channel));
         startDownload.putExtra(UbuntuInstallService.DOWNLOAD_RELEASE_EXTRA_BOOTSTRAP, bootstrap);
         if (version != -1) {
             startDownload.putExtra(UbuntuInstallService.DOWNLOAD_RELEASE_EXTRA_VERSION, version);
         }
         startDownload.putExtra(UbuntuInstallService.DOWNLOAD_RELEASE_EXTRA_TYPE, ReleaseType.FULL.getValue());
         startService(startDownload);
-        mTerminal.setText(R.string.downloading_starting);
         mProgressBar.setProgress(0);
     }
     
@@ -317,9 +345,11 @@
         new Thread(new Runnable() {
             @Override
             public void run() {
-                String jsonStr = Utils.httpDownload(UbuntuInstallService.BASE_URL 
-                        + mAvailableChannels.get(channel));
-                // TODO: handle malformed JSON
+                String jsonStr = Utils.httpDownload( mServerUrl + mAvailableChannels.get(channel));
+                if (jsonStr == null) {
+                    Utils.showToast(context, "Wrong url to channel list");
+                    return;
+                }
                 final List<Image> releases = JsonChannelParser.getAvailableReleases(jsonStr, ReleaseType.FULL);
 
                 runOnUiThread(new Runnable() {
@@ -351,21 +381,45 @@
         }).start();
     }
 
-    private void updateUiElements() {
+    @Override
+    protected void onInstallerServiceConnected() {
+        updateUiElements();
+        updateOuputTextview();
+    }
+
+    protected void updateUiElements() {
+        checkActivityStillValid();
+        if (isFinishing()) return;
         this.runOnUiThread(new Runnable() {
             @Override
-            public void run() {
-                Log.v(TAG,"updateUiElements(" + mStatus + ")");
-                switch (mStatus) {
+            public void run() {                
+                InstallerState state = mInstallerService.getServiceState();                
+                Log.v(TAG,"updateUiElements(" + state + ")");
+                // check if should fetch list of channels
+                if ( state == InstallerState.READY
+                     && state != InstallerState.FETCHING_CHANNELS
+                     && mAvailableChannels == null 
+                     && isNetworkAvailable() 
+                     && ! UbuntuInstallService.isDownloadActive(mSp)
+                     && ! UbuntuInstallService.isReadyToInstall(mSp)) {
+                       requestChannelList();
+                   }                
+                switch (state) {
                     case READY:
                     {
-                        if (mDownloadedVersion != null) {
+                        if (UbuntuInstallService.isDownloadActive(mSp)) {
+                            mInstallButton.setText(R.string.install_button_label_resume_download);
+                            mInstallButton.setEnabled(true);
+                            mProgressBar.setEnabled(false);
+                            mProgressBar.setProgress(0);
+                            mProgressText.setText("");                            
+                        } else if (UbuntuInstallService.isReadyToInstall(mSp)) {
                             mInstallButton.setText(R.string.install_button_label_resume);
                             mInstallButton.setEnabled(true);
                             mProgressBar.setEnabled(false);
                             mProgressBar.setProgress(0);
                             mProgressText.setText("");
-                        } else if (mAvailableChannels.size() > 0) {
+                        } else if (mAvailableChannels != null && mAvailableChannels.size() > 0) {
                             mInstallButton.setText(R.string.install_button_label_install);
                             mInstallButton.setEnabled(true);
                             mProgressBar.setEnabled(false);
@@ -388,18 +442,24 @@
                         mProgressText.setText("");
                         break;                
                     case DOWNLOADING:
-                        mInstallButton.setText(R.string.install_button_label_cancel_download);
+                        mInstallButton.setText(R.string.install_button_label_pause_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);
+                        mInstallButton.setText(R.string.install_button_label_installing);
+                        mInstallButton.setEnabled(false);
                         mProgressBar.setEnabled(true);
+                        mProgressBar.setProgress(mInstallerService.getActionProgress());
                         mProgressText.setText(R.string.installing_release);
                         break;
+                    default:
+                        // ignore rest of the states
+                        break;
                 }
+                // dismiss notification we don't need
+                mInstallerService.dismissUbuntuNotification();
             }
         });
     }
@@ -410,63 +470,40 @@
         @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
-                if (!UbuntuInstallService.checkifReadyToInstall(context)) {
-                    mAvailableChannels = (HashMap<String, String>) 
-                            intent.getSerializableExtra(UbuntuInstallService.AVAILABLE_CHANNELS_EXTRA_CHANNELS);
-                    mStatus = InstallerState.READY;
-                    updateUiElements();
-                }
+                Log.v(TAG,"mServiceObserver: available channels received");
+                mAvailableChannels = (HashMap<String, String>) 
+                    intent.getSerializableExtra(UbuntuInstallService.AVAILABLE_CHANNELS_EXTRA_CHANNELS);
             // Handle progress
             } else if (action.equals(UbuntuInstallService.PROGRESS)) {
-                String p = intent.getStringExtra(UbuntuInstallService.PROGRESS_EXTRA_TEXT);
-                int progress = intent.getIntExtra(UbuntuInstallService.PROGRESS_EXTRA_INT, -1);
-                if (progress != -1) {
-                    mProgressBar.setProgress(progress);
-                    Log.d(TAG, "Progress: " + progress);
-                }
-                if (p != null  && !p.equals("")) {
-                    // update terminal with progress text
-                    updateInfoOnUiThread(p);
-                }
-
+                mProgressBar.setProgress(mInstallerService.getActionProgress());
+            } else if (action.equals(UbuntuInstallService.PROGRESS_OUPUT)) {
+                updateOuputTextview();
             // Handle install result 
             } else if(action.equals(UbuntuInstallService.INSTALL_RESULT)) {
+                Log.v(TAG,"mServiceObserver: installaction finished");
                 int r = intent.getIntExtra(UbuntuInstallService.INSTALL_RESULT_EXTRA_INT, -1);
                 if (r == 0) {
                     Utils.showToast(context, "Install completed");
                     mProgressBar.setProgress(100);
-                    deleteDownload();
-                    // go to launch screen, and kill this activity.
-                    LaunchActivity.startFrom(context);
-                    finish();
                 } else {
                     Utils.showToast(context, "Installation failed:");
                     String reason = intent.getStringExtra(UbuntuInstallService.INSTALL_RESULT_EXTRA_STR);
                     Utils.showToast(context, reason);
-                    updateInfoOnUiThread(reason);
-                    // if we still have download go back to resume installation
-                    // TODO: we should distinguish between resume/retry
-                    mDownloadedVersion = UbuntuInstallService.getDownloadedVersion(context);
-                    if (UbuntuInstallService.checkifReadyToInstall(context)) {
-                        mDownloadedVersion = UbuntuInstallService.getDownloadedVersion(context);
-                    } else {
-                        deleteDownload();
-                        mDownloadedVersion = null;
-                        requestChannelList();
-                    }
-                    updateUiElements();
+                    updateOuputTextview();
                 }
+                updateUiElements();
 
             // Handle download result
             } else if(action.equals(UbuntuInstallService.DOWNLOAD_RESULT)) {
+                Log.v(TAG,"mServiceObserver: download finished");
                 int r = intent.getIntExtra(UbuntuInstallService.DOWNLOAD_RESULT_EXTRA_INT, -1);
                 if (r == 0) {
-                    Utils.showToast(context, "Download completed, ready to install Ubuntu");
-                    startInstallationIfPossible();
+                    if (mInstallerService.getServiceState() == InstallerState.READY) {
+                        UbuntuInstallService.startInstallationIfPossible(context);
+                        mInstallerService.resetActionOutput();
+                    }
                 } else {
                     String reason = intent.getStringExtra(UbuntuInstallService.INSTALL_RESULT_EXTRA_STR);
                     // make sure it was not cancelled by user
@@ -474,27 +511,13 @@
                         reason = "Download failed: " + reason;
                     }
                     Utils.showToast(context, reason);
-
-                    // check if network is available for download.
-                    // isNetworkAvailable();
-
-                    updateInfoOnUiThread(reason);
-                    requestChannelList();
-                }
-            } else if (action.equals(UbuntuInstallService.VERSION_UPDATE)) {
-                checkIfUbuntuIsInstalled();
-                if (!isFinishing()) {
-                    // check what button should be shown
-                    if (UbuntuInstallService.checkifReadyToInstall(context)) {
-                        mDownloadedVersion = UbuntuInstallService.getDownloadedVersion(context);
-                    }
+                    updateOuputTextview();
                     updateUiElements();
                 }
-            } else if (action.equals(UbuntuInstallService.SERVICE_STATE)) {
-                checkIfUbuntuIsInstalled();
+            } else if (action.equals(UbuntuInstallService.SERVICE_STATE_CHANGED)) {
+                Log.v(TAG,"mServiceObserver: service state changed");
+                checkActivityStillValid();
                 if (!isFinishing()) {
-                    mStatus = InstallerState.fromOrdian(intent.getIntExtra(UbuntuInstallService.SERVICE_STATE, 0));
-                    mDownloadedVersion = UbuntuInstallService.getDownloadedVersion(context);
                     updateUiElements();
                 }
             }
@@ -507,7 +530,7 @@
      * 
      * @return true if network is available
      */
-    private boolean isNetworkAvailable () {
+    private boolean isNetworkAvailable() {
         final ConnectivityManager conMgr =  (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
         final NetworkInfo activeNetwork = conMgr.getActiveNetworkInfo();
         if (activeNetwork != null && activeNetwork.isConnected()) {
@@ -516,11 +539,12 @@
 
         Utils.createConfirmationDialog(this,
                 R.string.no_network_dialog_title,
+                0,
                 R.string.enable_network,
                 R.string.cancel,
                 new Intent(WifiManager.ACTION_PICK_WIFI_NETWORK),
-                -1, // toastText
-                -1, // choiceItemsArray
+                0, // toastText
+                0, // choiceItemsArray
                 null, // defaultChoiceValues
                 null // choiceClickListener
                 ).show();
 
=== modified file 'src/com/canonical/ubuntu/installer/JsonChannelParser.java'
--- src/com/canonical/ubuntu/installer/JsonChannelParser.java	2013-12-16 02:11:14 +0000
+++ src/com/canonical/ubuntu/installer/JsonChannelParser.java	2014-06-09 11:59:50 +0000
@@ -1,3 +1,20 @@
+/*
+ * This file is part of Ubuntu dualboot installer for Android.
+ * Copyright 2013 Canonical Ltd.
+ * 
+ * Ubuntu dualboot installer is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ *
+ * Ubuntu dualboot installer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Ubuntu dualboot installer. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package com.canonical.ubuntu.installer;
 
 import java.util.Collections;
@@ -5,7 +22,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import com.canonical.ubuntu.installer.VersionInfo.ReleaseType;
+import com.canonical.ubuntu.installer.UbuntuInstallService.ReleaseType;
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
@@ -26,6 +43,7 @@
     }
 
     public class Image {
+        Integer base;
         String description;
         Integer version;
         String type;
@@ -41,21 +59,25 @@
     static public List<Image> getAvailableReleases(String jsonStr, ReleaseType filter) {
         LinkedList<Image> releases = new LinkedList<Image>();
         
-        JsonObject index =  new JsonParser().parse(jsonStr).getAsJsonObject();
-        JsonArray images = index.get("images").getAsJsonArray();
-        int size = images.size();
-
-        for(int j = 0; j < size; j++) {
-            Image image = new Gson().fromJson(images.get(j), Image.class);
-            ReleaseType type = ReleaseType.UNKNOWN;
-            if (FULL_RELEASE.equals(image.type)) {
-                type = ReleaseType.FULL;
-            } else if (DELTA_RELEASE.equals(image.type)) {
-                type = ReleaseType.DELTA;
-            }
-            if (filter == type) {
-                releases.add(image);
-            }
+        try {
+            JsonObject index =  new JsonParser().parse(jsonStr).getAsJsonObject();
+            JsonArray images = index.get("images").getAsJsonArray();
+            int size = images.size();
+    
+            for(int j = 0; j < size; j++) {
+                Image image = new Gson().fromJson(images.get(j), Image.class);
+                ReleaseType type = ReleaseType.UNKNOWN;
+                if (FULL_RELEASE.equals(image.type)) {
+                    type = ReleaseType.FULL;
+                } else if (DELTA_RELEASE.equals(image.type)) {
+                    type = ReleaseType.DELTA;
+                }
+                if (filter == type) {
+                    releases.add(image);
+                }
+            }
+        } catch (com.google.gson.JsonSyntaxException e) {
+            // ignore, empty list will be returned
         }
         // sort list
         Collections.sort(releases, imageComparator());
 
=== modified file 'src/com/canonical/ubuntu/installer/LaunchActivity.java'
--- src/com/canonical/ubuntu/installer/LaunchActivity.java	2014-01-09 08:54:46 +0000
+++ src/com/canonical/ubuntu/installer/LaunchActivity.java	2014-06-09 11:59:50 +0000
@@ -1,12 +1,30 @@
+/*
+ * This file is part of Ubuntu dualboot installer for Android.
+ * Copyright 2013 Canonical Ltd.
+ * 
+ * Ubuntu dualboot installer is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ *
+ * Ubuntu dualboot installer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Ubuntu dualboot installer. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package com.canonical.ubuntu.installer;
 
-import android.app.Activity;
-import android.app.AlertDialog;
+import java.util.Locale;
+
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
@@ -15,80 +33,121 @@
 import android.view.View.OnClickListener;
 import android.widget.TextView;
 
+import com.canonical.ubuntu.installer.UbuntuInstallService.InstallerState;
 import com.canonical.ubuntu.widget.UbuntuButton;
 
-public class LaunchActivity extends Activity {
+public class LaunchActivity extends BaseActivity {
     private static final String TAG = "UbuntuLaunchActivity";
-    private UbuntuButton mRebootButton;
+    
+    private SharedPreferences mSharedPreferences;
+    private TextView mTextTitle;
     private TextView mTextChannel;
     private TextView mTextChannelLabel;
+    private TextView mTextRefChannel;
+    private TextView mTextRefChannelLabel;
     private TextView mTextVersion;
     private TextView mTextVersionLabel;
-    private TextView mTextTitle;
     private TextView mTextDescriptionLabel;
     private TextView mTextDescription;
-    private VersionInfo mUbuntuVersion;
+    private TextView mTextUseRootfs;
+    private TextView mTextUseRootfsLabel;
+    private TextView mTextUseSystemData;
+    private TextView mTextUseSystemDataLabel;
+    private TextView mTextUseUserData;
+    private TextView mTextUseUserDataLabel;
+    private UbuntuButton mRebootButton;
+    private UbuntuButton mUpdateButton;
+    private boolean mAndroidUpdatePending;
+    private Menu mMenu;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        // check if Ubuntu is installed
-        ensureUbuntuIsInstalled();
-        if (isFinishing()) return;
-        
+        doBindService();
+        mSharedPreferences = getSharedPreferences( UbuntuInstallService.SHARED_PREF, Context.MODE_PRIVATE);        
         setContentView(R.layout.ubuntu_dualboot_launch);
-        mRebootButton = (UbuntuButton) findViewById(R.id.download);
         mTextChannel = (TextView) findViewById(R.id.channel);
+        mTextChannelLabel = (TextView) findViewById(R.id.channel_label);
+        mTextRefChannel = (TextView) findViewById(R.id.ref_channel);
+        mTextRefChannelLabel = (TextView) findViewById(R.id.ref_channel_label);
         mTextVersion = (TextView) findViewById(R.id.version);
-        mTextChannelLabel = (TextView) findViewById(R.id.channel_label);
         mTextVersionLabel = (TextView) findViewById(R.id.version_label);
-        mTextTitle = (TextView) findViewById(R.id.title);
         mTextDescriptionLabel = (TextView) findViewById(R.id.description_label);
         mTextDescription = (TextView) findViewById(R.id.description);
+        mTextUseRootfs  = (TextView) findViewById(R.id.rootfssize);
+        mTextUseRootfsLabel = (TextView) findViewById(R.id.rootfs_label);
+        mTextUseSystemData = (TextView) findViewById(R.id.system_data_size);
+        mTextUseSystemDataLabel = (TextView) findViewById(R.id.system_data_label);
+        mTextUseUserData = (TextView) findViewById(R.id.user_datasize);
+        mTextUseUserDataLabel = (TextView) findViewById(R.id.user_data_label);
+        mTextTitle = (TextView) findViewById(R.id.title);
         mTextTitle.setText(R.string.launch_title);
+        mUpdateButton = (UbuntuButton) findViewById(R.id.upgrade);
+        mRebootButton = (UbuntuButton) findViewById(R.id.reboot);
         mRebootButton.setText(R.string.reboot_button_label);
-        fillInstalledVersionInfo();
-
-        // check the upgradeable image.
-        startService(new Intent(UbuntuInstallService.IS_UBUNTU_UPGRADABLE));
-    }
-
+        mUpdateButton.setText(R.string.button_install_ubuntu_update);
+        mTextVersionLabel.setText(R.string.label_version);
+        mTextChannelLabel.setText(R.string.label_channel);
+        mTextRefChannelLabel.setText(R.string.label_channel_target);
+        mTextDescriptionLabel.setText(R.string.label_description);
+        mTextUseRootfsLabel.setText(R.string.label_rootfs);
+        mTextUseSystemDataLabel.setText(R.string.label_system_data);
+        mTextUseUserDataLabel.setText(R.string.label_user_data);
+        // check for updates
+        startService(new Intent(UbuntuInstallService.CHECK_PENDING_UPDATES));
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        doUnbindService();
+    }
+    
     @Override
     public void onResume() {
         super.onResume();
         // check is there is Ubuntu installed
-        ensureUbuntuIsInstalled();
+        checkActivityStillValid();
         if (isFinishing()) return;
         
         mRebootButton.setOnClickListener(mRebootButtonListener);
+        mUpdateButton.setOnClickListener(mRebootButtonListener);
         IntentFilter filter = new IntentFilter();
-        filter.addAction(UbuntuInstallService.VERSION_UPDATE);
+        filter.addAction(UbuntuInstallService.SERVICE_STATE_CHANGED);
+        filter.addAction(UbuntuInstallService.STORAGE_USE_UPDATED);
+        filter.addAction(UbuntuInstallService.ANDROID_UPDATE_PENDING);
+        filter.addAction(UbuntuInstallService.UBUNTU_UPDATE_PENDING);
+        filter.addAction(UbuntuInstallService.UBUNTU_UPDATE_AVAILABLE);
         registerReceiver(mServiceObserver, filter);
+        updateUiElements();        
     }
 
     @Override
     public void onPause() {
         super.onPause();
         mRebootButton.setOnClickListener(null);
+        mUpdateButton.setOnClickListener(null);
         // cancel observer if there is any
         unregisterReceiver(mServiceObserver);
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
         getMenuInflater().inflate(R.menu.launcher_menu, menu);
+        menu.findItem(R.id.menu_action_update_android).setShowAsAction( MenuItem.SHOW_AS_ACTION_NEVER);
+        mMenu = menu;
         return true;
     }
     
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case R.id.action_uninstall:
+            case R.id.menu_action_uninstall:
                 // show dialog
                 final Intent uninstall = new Intent(UbuntuInstallService.UNINSTALL_UBUNTU);
                 Utils.createConfirmationDialog(this,
                         R.string.uninstall_dialog_title,
+                        R.string.uninstall_dialog_description,
                         R.string.action_uninstall_button,
                         R.string.cancel,
                         uninstall,
@@ -103,71 +162,176 @@
                         }
                 }).show();
                 break;
-            case R.id.action_del_user_data:
-                Intent action = new Intent(UbuntuInstallService.DELETE_UBUNTU_USER_DATA);
+            case R.id.menu_action_del_user_data:
+                final Intent action = new Intent(UbuntuInstallService.DELETE_UBUNTU_USER_DATA);
                 Utils.createConfirmationDialog(this,
                         R.string.action_delete_user_data,
+                        0,
                         R.string.action_delete_udata_button,
                         R.string.cancel,
                         action,
                         R.string.deleting_user_data,
-                        -1,
+                        0, // choiceItemsArray
                         null,
                         null).show();        
                 break;
+            case R.id.menu_action_update_storage_use:
+            	final Intent updateStorage = new Intent(UbuntuInstallService.UPDATE_STORAGE_USE);
+            	startService(updateStorage);
+            	break;
+            case R.id.menu_action_check_for_update:
+                final Intent checkForUpdate = new Intent(UbuntuInstallService.CHECK_IF_UPDATE_AVAILABLE);
+                startService(checkForUpdate);
+                break;
+            case R.id.menu_action_update_android:
+                showAndroidUpdateDialog();
+                break;
         }
         return super.onOptionsItemSelected(item);
     }
 
+    public void showAndroidUpdateDialog() {
+        final Intent update = new Intent(UbuntuInstallService.PREPARE_ANDROID_UPDATE);
+        Utils.createAndroidUpdateConfirmationDialog(this,
+                R.string.android_update_dialog_title,
+                R.string.android_update_dialog_description,
+                R.string.android_update_dialog_possitive,
+                R.string.cancel,
+                update,
+                0,
+                R.array.update_android_options,
+                new boolean[]{mSharedPreferences.getBoolean(UbuntuInstallService.PREF_KEY_ANDROID_UPDATE_DISMISSED, false)},
+                new DialogInterface.OnMultiChoiceClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which, boolean isChecked) {
+                        // update data in the shared preferences
+                        mSharedPreferences.edit()
+                            .putBoolean(UbuntuInstallService.PREF_KEY_ANDROID_UPDATE_DISMISSED, isChecked)
+                            .commit();
+                        mAndroidUpdatePending = !isChecked;
+                    }
+                }).show();
+    }
+    
     public static void startFrom(Context context) {
         Intent intent = new Intent(context, LaunchActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         context.startActivity(intent);
     }
 
-    private void fillInstalledVersionInfo() {
-        mTextChannel.setText(mUbuntuVersion.getChannelAlias());
-        mTextVersion.setText(Integer.toString(mUbuntuVersion.getVersion()));
-        mTextDescription.setText(mUbuntuVersion.getDescription());
-        mTextChannelLabel.setText(R.string.label_channel);
-        mTextVersionLabel.setText(R.string.label_version);
-        mTextDescriptionLabel.setText(R.string.label_description);
-    }
-
+    @Override
+    protected void onInstallerServiceConnected() {
+        updateUiElements();
+    }
+     
+    protected void updateUiElements() {
+        checkActivityStillValid();
+        if (isFinishing()) return;
+        this.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                String defValue = getString(R.string.not_available);
+                mTextChannel.setText(mSharedPreferences.getString(UbuntuInstallService.PREF_KEY_VERSION_CHANNEL, defValue));
+                mTextRefChannel.setText(mSharedPreferences.getString(UbuntuInstallService.PREF_KEY_VERSION_CHANNEL_TARGET, defValue));
+                mTextVersion.setText(mSharedPreferences.getString(UbuntuInstallService.PREF_KEY_VERSION_NUMBER, defValue));
+                mTextDescription.setText(mSharedPreferences.getString(UbuntuInstallService.PREF_KEY_VERSION_DESCRIPTION, defValue));
+                mTextUseRootfs.setText(formatSize(mSharedPreferences.getInt(UbuntuInstallService.PREF_KEY_SIZE_ROOTFS, -1)));
+                mTextUseSystemData.setText(formatSize(mSharedPreferences.getInt(UbuntuInstallService.PREF_KEY_SIZE_SYSTEM_DATA, -1)));
+                mTextUseUserData.setText(formatSize(mSharedPreferences.getInt(UbuntuInstallService.PREF_KEY_SIZE_USER_DATA, -1)));
+                if (mSharedPreferences.getBoolean(UbuntuInstallService.PREF_KEY_PENDING_UPDATE, false)) {
+                    mUpdateButton.setVisibility(View.VISIBLE);                    
+                } else {
+                    mUpdateButton.setVisibility(View.GONE);
+                }
+                // dismiss notification we don't need
+                if (mInstallerService != null) {
+                    mInstallerService.dismissUbuntuNotification();
+                    mInstallerService.dismissUbuntuUpdateNotification();
+                    mInstallerService.dismissAndroidNotification();
+                }
+                if (mAndroidUpdatePending) {
+                    showAndroidUpdateDialog();
+                }
+            }
+        });
+    }
+    
+    String formatSize(int size) {
+    	if (size != -1) {
+    		return String.format(Locale.US,"%d MB", size);
+    	} else {
+    		return getString(R.string.not_available);
+        }
+    }
+    
     /**
-     * Get installed version to check Ubuntu is installed
+     * Check is this activity is still valid, or we should switch to another one
      */
-    private void ensureUbuntuIsInstalled() {
-        VersionInfo v = UbuntuInstallService.getInstalledVersion(this.getApplicationContext());
-        if (v == null) {
+    private void checkActivityStillValid() {
+
+        if (! mSharedPreferences.getBoolean(UbuntuInstallService.PREF_KEY_UBUNTU_INSTALLED, false)
+            || (mInstallerService != null 
+                && (mInstallerService.getServiceState() == InstallerState.INSTALLING
+                    || mInstallerService.getServiceState() == InstallerState.DOWNLOADING)
+               )
+           ) {
             // go back to install screen, and release myself.
             InstallActivity.startFrom(this);
             finish();
-        } else {
-            mUbuntuVersion = v;
         }
     }
     
     OnClickListener mRebootButtonListener = new OnClickListener() {
         @Override
         public void onClick(View v) {
-            startService(new Intent(UbuntuInstallService.REBOOT_UBUNTU));
+            if (v.getId() == R.id.reboot) {
+                startService(new Intent(UbuntuInstallService.REBOOT_UBUNTU));
+            } else if (v.getId() == R.id.upgrade) {
+                if (UbuntuInstallService.isReadyToInstall(mSharedPreferences)) {
+                    UbuntuInstallService.startInstallationIfPossible(v.getContext());
+                } else if (UbuntuInstallService.isDownloadActive(mSharedPreferences)) {
+                    startService(new Intent(UbuntuInstallService.RESUME_DOWNLOAD));
+                } else {
+                    startService(new Intent(UbuntuInstallService.DOWNLOAD_UPDATE));
+                }
+            }
         }
     };
 
     BroadcastReceiver mServiceObserver = new BroadcastReceiver() {
-        @SuppressWarnings("unchecked")
         @Override
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-            if (action.equals(UbuntuInstallService.VERSION_UPDATE)) {
-                ensureUbuntuIsInstalled();
-                if(UbuntuInstallService.isUpgradeable(getApplicationContext())) {
-                    Log.d(TAG, "Found upgradeable file, kill LaunchActivity");
-                    InstallActivity.startFrom(context);
-                    finish();
-                }
+        public void onReceive(Context context, Intent intent) {            
+            String action = intent.getAction();            
+            if (action.equals(UbuntuInstallService.SERVICE_STATE_CHANGED)) {
+                InstallerState newState = mInstallerService.getServiceState();
+                Log.d(TAG,"New Service state:" + newState);
+                switch(newState) {
+                    case DOWNLOADING:
+                    case INSTALLING:
+                        // switch back to install activity to minitor ongoing task
+                        InstallActivity.startFrom(context);
+                        finish();
+                        break;
+                    default:
+                        checkActivityStillValid();
+                        break;
+                }
+            } else if (action.equals(UbuntuInstallService.STORAGE_USE_UPDATED)) {
+                updateUiElements();	
+            }else if (action.equals(UbuntuInstallService.ANDROID_UPDATE_PENDING)) {                
+                if (!mSharedPreferences.getBoolean(UbuntuInstallService.PREF_KEY_ANDROID_UPDATE_DISMISSED, false)) {
+                    mAndroidUpdatePending = true;
+                }
+                if (mMenu != null) {
+                    mMenu.findItem(R.id.menu_action_update_android).setShowAsAction( MenuItem.SHOW_AS_ACTION_ALWAYS);
+                }
+                updateUiElements();
+            } else if (action.equals(UbuntuInstallService.UBUNTU_UPDATE_PENDING)) {
+                mUpdateButton.setVisibility(View.VISIBLE);
+            } else if (action.equals(UbuntuInstallService.UBUNTU_UPDATE_AVAILABLE)) {
+                mUpdateButton.setVisibility(View.VISIBLE);
             }
+
         }
     };
 }
 
=== modified file 'src/com/canonical/ubuntu/installer/NumberPickerDialog.java'
--- src/com/canonical/ubuntu/installer/NumberPickerDialog.java	2013-12-13 01:06:14 +0000
+++ src/com/canonical/ubuntu/installer/NumberPickerDialog.java	2014-06-09 11:59:50 +0000
@@ -1,3 +1,20 @@
+/*
+ * This file is part of Ubuntu dualboot installer for Android.
+ * Copyright 2013 Canonical Ltd.
+ * 
+ * Ubuntu dualboot installer is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ *
+ * Ubuntu dualboot installer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Ubuntu dualboot installer. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package com.canonical.ubuntu.installer;
 
 import com.canonical.ubuntu.installer.R;
@@ -5,15 +22,12 @@
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.SharedPreferences;
 import android.content.DialogInterface.OnClickListener;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.CheckBox;
 import android.widget.NumberPicker;
-import android.widget.TextView;
 
 /**
  * A text picker dialog that prompts the user for to select one of the text options
 
=== modified file 'src/com/canonical/ubuntu/installer/TextPickerDialog.java'
--- src/com/canonical/ubuntu/installer/TextPickerDialog.java	2013-12-13 01:06:14 +0000
+++ src/com/canonical/ubuntu/installer/TextPickerDialog.java	2014-06-09 11:59:50 +0000
@@ -1,3 +1,20 @@
+/*
+ * This file is part of Ubuntu dualboot installer for Android.
+ * Copyright 2013 Canonical Ltd.
+ * 
+ * Ubuntu dualboot installer is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ *
+ * Ubuntu dualboot installer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Ubuntu dualboot installer. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package com.canonical.ubuntu.installer;
 
 import com.canonical.ubuntu.installer.R;
@@ -13,7 +30,6 @@
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.NumberPicker;
-import android.widget.TextView;
 
 /**
  * A text picker dialog that prompts the user for to select one of the text options
 
=== modified file 'src/com/canonical/ubuntu/installer/UbuntuInstallService.java'
--- src/com/canonical/ubuntu/installer/UbuntuInstallService.java	2014-01-06 15:07:12 +0000
+++ src/com/canonical/ubuntu/installer/UbuntuInstallService.java	2014-06-09 11:59:50 +0000
@@ -1,7 +1,25 @@
+/*
+ * This file is part of Ubuntu dualboot installer for Android.
+ * Copyright 2013 Canonical Ltd.
+ * 
+ * Ubuntu dualboot installer is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ *
+ * Ubuntu dualboot installer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Ubuntu dualboot installer. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package com.canonical.ubuntu.installer;
 
 import java.io.DataOutputStream;
 import java.io.File;
+import java.io.FileFilter;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -22,18 +40,49 @@
 import org.json.JSONTokener;
 
 import com.canonical.ubuntu.installer.JsonChannelParser.Image;
-import com.canonical.ubuntu.installer.VersionInfo.ReleaseType;
 
+import android.annotation.SuppressLint;
 import android.app.IntentService;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.SharedPreferences;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.net.wifi.WifiManager;
+import android.os.BatteryManager;
+import android.os.Binder;
+import android.os.Build;
+import android.os.IBinder;
 import android.os.PowerManager;
 import android.util.Log;
 import android.webkit.URLUtil;
 
 public class UbuntuInstallService extends IntentService {
     private static final String TAG = "UbuntuInstallService";
+
+    // =================================================================================================
+    // Behaviour constants
+    // =================================================================================================
+    // Default update server address
+    public static final String SERVER_URL = "http://system-image.ubuntu.com";
+    // Flag if channel list should also include hidden channels
+    private static final boolean INCLUDE_HIDDEN = false;
+    // Flag if channel list should include saucy channels
+    private static final boolean INCLUDE_SAUCY = false;
+    // How often service should check for update for normal channel
+    public static final int UPDATE_CHECK_ALARM_HOURS = 48; // every 2 days
+    // How often service should check for update for proposed channel
+    public static final int UPDATE_CHECK_PROPOSED_ALARM_HOURS = 10; // every 10 hours
+    
+    // Minimum battery charge in % for install to progress
+    public static final int MIN_INSTALL_BATTERY_CHARGE = 30;
+    
+    // Bring up mode, support any device
+    public static final boolean BRINGUP_MODE = false;
     
     // =================================================================================================
     // Shared preferences
@@ -41,14 +90,41 @@
     public final static String SHARED_PREF = "UInstallerPref";
     // 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 
-    private final static String PREF_KEY_DOWNLOADED_VERSION = "d_version";
-    // Key for String set value: version information: alias, Json, version, description
-    private final static String PREF_KEY_INSTALLED_VERSION = "i_version";
+    
+    // Key strings describing active download
+    public final static String PREF_KEY_DOWNLOAD_ACTIVE = "d_active";
+    public final static String PREF_KEY_DOWNLOAD_SERVER = "server_url";
+    public final static String PREF_KEY_DOWNLOAD_CHANNEL = "channel_json";
+    public final static String PREF_KEY_DOWNLOAD_BOOTSTRAP = "bootstrap";
+    public final static String PREF_KEY_DOWNLOAD_VERSION = "d_version";
+    public final static String PREF_KEY_DOWNLOAD_TYPE = "d_type";
+    public final static String PREF_KEY_DOWNLOAD_COMPLETED = "d_completed";
+    
+    // Key strings describing installed version
+    public static final String PREF_KEY_VERSION_NUMBER = "version_number";
+    public static final String PREF_KEY_VERSION_CHANNEL = "version_channel";
+    public static final String PREF_KEY_VERSION_CHANNEL_TARGET = "version_channel_target";
+    public static final String PREF_KEY_VERSION_DESCRIPTION = "version_description";
+    public static final String PREF_KEY_VERSION_BASE = "version_base";
+    
+    public static final String PREF_KEY_UBUNTU_INSTALLED = "u_installed"; 
+
+    // Key for pending update, type boolean
+    public static final String PREF_KEY_PENDING_UPDATE = "pending_update";
+    
+    // Key for android update notification being dismissed, type boolean
+    public static final String PREF_KEY_ANDROID_UPDATE_DISMISSED = "android_u_dismissed";
+    
     // 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
-    public final static String PREF_KEY_ESTIMATED_CHECKPOINTS = "est_checkpoints";
+    
+    // Kyes describing occupied storage space, all values are stored as string 
+    // key for int value: rootfs size in MB
+    public final static String PREF_KEY_SIZE_ROOTFS = "size_rootfs";
+    // key for int value: system data size in MB
+    public final static String PREF_KEY_SIZE_SYSTEM_DATA = "size_system_data";
+    // key for int value: user data size in MB
+    public final static String PREF_KEY_SIZE_USER_DATA = "size_user_data";
     
     // =================================================================================================
     // Default values to be used
@@ -70,66 +146,69 @@
     public final static String MAKO_PARTITION_RECOVERY = "/dev/block/platform/msm_sdcc.1/by-name/recovery";
     public final static String MANTA_PARTITION_BOOT = "/dev/block/platform/dw_mmc.0/by-name/boot";
     public final static String MANTA_PARTITION_RECOVERY = "/dev/block/platform/dw_mmc.0/by-name/recovery";
+    public final static String DEFAULT_PARTITION_BOOT = "/dev/bootimg"; // this is used for bringup devices
+    public final static String DEFAULT_PARTITION_RECOVERY = "/dev/recovery";  // this is used for bringup devices
+    
+    
+    // =================================================================================================
+    // Ubuntu parts
+    // =================================================================================================    
+    public static final String UBUNTU_ROOTFS = "/data/system.img";
+    public static final String UBUNTU_SYSTEM_DATA = "/data/system-data";
+    public static final String UBUNTU_USER_DATA = "/data/user-data";
     
     // =================================================================================================
     // Service Actions
+    public static final String  BASE_PACKAGE = "com.canonical.ubuntuinstaller.UbuntuInstallService.";
     // =================================================================================================
     // Get list of channels
-    public static final String GET_CHANNEL_LIST = "com.canonical.ubuntuinstaller.UbuntuInstallService.GET_CHANNEL_LIST";
+    public static final String GET_CHANNEL_LIST            = BASE_PACKAGE + "GET_CHANNEL_LIST";
+        public static final String GET_CHANNEL_LIST_EXTRA_SERVER_URL = "url"; // string
     // Download latest release from given channel
-    public static final String DOWNLOAD_RELEASE = "com.canonical.ubuntuinstaller.UbuntuInstallService.DOWNLOAD_RELEASE";
-    public static final String DOWNLOAD_RELEASE_EXTRA_CHANNEL_ALIAS = "alias"; // string
-    public static final String DOWNLOAD_RELEASE_EXTRA_CHANNEL_URL = "url"; // string
-    public static final String DOWNLOAD_RELEASE_EXTRA_BOOTSTRAP = "bootstrap"; // boolean
-    public static final String DOWNLOAD_RELEASE_EXTRA_VERSION = "version"; // int
-    public static final String DOWNLOAD_RELEASE_EXTRA_TYPE = "type"; // JsonChannelParser.ReleaseType
-    public static final String CANCEL_DOWNLOAD = "com.canonical.ubuntuinstaller.UbuntuInstallService.CANCEL_DOWNLOAD";
-    public static final String PAUSE_DOWNLOAD = "com.canonical.ubuntuinstaller.UbuntuInstallService.PAUSE_DOWNLOAD";
-    public static final String RESUME_DOWNLOAD = "com.canonical.ubuntuinstaller.UbuntuInstallService.RESUME_DOWNLOAD";
-    public static final String CLEAN_DOWNLOAD = "com.canonical.ubuntuinstaller.UbuntuInstallService.CLEAN_DOWNLOADED";
-    public static final String INSTALL_UBUNTU = "com.canonical.ubuntuinstaller.UbuntuInstallService.INSTALL_UBUNTU";
-    public static final String CANCEL_INSTALL = "com.canonical.ubuntuinstaller.UbuntuInstallService.CANCEL_INSTALL";
-    public static final String UNINSTALL_UBUNTU = "com.canonical.ubuntuinstaller.UbuntuInstallService.UINSTALL_UBUNTU";
-    public static final String IS_UBUNTU_UPGRADABLE = "com.canonical.ubuntuinstaller.UbuntuInstallService.IS_UBUNTU_UPGRADABLE";
-    public static final String UNINSTALL_UBUNTU_EXTRA_REMOVE_USER_DATA = "user_data";
-    public static final String CHECK_FOR_UPDATE = "com.canonical.ubuntuinstaller.UbuntuInstallService.CHECK_FOR_UPDATE";
-    public static final String DELETE_UBUNTU_USER_DATA = "com.canonical.ubuntuinstaller.UbuntuInstallService.DELETE_USER_DATA";
-    public static final String GET_SERVICE_STATE = "com.canonical.ubuntuinstaller.UbuntuInstallService.GET_SERVICE_STATE";
-    public static final String GET_PROGRESS_STATUS = "com.canonical.ubuntuinstaller.UbuntuInstallService.GET_PROGRESS_STATUS";
-    public static final String REBOOT_UBUNTU = "com.canonical.ubuntuinstaller.UbuntuInstallService.REBOOT_UBUNTU";
+    public static final String DOWNLOAD_RELEASE            = BASE_PACKAGE + "DOWNLOAD_RELEASE";
+        public static final String DOWNLOAD_RELEASE_EXTRA_SERVER_URL = "url_server"; // string
+        public static final String DOWNLOAD_RELEASE_EXTRA_CHANNEL_URL = "url_channel"; // string
+        public static final String DOWNLOAD_RELEASE_EXTRA_BOOTSTRAP = "bootstrap"; // boolean
+        public static final String DOWNLOAD_RELEASE_EXTRA_VERSION = "version"; // int
+        public static final String DOWNLOAD_RELEASE_EXTRA_TYPE = "type"; // JsonChannelParser.ReleaseType
+    public static final String DOWNLOAD_UPDATE             = BASE_PACKAGE + "DOWNLOAD_UPDATE";
+    public static final String RESUME_DOWNLOAD             = BASE_PACKAGE + "RESUME_DOWNLOAD";
+    public static final String DELETE_DOWNLOAD             = BASE_PACKAGE + "DELETE_DOWNLOAD";
+    public static final String INSTALL_UBUNTU              = BASE_PACKAGE + "INSTALL_UBUNTU";
+    public static final String UNINSTALL_UBUNTU            = BASE_PACKAGE + "UINSTALL_UBUNTU";
+        public static final String UNINSTALL_UBUNTU_EXTRA_REMOVE_USER_DATA = "user_data";
+    public static final String DELETE_UBUNTU_USER_DATA     = BASE_PACKAGE + "DELETE_UBUNTU_USER_DATA";
+    public static final String REBOOT_UBUNTU               = BASE_PACKAGE + "REBOOT_UBUNTU";
+    public static final String UPDATE_STORAGE_USE          = BASE_PACKAGE + "UPDATE_STORAGE_USE";
+    public static final String CHECK_IF_UPDATE_AVAILABLE   = BASE_PACKAGE + "CHECK_IF_UPDATE_AVAILABLE";    
+    public static final String CHECK_PENDING_UPDATES       = BASE_PACKAGE + "CHECK_PENDING_UPDATES";
+    public static final String PREPARE_ANDROID_UPDATE      = BASE_PACKAGE + "PREPARE_ANDROID_UPDATE";
 
     // =================================================================================================
     // Service broadcast
     // =================================================================================================
-    public static final String SERVICE_STATE = "com.canonical.ubuntuinstaller.UbuntuInstallService.SERVICE_STATE";
-    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";
-    public static final String DOWNLOAD_RESULT_EXTRA_INT = "res_int"; // 0-success, -1 fail
-    public static final String DOWNLOAD_RESULT_EXTRA_STR = "res_str"; // empty for success, or error text
-    public static final String PROGRESS = "com.canonical.ubuntuinstaller.UbuntuInstallService.PROGRESS";
-    public static final String PROGRESS_EXTRA_TEXT = "text"; // value will carry name of file currently downloaded 
-    public static final String PROGRESS_EXTRA_INT = "progress"; // value between 0-100 of current progress
-    public static final String INSTALL_RESULT = "com.canonical.ubuntuinstaller.UbuntuInstallService.INSTALL_COMPLETED";
-    public static final String INSTALL_RESULT_EXTRA_INT = "res_int"; // 0-success, -1 fail
-    public static final String INSTALL_RESULT_EXTRA_STR = "res_str"; // empty for success, or error text
-    public static final String VERSION_UPDATE = "com.canonical.ubuntuinstaller.UbuntuInstallService.VERSION_UPDATE";
-    public static final String VERSION_UPDATE_EXTRA_VERSION = "version"; // int new version
-    public static final String VERSION_UPDATE_EXTRA_DESCRIPTION = "description"; // string
-    public static final String VERSION_UPDATE_EXTRA_ALIAS = "alias"; // string
+    public static final String SERVICE_STATE_CHANGED = BASE_PACKAGE + "SERVICE_STATE";
+    public static final String AVAILABLE_CHANNELS = BASE_PACKAGE + "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 = BASE_PACKAGE + "DOWNLOAD_RESULT";
+        public static final String DOWNLOAD_RESULT_EXTRA_INT = "res_int"; // 0-success, -1 fail
+        public static final String DOWNLOAD_RESULT_EXTRA_STR = "res_str"; // empty for success, or error text
+    public static final String PROGRESS = BASE_PACKAGE + "PROGRESS"; 
+    public static final String PROGRESS_OUPUT = BASE_PACKAGE + "PROGRESS_OUTPUT";
+    public static final String INSTALL_RESULT = BASE_PACKAGE + "INSTALL_COMPLETED";
+        public static final String INSTALL_RESULT_EXTRA_INT = "res_int"; // 0-success, -1 fail
+        public static final String INSTALL_RESULT_EXTRA_STR = "res_str"; // empty for success, or error text
+    public static final String STORAGE_USE_UPDATED = BASE_PACKAGE + "STORAGE_USE_UPDATED";
+    public static final String ANDROID_UPDATE_PENDING = BASE_PACKAGE + "ANDROID_UPDATE";
+    public static final String UBUNTU_UPDATE_PENDING = BASE_PACKAGE + "UBUNTU_UPDATE_PENDING";
+    public static final String UBUNTU_UPDATE_AVAILABLE = BASE_PACKAGE + "UBUNTU_UPDATE_AVAILABLE";
     
     // =================================================================================================
-    // Download url strings
+    // Other constants
     // =================================================================================================
-    public static final String BASE_URL = "http://system-image.ubuntu.com";
     private static final String CHANNELS_JSON = "/channels.json";
-    private static final String URL_IMAGE_MASTER = "gpg/image-master.tar.xz";
-    private static final String URL_IMAGE_SIGNING = "gpg/image-signing.tar.xz";
-    private static final String ASC_SUFFIX = ".asc";
-
-    // 2G for file system, 512M for swap.
-    private static long INSTALL_SIZE_REQUIRED = (2048L + 512L) * 1024L * 1024L;
+    // 2G for file system
+    private static long INSTALL_SIZE_REQUIRED = 2048L * 1024L * 1024L;
     // 15M extra space to keep it safe.
     private static long EXTRA_SIZE_REQUIRED = 15 * 1024 * 1024;
 
@@ -138,7 +217,7 @@
      * State of the service 
      */
     public enum InstallerState {
-        READY, FETCHING_CHANNELS, DOWNLOADING, INSTALLING, UNINSTALLING, DELETING_USER_DATA;
+        READY, FETCHING_CHANNELS, DOWNLOADING, INSTALLING, UNINSTALLING, DELETING_USER_DATA, CALCULATING_USAGE;
         public static InstallerState fromOrdian(int ordianl) {
             return InstallerState.values()[ordianl];
          }
@@ -152,53 +231,76 @@
     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 UPGRADECHECKER = "upgrade-checker";
     private static final String UPDATE_SCRIPT = "system-image-upgrader";
-    private static final String ARCHIVE_MASTER = "archive-master.tar.xz";
-    private static final String ARCHIVE_MASTER_ASC = "archive-master.tar.xz.asc";
-    private static final String U_REBOOT_APP = "u-reboot-app.tar.xz";
-    private static final String U_REBOOT_APP_ASC = "u-reboot-app.tar.xz.asc";
+    public static final String U_REBOOT_APP = "u-reboot-app.tar.xz";
+    public static final String RECOVERY_REMOUNT = "recovery-remount.tar.xz";
 
     // =================================================================================================
     // Update command file constants
-    // =================================================================================================
-    private static final String UPDATE_COMMAND = "update_command";
-    private static final String COMMAND_FORMAT = "format";
-    private static final String COMMAND_MOUNT = "mount";
-    private static final String COMMAND_UMOUNT = "unmount";
-    private static final String COMMAND_LOAD_KEYRING = "load_keyring";
-    private static final String COMMAND_UPDATE = "update";
-    private static final String PARTITION_DATA = "data";
-    private static final String PARTITION_SYSTEM = "system";
+    // =================================================================================================    
+    public static final String UPDATE_COMMAND = "update_command";    
+    public static final String COMMAND_FORMAT = "format";
+    public static final String COMMAND_MOUNT = "mount";
+    public static final String COMMAND_UMOUNT = "unmount";
+    public static final String COMMAND_UPDATE = "update";
+    public static final String PARTITION_DATA = "data";
+    public static final String PARTITION_SYSTEM = "system";
     
     // other constants
+    public static final String CUSTOM_SERVER="custom_server";
     private static final String RELEASE_FOLDER = "/ubuntu_release";
+    private static final String LINKED_UPGRADER_COMMAND = "recovery/ubuntu_command";
+    private static final String PENDING_ANDROID_UPDATE = "android_update";
     private static final String TEMP_FOLDER = "/uTemp";
     private static final int PROGRESS_UBUNTU_ADJUSTMENT = 563979;
     private static final int PROGRESS_DEVICE_ADJUSTMENT = 651093;
     private static final int PROGRESS_CUSTOM_ADJUSTMENT = 2036039;
-    private static final int PROGRESS_SWAP_CREATION_ADJUSTMENT = 85; // equivalent of time tar --checkpoint=200
-    private static final int PROGRESS_MKSWAP_ADJUSTMENT = 17; // equivalent of time tar --checkpoint=200
-    private PowerManager mPowerManager;
     private PowerManager.WakeLock mWakeLock;
-    // FIXME make workPath in Cache a private function
-    private boolean workPathInCache = false;
-    private String mRootOfWorkPath;
+    private WifiManager.WifiLock mWifiLock;
     private volatile boolean mIsCanceled;
+    private boolean mBringup;
     
     // progress values
     private long mProgress; // so far handled amount downloaded/processed 
     private int mLastSignalledProgress;
+    private String mActionOutput;
     private long mTotalSize; // calculated
-    private InstallerState mInstallerState;
+    private InstallerState mServiceState;
+    private File mReleaseFolder;
+    private SharedPreferences mSharedPreferences;
+    private Notification mUbuntuNotification;
+    private Notification mUbuntuUpdateNotification;
+    private Notification mUbuntuProgressNotification;
+    private Notification mAndroidUpdateNotification;
+    NotificationManager mNotificationManager;
     
-    public class Channel {
-        String alias;
-        File[] files;
-        boolean hiden;
+    public enum ReleaseType {
+        FULL(0), 
+        DELTA(1), 
+        UNKNOWN(2);
+        private final int value;
+
+        private ReleaseType(final int newValue) {
+            value = newValue;
+        }
+
+        public int getValue() {
+            return value; 
+        }
+        
+        public static ReleaseType fromValue(final int value) {
+            switch (value) {
+                case 0: // FULL
+                    return FULL;
+                case 1: // DELTA
+                    return DELTA;
+            }
+            return UNKNOWN;
+        }
     };
     
     class ECancelException extends Exception {
+        private static final long serialVersionUID = 1L;
         long mDownloadedSize;
         
         public ECancelException(long downloadedSize){
@@ -208,6 +310,8 @@
     };
 
     class ESumNotMatchException extends Exception {
+        private static final long serialVersionUID = 1L;
+
         public ESumNotMatchException(){
             super();
         }
@@ -218,6 +322,7 @@
     };
 
     class EShellExecException extends Exception {
+        private static final long serialVersionUID = 1L;
         public EShellExecException(){
             super();
         }
@@ -228,134 +333,195 @@
     };
 
     public UbuntuInstallService() {
-        super(TAG);
-    }
+        super(UbuntuInstallService.class.getName());
+    }
+    
+    /**
+     * Class for clients to get hold of this service
+     * this only works as long as service runs in same process as client
+     */
+    public class LocalBinder extends Binder {
+        UbuntuInstallService getService() {
+            return UbuntuInstallService.this;
+        }
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mBinder;
+    }
+    private final IBinder mBinder = new LocalBinder();
 
     @Override
     public void onCreate() {
         super.onCreate();
-        mPowerManager = (PowerManager)getSystemService(Context.POWER_SERVICE);
-        // SharedPreferences sharedPref = this.getSharedPreferences(, MODE_PRIVATE);
-        // do we have cache permissions?
-        File testDir = new File("/cache/testDir");
-        if (testDir.mkdir()) {
-            testDir.delete();
-            mRootOfWorkPath = "/cache";
-            workPathInCache = true;
-        } else {
-            mRootOfWorkPath = getFilesDir().toString(); //  "/data/data/com.canonical.ubuntu.installer/files";
-            workPathInCache = false;
-        }
-        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 (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
-                mIsCanceled = true;
-            } else if (action.equals(GET_PROGRESS_STATUS)) {
-                broadcastProgress(mLastSignalledProgress, ""); 
-            } else if (action.equals(GET_SERVICE_STATE)) {
-                broadcastInstallerState();
-            }
-        }
-        return super.onStartCommand(intent, flags, startId);
-    }
-    
+        mReleaseFolder = new File(getFilesDir(), RELEASE_FOLDER);
+        mServiceState = InstallerState.READY;
+        mSharedPreferences = getSharedPreferences(SHARED_PREF, Context.MODE_PRIVATE);
+        mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+        mWakeLock = ((PowerManager)getSystemService(Context.POWER_SERVICE))
+                .newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "ubuntu-dualboot");
+        WifiManager wm = (WifiManager) getSystemService(Context.WIFI_SERVICE);
+        mWifiLock = wm.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, TAG);
+        mBringup = Utils.isBringupMode();
+    }
+
+    /**
+     * Get service state
+     * @return service state
+     */
+    public InstallerState getServiceState(){
+        return mServiceState;
+    }
+    
+    /**
+     * Get ongoing action progress
+     * @return last known progress
+     */
+    public int getActionProgress() {
+        return mLastSignalledProgress;
+    }
+    
+    /**
+     * Pause ongoing download
+     */
+    public void pauseDownload() {
+        if (mServiceState == InstallerState.DOWNLOADING) {
+            mIsCanceled = true;
+        }
+    }
+    
+    /**
+     * Get action output
+     * @return action output buffer
+     */
+    public String getActionOutput() {
+        return mActionOutput;
+    }
+    
+    /**
+     * Reset action output buffer
+     */
+    public void resetActionOutput() {
+        mActionOutput = "";
+    }
+
     @Override
     protected void onHandleIntent(Intent intent) {
+        // reset progress for new action
+        if (intent == null) {
+            // ignore
+            return;
+        }
+        mLastSignalledProgress = 0;
         String action = intent.getAction();
+        String debugAction = action;
+        if (action.startsWith(BASE_PACKAGE)) {
+            debugAction = action.substring(BASE_PACKAGE.length());
+        }
+        Log.d(TAG, "onHandleIntent<<: " + debugAction);
         Intent result = null;
-
-        Log.d(TAG, this.toString() + " onHandleIntent: " + action);
         if (action.equals(GET_CHANNEL_LIST)) {
             updateInstallerState(InstallerState.FETCHING_CHANNELS);
-            result = doGetChannelList(intent);
+            result = getChannelList(intent);
         } else if (action.equals(DOWNLOAD_RELEASE)) {
             updateInstallerState(InstallerState.DOWNLOADING);
-            result = doDownloadRelease(intent);
-        } else if (action.equals(CANCEL_DOWNLOAD)) {
-            // download should be already cancelled, don't delete files for might resume latter
-            // result = doRemoreDownload(intent);
-            result = new Intent(SERVICE_STATE);
-            result.putExtra(SERVICE_STATE_EXTRA_STATE, mInstallerState.ordinal());
-        } else if (action.equals(PAUSE_DOWNLOAD)) {
-            // TODO: handle download
+            result = downloadRelease(intent);
+        } else if (action.equals(DOWNLOAD_UPDATE)) {
+            updateInstallerState(InstallerState.DOWNLOADING);
+            result = downloadUpdate();
         } else if (action.equals(RESUME_DOWNLOAD)) {
             updateInstallerState(InstallerState.DOWNLOADING);
-            // TODO: handle download
-        } else if (action.equals(CLEAN_DOWNLOAD)) {
-            result = doRemoreDownload(intent);
+            result = resumeDownload();
+        } else if (action.equals(DELETE_DOWNLOAD)) {
+            doDeleteDownloadedRelease();
         } else if (action.equals(INSTALL_UBUNTU)) {
             updateInstallerState(InstallerState.INSTALLING);
-            result = doInstallUbuntu(intent);
-        } else if (action.equals(IS_UBUNTU_UPGRADABLE)) {
+            result = doInstallUbuntu();
+        } else if (action.equals(CHECK_PENDING_UPDATES)) {
             // check if the upgradeable images available.
-            if(findInstallCommand()) {
-                Log.d(TAG, "There is a upgradeable file. send VERSION_UPDATE");
-                result = new Intent(VERSION_UPDATE);
-            }
-        } else if (action.equals(CANCEL_INSTALL)) {
-            // install should be already cancelled, try to delete it now
-            updateInstallerState(InstallerState.UNINSTALLING);
-            result = doUninstallUbuntu(intent);
+            findPendingUpdates();
+        } else if (action.equals(CHECK_IF_UPDATE_AVAILABLE)) {
+        	checkForAvailableUpdate();
         } else if (action.equals(UNINSTALL_UBUNTU)) {
             updateInstallerState(InstallerState.UNINSTALLING);
-            result = doUninstallUbuntu(intent);
+            doUninstallUbuntu(intent);
         } else if (action.equals(DELETE_UBUNTU_USER_DATA)) {  
             updateInstallerState(InstallerState.DELETING_USER_DATA);
-            result = doDeleteUbuntuUserData(intent);
+            deleteUbuntuUserData();
         } else if(action.equals(REBOOT_UBUNTU)) {
-            Log.d(TAG, this.toString() + ": REBOOT_UBUNTU");
-            doReboot(intent);
-            return;
+            rebootToUbuntu();
+            return;
+        } else if (action.equals(PREPARE_ANDROID_UPDATE)) {
+            prepareAndroidUpdate();
+            return;
+        } else if (action.equals(UPDATE_STORAGE_USE)) {
+        	updateInstallerState(InstallerState.CALCULATING_USAGE);
+        	doUpdateStorageUse();
         } else {
             // for any other request broadcast service state
-            result = new Intent(SERVICE_STATE);
-            result.putExtra(SERVICE_STATE_EXTRA_STATE, mInstallerState.ordinal());
+            result = new Intent(SERVICE_STATE_CHANGED);
         }
         if (result != null) {
             sendBroadcast(result);
         }
         updateInstallerState(InstallerState.READY);
-        Log.d(TAG, this.toString() + " onHandleIntent: " + action + " END");
+        Log.d(TAG, " onHandleIntent>>: " + debugAction);
     }
 
-    private Intent doGetChannelList(Intent intent) {
+    private Intent getChannelList(Intent intent) {
+        String serverUrl = intent.getStringExtra(GET_CHANNEL_LIST_EXTRA_SERVER_URL);
+        if (serverUrl == null) {
+            // use default server
+            serverUrl = Utils.getReleaseServerUrl(this);;
+        }
+        boolean includeProposed = mSharedPreferences.getBoolean(PREF_KEY_DEVELOPER, false);
+        HashMap<String, String> channels = doGetChannels(serverUrl, true, INCLUDE_SAUCY, INCLUDE_HIDDEN, includeProposed );
         Intent result = new Intent(AVAILABLE_CHANNELS);
-
-        HashMap<String, String> channels= new HashMap<String, String>();
-        boolean includeHidden = getSharedPreferences( SHARED_PREF, Context.MODE_PRIVATE).getBoolean(PREF_KEY_DEVELOPER, false);
+        result.putExtra(AVAILABLE_CHANNELS_EXTRA_CHANNELS, channels);
+        return result;        
+    }
+    
+    private HashMap<String, String> doGetChannels( String serverAddress,
+                                                   boolean friendlyName,
+                                                     boolean includeSaucy, 
+                                                     boolean includeHiden, 
+                                                     boolean includeProposed) {
+        HashMap<String, String> channels = new HashMap<String, String>();
         String deviceModel = Utils.getDeviceModel();
-        String channelJsonStr = Utils.httpDownload(BASE_URL + CHANNELS_JSON);
+        String channelJsonStr = Utils.httpDownload(serverAddress + CHANNELS_JSON);
         if (channelJsonStr != null) {
             JSONObject list;
             try {
                 list = (JSONObject) new JSONTokener(channelJsonStr).nextValue();
+                @SuppressWarnings("unchecked")
                 Iterator<String> keys = list.keys();
                 while(keys.hasNext()){
                     String key = keys.next();
-                    JSONObject channel = list.optJSONObject(key);
+                    final JSONObject channel = list.optJSONObject(key);
                     if (channel != null) {
-                        JSONObject devices = channel.optJSONObject("devices");
+                        final JSONObject devices = channel.optJSONObject("devices");
                         if (devices != null) {
-                            JSONObject device = devices.optJSONObject(deviceModel);
+                            final JSONObject device = devices.optJSONObject(deviceModel);
                             if (device != null) {
-                                String url = device.optString("index");
+                                final String url = device.optString("index");
                                 if (url != null) {
                                     // bingo, add to list if not hidden or developer
-                                    boolean hidden = channel.optBoolean("hiden"); // by default not hidden
-                                    String alias = channel.optString("alias");
-                                    if (alias == null || alias.equals("")) {
-                                        alias = key; // use key instead
+                                    final boolean hidden = channel.optBoolean("hidden"); // by default not hidden
+                                    // try to remove "ubuntu-touch/" so it's more human friendly
+                                    if (friendlyName && key.startsWith("ubuntu-touch/")) {
+                                        key = key.substring("ubuntu-touch/".length()); 
                                     }
-                                    // Log.v(TAG, "Channel:" + alias + "  url:" + url);                    
-                                    if (!hidden || includeHidden) {
-                                        channels.put(alias, url);
+                                    // Log.v(TAG, "Channel:" + key + "  url:" + url);
+                                    if ( 
+                                         ( includeSaucy || ! key.contains("saucy"))
+                                        && (
+                                            !hidden 
+                                            || includeHiden 
+                                            || ( includeProposed && key.contains("-proposed"))
+                                           )
+                                        ) {
+                                        channels.put(key, url);
                                     }
                                 }
                             }
@@ -363,44 +529,29 @@
                     }
                 }                
             } catch (JSONException e) {
-                // TODO Auto-generated catch block
                 e.printStackTrace();
             }
         }
-        result.putExtra(AVAILABLE_CHANNELS_EXTRA_CHANNELS, channels);
-        return result;
+        return channels;
     }
     
-    private Intent doRemoreDownload(Intent intent) {
-        Intent result = new Intent(SERVICE_STATE);
-        String s = deleteRelease();
-        if (s!= null) {
-            broadcastProgress(-1, s);
-            // delete failed
-        }
-        result.putExtra(SERVICE_STATE, InstallerState.READY.ordinal());
-        return result;
-    }
-
-    private Intent doInstallUbuntu(Intent intent) {
+    private Intent doInstallUbuntu() {
         Log.w(TAG, "doInstallUbuntu");
         Intent result = new Intent(INSTALL_RESULT);
 
         // get update command file
         String updateCommand = getUpdateCommand();
-
-        // 1. check if update command exist.
-        // 2. However, if the udpate command is in "/cache",
-        // the app can not access to /cache sometimes.
+        dismissUbuntuNotification();
+        // check if update command exist.
         if (updateCommand.equals("") ||
-                (!new File(updateCommand).exists() &&
-                 !updateCommand.startsWith("/cache"))) {
-            return handleInstallFail(result, -1, "Missing update command");
+                (!new File(updateCommand).exists())) {
+            
+            return handleInstallError(result, -1, "Missing update command");
         }
 
-        SharedPreferences pref = getSharedPreferences(SHARED_PREF, Context.MODE_PRIVATE);
-        mTotalSize = pref.getInt(PREF_KEY_ESTIMATED_CHECKPOINTS, 0);
+        mTotalSize = estimateCheckpooint(updateCommand);
         mLastSignalledProgress = 0;
+        mProgress = 0;
 
         List<String> shellcmds = new ArrayList<String>();
         {
@@ -427,37 +578,68 @@
                     UBUNTU_BOOT_IMG,
                     Utils.getRecoveryPartitionPath()
                     ));
+            // remove downloaded release
+            shellcmds.add(String.format("rm -rf %s\n", new File(updateCommand).getParent()));
             shellcmds.add("exit");
         }
 
-        broadcastProgress(-1, "Starting update script - " + updateCommand);
+        broadcastProgress("Starting update script - " + updateCommand);
         try {
             int ret = executeSUCommands(shellcmds.toArray(new String[shellcmds.size()]));
             result.putExtra(INSTALL_RESULT_EXTRA_INT, ret);
         } catch (EShellExecException e) {
-            return handleInstallFail(result, -1, e.getMessage());
+            return handleInstallError(result, -1, e.getMessage());
         }
-
+        Log.d(TAG, "doInstallUbuntu-update script finished");
+        mLastSignalledProgress = 100;
+        handleInstallFinish();
+        return result;
+    }
+    
+    /**
+     * Returns true if download or install is update operation
+     * @return
+     */
+    private boolean isUpdate() {
+        // if not defined, default value is DELTA, for updates downloaded by Ubuntu upgrader
+        return ( ReleaseType.DELTA == ReleaseType.fromValue( 
+                mSharedPreferences.getInt(PREF_KEY_DOWNLOAD_TYPE, ReleaseType.DELTA.getValue())));
+    }
+    
+    private void handleInstallFinish() {
         // we done.
+        dismissUbuntuUpdateNotification();
         cleanUpdateCommand();
-        VersionInfo v = new VersionInfo(pref, PREF_KEY_DOWNLOADED_VERSION);
-        v.storeVersion(pref.edit(), PREF_KEY_INSTALLED_VERSION);
-        mProgress = 100;
-        return result;
+        checkChannelAddress();
+        mSharedPreferences.edit()
+        .putBoolean(PREF_KEY_UBUNTU_INSTALLED, true)
+        .putBoolean(PREF_KEY_PENDING_UPDATE, false)
+        .commit();
+        Utils.registerUpdateCheckAlarm(this, mSharedPreferences);
+        // update notifications
+        if ( isUpdate()) {
+            showUbuntuNotification(R.string.notification_update_installed, LaunchActivity.class);
+        } else {
+            showUbuntuNotification(R.string.notification_ubuntu_installed, LaunchActivity.class);
+        }        
     }
 
-    private Intent handleInstallFail(Intent i, int res, String failReason) {
+    private Intent handleInstallError(Intent i, int res, String reason) {
+        mActionOutput += "\n" + reason;
+        if (isUpdate()) {
+            showUbuntuNotification(R.string.notification_installation_failed, LaunchActivity.class);
+        } else {
+            showUbuntuNotification(R.string.notification_installation_failed, InstallActivity.class);
+        }
         i.putExtra(INSTALL_RESULT_EXTRA_INT, -1);
-        i.putExtra(INSTALL_RESULT_EXTRA_STR, failReason);
-        // we don't want to unstainll if we failed to install a update.
-        // doUninstallUbuntu(i);
+        i.putExtra(INSTALL_RESULT_EXTRA_STR, reason);
         return i;
     }
 
-    private Intent doUninstallUbuntu(Intent intent) {
-        File workingFolder = new File(mRootOfWorkPath, TEMP_FOLDER);
+    private void doUninstallUbuntu(Intent intent) {
+        mActionOutput = "";
+        File workingFolder = new File(getFilesDir(), TEMP_FOLDER);
         File updateCommand = new File(workingFolder, UPDATE_COMMAND);
-        Intent result = new Intent(VERSION_UPDATE);
         boolean removeUserData = intent.getBooleanExtra(UNINSTALL_UBUNTU_EXTRA_REMOVE_USER_DATA, false);
         Log.d(TAG, "doUninstallUbuntu");
 
@@ -476,7 +658,7 @@
 
         // 1. force unmount
         // 2. restore android recovery partition, and deleted it.
-        // 3. delete system.img and SWAP.img.
+        // 3. delete system.img
         try {
             int r = executeSUCommands(
                     new String[]{
@@ -492,67 +674,86 @@
                                     Utils.getRecoveryPartitionPath()),
                             (String.format("rm -f %s/%s  || true\n", getFilesDir().toString(), ANDROID_REOCVERY_IMG)),
                             ("rm -rf /data/system.img || true\n"),
-                            ("rm -rf /data/SWAP.img || true\n"),
             } );
 
             if (r == 0) {
                 // delete installed version in preferences
                 cleanUpdateCommand();
-                VersionInfo.storeEmptyVersion(
-                        getSharedPreferences(SHARED_PREF, Context.MODE_PRIVATE).edit(), PREF_KEY_INSTALLED_VERSION);
+                if (removeUserData) {
+                    mSharedPreferences.edit()
+                    .putInt( PREF_KEY_SIZE_SYSTEM_DATA, 0)
+                    .putInt(PREF_KEY_SIZE_USER_DATA, 0)
+                    .commit();
+                }
+                setUbuntuUninstalled();
             }
-            result.putExtra("result", r);
         } catch (EShellExecException e) {
-            result.putExtra("result", -1);
+            // ignore error
         }
-
-        return result;
     }
 
-    private Intent doDeleteUbuntuUserData(Intent intent) {
-        Intent result = new Intent(VERSION_UPDATE);
-        File workingFolder = new File(mRootOfWorkPath, TEMP_FOLDER);
+    private void deleteUbuntuUserData() {
+        File workingFolder = new File(getFilesDir(), TEMP_FOLDER);
         File updateCommand = new File(workingFolder, UPDATE_COMMAND);
 
         try {
-            int r = executeSUCommands(new String[]{
-                String.format("echo \"%s %s\" > %s\n", COMMAND_FORMAT, PARTITION_DATA, UPDATE_COMMAND),
+            mSharedPreferences.edit()
+            .putInt(PREF_KEY_SIZE_SYSTEM_DATA, 0)
+            .putInt(PREF_KEY_SIZE_USER_DATA, 0)
+            .commit();
+            
+            executeSUCommands(new String[]{
+                String.format("echo \"%s %s\" > %s\n", COMMAND_FORMAT, PARTITION_DATA, updateCommand.getAbsolutePath()),
                 ("sh " + UPDATE_SCRIPT + " " + updateCommand.getAbsolutePath() + " " + getFilesDir().toString() + "\n")
             } );
-            result.putExtra("result", r);
         } catch (EShellExecException e) {
-            result.putExtra("fail_description", e.getMessage());
-            result.putExtra("result", -1);
+            Log.e(TAG,e.getMessage());
         }
-        return result;
     }
 
-    private void doReboot(Intent intent) {
-        // Reboot to recovery to complete update, try power manager if we have permissions
+    private void rebootToUbuntu() {
+    	// update storage use before reboot
+    	doUpdateStorageUse();
         try {
-            PowerManager powerManager = (PowerManager) getSystemService(Context.POWER_SERVICE);
-            powerManager.reboot("recovery");
-        } catch (SecurityException e) {
-            // FIXME: in Android 4.4, we do not get power manager permission.
-            // try it with SU permissions
-            try {
-                int r = executeSUCommands(new String[] {
-                        String.format("%s -b %s/%s %s || true\n",
-                                ANDROID_BOOTMGR,
-                                getFilesDir().getAbsolutePath(),
-                                UBUNTU_BOOT_IMG,
-                                Utils.getRecoveryPartitionPath()),
-                        "reboot recovery\n"
-                });
-                if(r != 255) {
-                    Utils.showToast(this.getApplicationContext(), "Rebooting to Ubuntu");
-                } else {
-                    Utils.showToast(this.getApplicationContext(),  "No permissions to reboot to recovery");
-                }
-            } catch (EShellExecException e1) {
+            int r = executeSUCommands(new String[] {
+                    String.format("%s -b %s/%s %s || true\n",
+                            ANDROID_BOOTMGR,
+                            getFilesDir().getAbsolutePath(),
+                            UBUNTU_BOOT_IMG,
+                            Utils.getRecoveryPartitionPath()),
+                    "reboot recovery\n"
+            });
+            if(r != 255) {
+                Utils.showToast(this.getApplicationContext(), "Rebooting to Ubuntu");
+            } else {
                 Utils.showToast(this.getApplicationContext(),  "No permissions to reboot to recovery");
             }
-        }
+        } catch (EShellExecException e1) {
+            Utils.showToast(this.getApplicationContext(),  "No permissions to reboot to recovery");
+        }
+    }
+    
+    /**
+     * Install back original recovery image
+     */
+    private void prepareAndroidUpdate() {
+        try {
+            int r = executeSUCommands(new String[] {
+                    String.format("%s -b %s/%s %s || true\n",
+                            ANDROID_BOOTMGR,
+                            getFilesDir().getAbsolutePath(),
+                            ANDROID_REOCVERY_IMG,
+                            Utils.getRecoveryPartitionPath())
+            });
+            if(r != 255) {
+                Utils.showToast(this.getApplicationContext(), "Restoring original recovery for Android updates");
+            } else {
+                Utils.showToast(this.getApplicationContext(),  "No permissions to restore recovery");
+            }
+        } catch (EShellExecException e1) {
+            Utils.showToast(this.getApplicationContext(),  "No permissions to restore recovery");
+        }
+
     }
 
     /**
@@ -563,16 +764,27 @@
      * @throws EShellExecException
      */
     private int executeSUCommands(String[] commands) throws EShellExecException {
+        mWakeLock.acquire(2 * 60 * 1000); // 2 minutes
+        try {
+            return doExecuteSUCommands(commands);
+        } finally {
+            if (mWakeLock.isHeld() ) {
+                mWakeLock.release();
+            }
+            Log.d(TAG, "executeSUCommands-releasing wakelocks");
+        }
+    }
+    
+    private int doExecuteSUCommands(String[] commands) throws EShellExecException {
         int ret = 0;
-        File rootFolder = new File(mRootOfWorkPath);
-        File workingFolder = new File(rootFolder, TEMP_FOLDER);
+        File workingFolder = new File(getFilesDir(), TEMP_FOLDER);
         String workingFolderPath = workingFolder.getAbsolutePath();
 
         if (!workingFolder.exists() && !workingFolder.mkdir()) {
             throw(new EShellExecException("Failed to create working folder"));
         }
 
-        broadcastProgress(0, "Extracting supporting files at " + workingFolder.getAbsolutePath());
+        broadcastProgress("Extracting supporting files at " + workingFolder.getAbsolutePath());
         try {
             // extract utils into working folder.
             Utils.extractExecutableAsset(this, ANDROID_BOOTMGR, workingFolderPath, true);
@@ -581,12 +793,10 @@
             Utils.extractExecutableAsset(this, GPG, workingFolderPath, true);
             Utils.extractExecutableAsset(this, TAR, workingFolderPath, true);
             Utils.extractExecutableAsset(this, UPDATE_SCRIPT, workingFolderPath, true);
-            Utils.extractExecutableAsset(this, UPGRADECHECKER, workingFolderPath, true);
         } catch (IOException e) {
             throw(new EShellExecException("Failed to extract supporting utils"));
         }
 
-        mWakeLock = mPowerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "shelling");
         try {
             Process process = Runtime.getRuntime().exec("su", null, workingFolder);
             DataOutputStream os = new DataOutputStream(process.getOutputStream());
@@ -615,6 +825,7 @@
             InputStream es = process.getErrorStream();
             boolean running = true;
             boolean scriptExecuted = false;
+            long time = System.currentTimeMillis();
             do {
                 while( is.available() > 0) {
                     read = is.read(buff);
@@ -623,30 +834,24 @@
                     }
                     scriptExecuted = true;
                     String seg = new String(buff, 0, read);
-                    Log.i(TAG, "Script Output: " + seg);
-                    broadcastProgress(-1, seg);
+                    
+                    Log.i(TAG, "Time(" + ((System.currentTimeMillis() - time)/1000) + "):Script Output: " + seg);
+                    broadcastProgress(seg);
+                    scanOutPut(seg);
                 }
                 while( es.available() > 0) {
                     read = es.read(buff);
                     if ( read <= 0 ) {
                         break;
                     }
-                    scriptExecuted = true;
-                    String seg = new String(buff,0,read);
-                    
-                    if (seg.startsWith("SWAP-file-missing")) {
-                        // this is signal that we will also install swap, adjust progress estimates
-                        mTotalSize += PROGRESS_MKSWAP_ADJUSTMENT + PROGRESS_SWAP_CREATION_ADJUSTMENT;
-                    } else {
-                        mProgress++;
-                        if (mTotalSize > 0 && mLastSignalledProgress < (mProgress * 100 / mTotalSize)) {
-                            // update and signal new progress
-                            mLastSignalledProgress = (int) (mProgress * 100 / mTotalSize);
-                            broadcastProgress(mLastSignalledProgress, null);
-                        }
+                    scriptExecuted = true;                   
+                    mProgress++;
+                    if (mTotalSize > 0 && mLastSignalledProgress < (mProgress * 100 / mTotalSize)) {
+                        // update and signal new progress
+                        mLastSignalledProgress = (int) (mProgress * 100 / mTotalSize);
+                        broadcastProgress(null);
                     }
-
-                    Log.i(TAG, "Stderr Output: " + seg);
+                    // Log.i(TAG, "Stderr Output: " + new String(buff,0,read));
                 }
                 try {
                     ret = process.exitValue();
@@ -663,335 +868,467 @@
             } while (running);
         } catch (IOException e) {
             throw(new EShellExecException("Script execution exception " + e.getMessage()));
+        }
+        Log.d(TAG, "executeSUCommands-done");
+        return ret;
+    }
+    
+    /**
+     * Scan output stream for additional information about installed system
+     * It scans for:
+     *   - usage data statistics
+     *   - installed version information
+     *   - update channel url if needed
+     * 
+     * @param seg
+     */
+    private void scanOutPut(String seg) {
+    	for( String line : seg.split("\n")) {
+            if (line.endsWith(UBUNTU_ROOTFS)) {
+            	storeStorageUse(line, PREF_KEY_SIZE_ROOTFS);
+            } else if (line.endsWith(UBUNTU_SYSTEM_DATA)) {
+            	storeStorageUse(line, PREF_KEY_SIZE_SYSTEM_DATA);
+            } else if (line.endsWith(UBUNTU_USER_DATA)) {
+            	storeStorageUse(line, PREF_KEY_SIZE_USER_DATA);
+    	    } else if (line.startsWith("build_number:")) {
+    	        parseVersion(line, PREF_KEY_VERSION_NUMBER);
+    	    } else if (line.startsWith("channel:")) {
+    	        parseVersion(line, PREF_KEY_VERSION_CHANNEL);
+            } else if (line.startsWith("channel_target:")) {
+                parseVersion(line, PREF_KEY_VERSION_CHANNEL_TARGET);
+    	    } else if (line.startsWith("version_detail:")) {
+    	        parseVersion(line, PREF_KEY_VERSION_DESCRIPTION);
+    	    } else if (line.startsWith("base:")) {
+    	        parseVersion(line, PREF_KEY_VERSION_BASE);
+    	    }
+    	}
+    }
+    
+    /**
+     * if channel address is empty, try to reconstruct it from version info
+     */
+    private void checkChannelAddress() {
+        if (!mSharedPreferences.contains(PREF_KEY_DOWNLOAD_CHANNEL) 
+            || !mSharedPreferences.contains(PREF_KEY_DOWNLOAD_SERVER)){
+            final String base =  mSharedPreferences.getString(PREF_KEY_VERSION_BASE, "");
+            String channel = mSharedPreferences.getString(PREF_KEY_VERSION_CHANNEL, "");
+            // if we have network, try to ping server, otherwise guess
+            String channelUrl = null;
+            if (isNetworkAvailable()) {
+                channelUrl = doGetChannels(String.format("http://%s", base), false, true, true, true).get(channel);
+            }
+            
+            if (channelUrl == null) {
+                // guess name
+                if (channel.contains("ubuntu-touch/")) {
+                    channelUrl = String.format("%s/%s/index.json", channel, Utils.getDeviceModel());
+                } else {
+                    channelUrl = String.format("ubuntu-touch/%s/%s/index.json", channel, Utils.getDeviceModel());
+                }
+            }
+            Log.d(TAG, "Constructed channel url:" + base + "/" + channelUrl);
+            mSharedPreferences.edit()
+            .putString(PREF_KEY_DOWNLOAD_CHANNEL, channelUrl)
+            .putString(PREF_KEY_DOWNLOAD_SERVER, String.format("http://%s", base))
+            .commit();
+        }
+    }
+    
+    private void storeStorageUse(String value, String key) {
+        final String[] spl = value.split("\t");
+        if (spl.length != 0) {
+            final int size = Integer.valueOf(spl[0]);
+            mSharedPreferences.edit().putInt(key, size).commit();
+        	final Intent notification = new Intent(STORAGE_USE_UPDATED);
+        	sendBroadcast(notification);
+        }
+    }
+    
+    private void parseVersion(String value, String key) {
+        final String[] spl = value.split(": ");
+        if (spl.length >= 2) {
+            mSharedPreferences.edit().putString(key, spl[1]).commit();
+        }
+    }
+
+    private Intent downloadRelease(Intent intent) {
+        String channel = intent.getStringExtra(DOWNLOAD_RELEASE_EXTRA_CHANNEL_URL);
+        String serverUrl = intent.getStringExtra(DOWNLOAD_RELEASE_EXTRA_SERVER_URL);
+        boolean bootstrap = intent.getBooleanExtra(DOWNLOAD_RELEASE_EXTRA_BOOTSTRAP,true); // default bootstrap on
+        int version = intent.getIntExtra(DOWNLOAD_RELEASE_EXTRA_VERSION,  -1);
+        ReleaseType releaseType = ReleaseType.fromValue(
+           intent.getIntExtra(DOWNLOAD_RELEASE_EXTRA_TYPE, ReleaseType.FULL.getValue())); // by default look for full releases
+        // First delete old release if it exists
+        doDeleteDownloadedRelease();
+        mSharedPreferences.edit().
+        putString(PREF_KEY_DOWNLOAD_SERVER, serverUrl).
+        putString(PREF_KEY_DOWNLOAD_CHANNEL, channel).
+        commit();
+        return downloadAllPackages(bootstrap, version, releaseType); 
+    }
+    
+    /**
+     * Download first available download
+     */
+    private Intent downloadUpdate() {
+        // -1 will pick update available for this release
+        return  downloadAllPackages(false, -1, ReleaseType.DELTA);
+    }
+    
+    private Intent resumeDownload() {
+        boolean bootstrap = mSharedPreferences.getBoolean(PREF_KEY_DOWNLOAD_BOOTSTRAP, false);
+        int version = mSharedPreferences.getInt(PREF_KEY_DOWNLOAD_VERSION, -1);
+        ReleaseType releaseType = ReleaseType.fromValue( 
+                mSharedPreferences.getInt(PREF_KEY_DOWNLOAD_TYPE, ReleaseType.FULL.getValue()));
+        return downloadAllPackages(bootstrap, version, releaseType);
+    }
+        
+    @SuppressLint("Wakelock")
+    private Intent downloadAllPackages(boolean bootstrap, int version, ReleaseType releaseType ) {
+        mWakeLock.acquire();
+        mWifiLock.acquire();
+        try {
+            return doDownloadAllPackages( bootstrap, version, releaseType);
         } finally {
-            if (mWakeLock != null && mWakeLock.isHeld()) {
+            Log.d(TAG, "downloadAllPackages-releasing wakelocks");
+            if (mWakeLock.isHeld() ) {
                 mWakeLock.release();
             }
+            if (mWifiLock.isHeld()) {
+                mWifiLock.release();
+            }
         }
-        return ret;
     }
-
-    private Intent doDownloadRelease(Intent intent) {
-        mWakeLock = mPowerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "ufa-downloading");
+    @SuppressLint("CommitPrefEdits")
+    private Intent doDownloadAllPackages(boolean bootstrap, int version, ReleaseType releaseType ) {
         mIsCanceled = false;
-        SharedPreferences.Editor editor = getSharedPreferences( SHARED_PREF, Context.MODE_PRIVATE).edit();
-
+        dismissUbuntuNotification();
+        mActionOutput = "";
+        broadcastProgress(getString(R.string.downloading_starting));
+        String channel = mSharedPreferences.getString(PREF_KEY_DOWNLOAD_CHANNEL, null);
+        String serverUrl = mSharedPreferences.getString(PREF_KEY_DOWNLOAD_SERVER, null);
         Intent result = new Intent(DOWNLOAD_RESULT);
-        VersionInfo prevDownload = getDownloadVersion(this.getApplicationContext());
-        try {
-            File rootFolder = new File(mRootOfWorkPath);
-
-            // first get from JSON list of files to download
-            String alias = intent.getStringExtra(DOWNLOAD_RELEASE_EXTRA_CHANNEL_ALIAS);
-            String jsonUrl = intent.getStringExtra(DOWNLOAD_RELEASE_EXTRA_CHANNEL_URL);
-            boolean bootstrap = intent.getBooleanExtra(DOWNLOAD_RELEASE_EXTRA_BOOTSTRAP,true); // default bootstrap on
-            int version = intent.getIntExtra(DOWNLOAD_RELEASE_EXTRA_VERSION,  -1);
-            ReleaseType releaseType = ReleaseType.fromValue(
-                    intent.getIntExtra(DOWNLOAD_RELEASE_EXTRA_TYPE, ReleaseType.FULL.getValue())); // by default look for full releases
-
-            String jsonStr = Utils.httpDownload(BASE_URL + jsonUrl);
-            List<Image> releases = JsonChannelParser.getAvailableReleases(jsonStr, ReleaseType.FULL);
-            if (releases.size() == 0 || releases.get(0).files.length == 0 ) {
-                // something is wrong, empty release
-                Log.e(TAG, "Empty releas");
-                return handleDownloadError(result, -1, "Empty release");
+        if (channel == null || serverUrl == null) {
+            doDeleteDownloadedRelease();
+            return handleDownloadError(result, -1, "Missing update server or channel url");
+        }
+
+        String jsonStr = Utils.httpDownload(String.format("%s/%s", serverUrl, channel));
+        if (jsonStr == null) {
+            Log.e(TAG, "Failed to fetch channel content");
+            return handleDownloadError(result, -1, "Failed to fetch channel content, check url");
+        }
+        List<Image> releases = JsonChannelParser.getAvailableReleases(jsonStr, releaseType);
+        if (releases.size() == 0 || releases.get(0).files.length == 0 ) {
+            // something is wrong, empty release
+            Log.e(TAG, "Empty releas");
+            return handleDownloadError(result, -1, "Empty release");
+        }
+        // get right version, otherwise first since that is most recent one
+        Image choosenRelease = null;
+        if (version != -1) {
+            // look for given release
+            for (Image i : releases) {
+                if (i.version == version) {
+                    choosenRelease = i;
+                    break;
+                }
             }
-            // get right version, otherwise first since that is most recent one
-            Image choosenRelease = null;
-            if (version != -1) {
-                // look for given release
-                for (Image i : releases) {
-                    if (i.version == version) {
+        } else {
+            if (releaseType == ReleaseType.FULL) {
+                choosenRelease = releases.get(0);
+            } else {
+                // this is update, found release wich relates to installed one
+                String baseStr = mSharedPreferences.getString(PREF_KEY_VERSION_NUMBER, "0");
+                int base = Integer.valueOf(baseStr);
+                for(Image i : releases) {
+                    if (i.base == base) {
                         choosenRelease = i;
                         break;
                     }
                 }
-                if (choosenRelease == null) {
-                    Log.e(TAG, "wrong release vwersion");
-                    return handleDownloadError(result, -1, "wrong release vwersion");
+            }
+        }
+        if (choosenRelease == null) {
+            Log.e(TAG, "wrong release vwersion");
+            return handleDownloadError(result, -1, "wrong release version");
+        }
+
+        JsonChannelParser.File updateFiles[] = choosenRelease.files;
+        // sort update files
+        List<JsonChannelParser.File> filesArray = new LinkedList<JsonChannelParser.File>();
+        for(JsonChannelParser.File f: updateFiles) {
+            // In bring up mode, skip device package updates
+            if (mBringup) {
+                if (!f.path.contains("device-")){
+                    filesArray.add(f);
                 }
             } else {
-                choosenRelease = releases.get(0);
-            }
-            JsonChannelParser.File updateFiles[] = choosenRelease.files;
-            // sort update files
-            List<JsonChannelParser.File> filesArray = new LinkedList<JsonChannelParser.File>();
-            for(JsonChannelParser.File f: updateFiles) {
                 filesArray.add(f);
             }
-            Collections.sort(filesArray, JsonChannelParser.fileComparator());
-            String updateFilenames[] = new String[updateFiles.length * 2];
-
-            // get list of keyrings to download
-            String keyrings[] = {
-                    String.format("%s/%s",BASE_URL, URL_IMAGE_MASTER),
-                    String.format("%s/%s",BASE_URL, URL_IMAGE_SIGNING),
-            };            
-            String keyringsFilenames[] = new String[keyrings.length * 2];
-
-            // First delete old release if it exists
-            {
-                boolean toDeleteOld = true;
-                if (prevDownload != null) {
-                    if (prevDownload.equals(jsonUrl, choosenRelease.version, releaseType) &&
-                            prevDownload.mDownloadedSize > 0) {
-                        toDeleteOld = false;
-                    }
-                }
-                if (toDeleteOld) {
-                    String s = deleteRelease();
-                    if (s != null) {
-                        // remove failed
-                        return handleDownloadError(result, -1, s);
-                    }
-                }
-            }
-
-            // make sure release folder exists
-            File release = new File(rootFolder, RELEASE_FOLDER);
-            release.mkdir();
-            // download release
-            long time = System.currentTimeMillis();
-            mLastSignalledProgress = 0;
-            mProgress = 0;
-            broadcastProgress(mLastSignalledProgress, null);
-            mTotalSize = Utils.calculateDownloadSize(filesArray);
-            long neededSize = mTotalSize;
-            if (prevDownload != null) {
-                neededSize = mTotalSize - prevDownload.mDownloadedSize;
-            }
-            boolean isStorageEnough = isStorageSpaceEnoughBFDownload(neededSize);
-            if (! isStorageEnough) {
-                String msg = "Need more storage: ";
-                if (workPathInCache) {
-                    msg += "/cache need " + String.valueOf(mTotalSize) + " bytes for download and /data need 2.5G for system";
+        }
+        Collections.sort(filesArray, JsonChannelParser.fileComparator());
+        String updateFilenames[] = new String[updateFiles.length];
+
+        // make sure release folder exists
+        mReleaseFolder.mkdir();
+        // download release
+        long time = System.currentTimeMillis();
+        mLastSignalledProgress = 0;
+        mProgress = 0;
+        broadcastProgress(null);
+        mTotalSize = Utils.calculateDownloadSize(filesArray);
+        long neededSize = mTotalSize;
+        boolean resuming = mSharedPreferences.getBoolean(PREF_KEY_DOWNLOAD_ACTIVE, false);
+        if (resuming ) {
+            neededSize = mTotalSize - mSharedPreferences.getLong(PREF_KEY_DOWNLOAD_COMPLETED, 0);
+        }
+        boolean isStorageEnough = isStorageSpaceEnoughBFDownload(neededSize);
+        if (! isStorageEnough) {
+            String msg = "Need more storage: ";
+            msg += "/data need 2.5G for system plus " + String.valueOf(mTotalSize) + " bytes for download";
+            Log.i(TAG, msg);
+            return handleDownloadError(result, -1, msg);
+        }
+
+        // Store download info
+        mSharedPreferences.edit()
+            .putBoolean(PREF_KEY_DOWNLOAD_BOOTSTRAP, bootstrap)
+            .putInt(PREF_KEY_DOWNLOAD_VERSION, version)
+            .putInt(PREF_KEY_DOWNLOAD_TYPE, releaseType.getValue())
+            .putBoolean(PREF_KEY_DOWNLOAD_ACTIVE, true)
+            .putString(PREF_KEY_DOWNLOAD_SERVER, serverUrl)
+            .putString(PREF_KEY_DOWNLOAD_CHANNEL, channel)
+            .commit();
+        
+        // mProgressSteps = mTotalDownloadSize / 100; // we want 1% steps
+        long downloadedSize = 0;
+        JsonChannelParser.File currentDownloadingFile = null;
+        try {
+            int i = 0;
+            // download all update packages
+            i = 0;
+            for (JsonChannelParser.File file : filesArray){
+                URL url = new URL(serverUrl + file.path);
+                String fileName = URLUtil.guessFileName(url.toString(), null, null);
+                File f = new File(mReleaseFolder, fileName);
+
+                boolean fileNeedDownload = true;
+                if (resuming) {
+                    long length = f.length();
+                    if (length == file.size) {
+                        fileNeedDownload = false;
+                    } else if (length > file.size) {
+                        f.delete();
+                    }
+                }
+                if (fileNeedDownload) {
+                    currentDownloadingFile = file;
+                    updateFilenames[i] = doDownloadFile(serverUrl, file, mReleaseFolder);
+                    currentDownloadingFile = null;
                 } else {
-                    msg += "/data need 2.5G for system plus " + String.valueOf(mTotalSize) + " bytes for download";
-                }
-                Log.i(TAG, msg);
-                return handleDownloadError(result, -1, msg);
-            }
-
-            // mProgressSteps = mTotalDownloadSize / 100; // we want 1% steps
-            long downloadedSize = 0;
-            JsonChannelParser.File currentDownloadingFile = null;
+                    updateFilenames[i] = fileName;
+                    mProgress += file.size;
+                    mLastSignalledProgress = (int) (mProgress * 100 / mTotalSize);
+                    broadcastProgress(null);
+                }
+
+                // check file size and check sum
+                long length = f.length();
+                if (length != file.size) {
+                    f.delete();
+                    throw new ESumNotMatchException();
+                }
+                broadcastProgress("Checksum Verifying: " + fileName);
+                String sha256sum = Utils.getSha256Sum(f);
+                if (! sha256sum.equals(file.checksum)) {
+                    broadcastProgress("Checksum Verify failed: " + fileName);
+                    f.delete();
+                    throw new ESumNotMatchException();
+                }
+                broadcastProgress("Checksum Verified: " + fileName);
+                downloadedSize += file.size;
+                i++;
+            }
+
+            // data required for installation.
+            // Ubuntu reboot apps.
+            Utils.extractExecutableAsset(this, U_REBOOT_APP, mReleaseFolder.getAbsolutePath(), false);
+            Utils.extractExecutableAsset(this, RECOVERY_REMOUNT, mReleaseFolder.getAbsolutePath(), false);
+        } catch (MalformedURLException e) {
+            Log.e(TAG, "Failed to download release:", e);
+            return handleDownloadError(result, -1, "Malformed release url");
+        } catch (FileNotFoundException e) {
+            Log.e(TAG, "Failed to download release:", e);
+            return handleDownloadError(result, -1, "File not found");
+        } catch (IOException e){
+            if (currentDownloadingFile != null) {
+                try {
+                    URL url = new URL(serverUrl + currentDownloadingFile.path);
+                    String fileName = URLUtil.guessFileName(url.toString(), null, null);
+                    File f = new File(mReleaseFolder, fileName);
+                    downloadedSize += f.length();
+                } catch (MalformedURLException e1) {
+                    // shouldn't happen for it should already happen.
+                }
+            }
+
+            if (downloadedSize == 0) {
+                doDeleteDownloadedRelease();
+                mSharedPreferences.edit().putBoolean(PREF_KEY_DOWNLOAD_ACTIVE, false).commit();
+            } else {
+                mSharedPreferences.edit().putLong(PREF_KEY_DOWNLOAD_COMPLETED, downloadedSize).commit();
+            }
+
+            Log.e(TAG, "Failed to download release:", e);
+            return handleDownloadError(result, -1, "IO Error");
+        } catch (ESumNotMatchException e) {
+            // Download file check sum error !!
+            doDeleteDownloadedRelease();
+            return handleDownloadError(result, -1, "Download check sum error");
+        } catch (ECancelException e) {
+            // Download was cancelled by user
+            downloadedSize += e.mDownloadedSize;
+            if (downloadedSize == 0) {
+                mSharedPreferences.edit().putBoolean(PREF_KEY_DOWNLOAD_ACTIVE, false).commit();
+            } else {
+                mSharedPreferences.edit().putLong(PREF_KEY_DOWNLOAD_COMPLETED, downloadedSize).commit();
+            }
+                
+            return handleDownloadError(result, -2, "Download cancelled by user");
+        }
+
+        Log.i(TAG, "Download done in " + (System.currentTimeMillis() - time )/1000 + " seconds");
+        broadcastProgress("Generating update command");
+
+        // generate update_command
+        File updateCommand = new File(mReleaseFolder, UPDATE_COMMAND);
+        try {
+            FileOutputStream fos = new FileOutputStream(updateCommand);
             try {
+                if (bootstrap) {
+                    fos.write((String.format("%s %s\n", COMMAND_FORMAT, PARTITION_DATA)).getBytes());
+                }
+                if (releaseType == ReleaseType.FULL) {
+                    fos.write((String.format("%s %s\n", COMMAND_FORMAT, PARTITION_SYSTEM)).getBytes());
+                }
+                fos.write((String.format("%s %s\n", COMMAND_MOUNT, PARTITION_SYSTEM)).getBytes());
+
+                // add update commands
                 int i = 0;
-                for(String url : keyrings){
-                    keyringsFilenames[i++] = doDownloadUrl(new URL(url), release);
-                    // download signature
-                    keyringsFilenames[i++] = doDownloadUrl(new URL(url+ASC_SUFFIX), release);
-                }
-
-                // download all update images
-                i = 0;
-                for (JsonChannelParser.File file : filesArray){
-                    URL url = new URL(BASE_URL + file.path);
-                    String fileName = URLUtil.guessFileName(url.toString(), null, null);
-                    File f = new File(release, fileName);
-
-                    boolean fileNeedDownload = true;
-                    if (prevDownload != null) {
-                        long length = f.length();
-                        if (length == file.size) {
-                            fileNeedDownload = false;
-                        } else if (length > file.size) {
-                            f.delete();
-                        }
-                    }
-                    if (fileNeedDownload) {
-                        currentDownloadingFile = file;
-                        updateFilenames[i] = doDownloadFile(file, release);
-                        currentDownloadingFile = null;
-                    } else {
-                        updateFilenames[i] = fileName;
-                        mProgress += file.size;
-                        mLastSignalledProgress = (int) (mProgress * 100 / mTotalSize);
-                        broadcastProgress(mLastSignalledProgress, null);
-                    }
-
-                    // check file size and check sum
-                    long length = f.length();
-                    if (length != file.size) {
-                        f.delete();
-                        throw new ESumNotMatchException();
-                    }
-                    broadcastProgress(mLastSignalledProgress, "Checksum Verifying: " + fileName);
-                    String sha256sum = Utils.getSha256Sum(f);
-                    if (! sha256sum.equals(file.checksum)) {
-                        broadcastProgress(mLastSignalledProgress, "Checksum Verify failed: " + fileName);
-                        f.delete();
-                        throw new ESumNotMatchException();
-                    }
-                    broadcastProgress(mLastSignalledProgress, "Checksum Verified: " + fileName);
-                    downloadedSize += file.size;
-                    i++;
-
-                    // signature file size is not accounted for resume since it's quite small
-                    updateFilenames[i] = doDownloadFileSignature(file, release);
-                    i++;
-                }
-
-                // data required for installation.
-                Utils.extractExecutableAsset(this, ARCHIVE_MASTER_ASC, release.getAbsolutePath(), false);
-                Utils.extractExecutableAsset(this, ARCHIVE_MASTER, release.getAbsolutePath(), false);
-                // Ubuntu reboot apps.
-                Utils.extractExecutableAsset(this, U_REBOOT_APP_ASC, release.getAbsolutePath(), false);
-                Utils.extractExecutableAsset(this, U_REBOOT_APP, release.getAbsolutePath(), false);
-            } catch (MalformedURLException e) {
-                Log.e(TAG, "Failed to download release:", e);
-                return handleDownloadError(result, -1, "Malformed release url");
-            } catch (FileNotFoundException e) {
-                Log.e(TAG, "Failed to download release:", e);
-                return handleDownloadError(result, -1, "File not found");
-            } catch (IOException e){
-                if (currentDownloadingFile != null) {
-                    try {
-                        URL url = new URL(BASE_URL + currentDownloadingFile.path);
-                        String fileName = URLUtil.guessFileName(url.toString(), null, null);
-                        File f = new File(release, fileName);
-                        downloadedSize += f.length();
-                    } catch (MalformedURLException e1) {
-                        // shouldn't happen for it should already happen.
-                    }
-                }
-
-                if (downloadedSize > 0) {
-                    VersionInfo v = new VersionInfo(alias, jsonUrl, choosenRelease.description, choosenRelease.version,
-                            downloadedSize, releaseType);
-                    v.storeVersion(editor, PREF_KEY_DOWNLOADED_VERSION);
-                } else {
-                    editor.putString(PREF_KEY_UPDATE_COMMAND, "");
-                    VersionInfo.storeEmptyVersion(editor, PREF_KEY_DOWNLOADED_VERSION);
-                }
-
-                Log.e(TAG, "Failed to download release:", e);
-                return handleDownloadError(result, -1, "IO Error");
-            } catch (ESumNotMatchException e) {
-                // Download file check sum error !!
-                return handleDownloadError(result, -1, "Download check sum error");
-            } catch (ECancelException e) {
-                // Download was cancelled by user
-                downloadedSize += e.mDownloadedSize;
-                if (downloadedSize > 0) {
-                    VersionInfo v = new VersionInfo(alias, jsonUrl, choosenRelease.description, choosenRelease.version,
-                            downloadedSize, releaseType);
-                    v.storeVersion(editor, PREF_KEY_DOWNLOADED_VERSION);
-                }
-                return handleDownloadError(result, -2, "Download cancelled by user");
-            }
-
-            Log.i(TAG, "Download done in " + (System.currentTimeMillis() - time )/1000 + " seconds");
-            broadcastProgress(-1, "Generating update command");
-
-            // generate update_command
-            File updateCommand = new File(release, UPDATE_COMMAND);
-            try {
-                FileOutputStream fos = new FileOutputStream(updateCommand);
-                try {
-                    if (bootstrap) {
-                        fos.write((String.format("%s %s\n", COMMAND_FORMAT, PARTITION_DATA)).getBytes());
-                    }
-                    if (releaseType == ReleaseType.FULL) {
-                        fos.write((String.format("%s %s\n", COMMAND_FORMAT, PARTITION_SYSTEM)).getBytes());
-                    }
-                    // load keyrings
-                    int i = 0;
-                    while (i < keyringsFilenames.length) {
-                        fos.write((String.format("%s %s %s\n",
-                                COMMAND_LOAD_KEYRING,
-                                keyringsFilenames[i++],
-                                keyringsFilenames[i++])).getBytes());
-                    }
-                    fos.write((String.format("%s %s\n", COMMAND_MOUNT, PARTITION_SYSTEM)).getBytes());
-
-                    // add update commands
-                    i = 0;
-                    while (i < updateFilenames.length) {
-                        fos.write((String.format("%s %s %s\n",
-                                COMMAND_UPDATE,
-                                updateFilenames[i++],
-                                updateFilenames[i++])).getBytes());
-                    }
-
-                    // add Ubuntu reboot app update package
-                    if (releaseType == ReleaseType.FULL) {
-                        fos.write((String.format("%s %s %s\n",
-                                COMMAND_UPDATE,
-                                U_REBOOT_APP,
-                                U_REBOOT_APP_ASC)).getBytes());
-                    }
-                    if(releaseType == ReleaseType.DELTA) {
-                        // TODO:
-                    }
-                    fos.write((String.format("%s %s\n", COMMAND_UMOUNT, PARTITION_SYSTEM)).getBytes());
-                    fos.flush();
-                } finally {
-                    fos.close();
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-                return handleDownloadError(result, -1, "Failed to generate update command");
-            }
-            broadcastProgress(-1, "Download done in " + (System.currentTimeMillis() - time )/1000 + " seconds");
-            int estimatedCheckCount = 0;
-            for (JsonChannelParser.File file : filesArray){
-                 if (file.path.contains("ubuntu-")) {
-                     estimatedCheckCount += (file.size / PROGRESS_UBUNTU_ADJUSTMENT);
-                 } else if (file.path.contains("device-")) {
-                     estimatedCheckCount += (file.size / PROGRESS_DEVICE_ADJUSTMENT);
-                 } else if (file.path.contains("custom-")) {
-                     estimatedCheckCount += (file.size / PROGRESS_CUSTOM_ADJUSTMENT);
-                 }
-            }
-            // store update command
-            setUpdateCommand(updateCommand.getAbsolutePath());
-
-            // updated downloaded information.
-            VersionInfo v = new VersionInfo(alias, jsonUrl, choosenRelease.description, choosenRelease.version, 0, releaseType);
-
-            editor.putInt(PREF_KEY_ESTIMATED_CHECKPOINTS, estimatedCheckCount);
-            v.storeVersion(editor, PREF_KEY_DOWNLOADED_VERSION);
-            mProgress = 100;
-        } finally {
-            if (mWakeLock != null && mWakeLock.isHeld()) {
-                mWakeLock.release();
-            }
+                while (i < updateFilenames.length) {
+                    fos.write((String.format("%s %s\n",
+                            COMMAND_UPDATE,
+                            updateFilenames[i++])).getBytes());
+                }
+
+                // add Ubuntu reboot app and recovery remount update packages
+                if (releaseType == ReleaseType.FULL) {
+                    fos.write((String.format("%s %s\n",
+                            COMMAND_UPDATE,
+                            U_REBOOT_APP)).getBytes());
+                    
+                    fos.write((String.format("%s %s\n",
+                            COMMAND_UPDATE,
+                            RECOVERY_REMOUNT)).getBytes());
+                }
+                fos.write((String.format("%s %s\n", COMMAND_UMOUNT, PARTITION_SYSTEM)).getBytes());
+                fos.flush();
+            } finally {
+                fos.close();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            doDeleteDownloadedRelease();
+            mSharedPreferences.edit().putBoolean(PREF_KEY_DOWNLOAD_ACTIVE, false).commit();
+            return handleDownloadError(result, -1, "Failed to generate update command");
+        }
+        
+        mLastSignalledProgress = 100;
+        broadcastProgress("Download done in " + (System.currentTimeMillis() - time )/1000 + " seconds");
+        // store update command
+        setUpdateCommand(updateCommand.getAbsolutePath());
+        mSharedPreferences.edit().putBoolean(PREF_KEY_DOWNLOAD_ACTIVE, false).commit();
+        dismissProgressNotification();
+        // check if we should also do install
+        if ( MIN_INSTALL_BATTERY_CHARGE < getBatteryCharge(this)) {
+            updateInstallerState(InstallerState.INSTALLING);
+            return doInstallUbuntu();
         }
         result.putExtra(DOWNLOAD_RESULT_EXTRA_INT, 0);
         return result;
     }
     
+    /**
+     * Go through update folder and based on size estimate number of install checkpoint
+     * @param updateCommand update command file
+     * @return number of checkpoints
+     */
+    private int estimateCheckpooint(String updateCommand) {
+
+        long estimatedCheckCount = 0;
+        ReleaseType releaseType = ReleaseType.fromValue( // use delta as default for unknown updates
+                mSharedPreferences.getInt(PREF_KEY_DOWNLOAD_TYPE, ReleaseType.DELTA.getValue()));
+        File command = new File(updateCommand);
+        File updateFolder = command.getParentFile();
+        if (updateFolder != null && updateFolder.isDirectory()) {
+            // looks for any file in this folder
+            File[] files = updateFolder.listFiles(
+                    new FileFilter(){
+                            public boolean accept (File pathname) {
+                                if (pathname.isFile() && pathname.getName().endsWith(".tar.xz")) {
+                                    return true;
+                                }
+                                return false;
+                            }
+                        });
+            for (File f : files) {
+                if (f.getName().startsWith("ubuntu-")) {
+                    estimatedCheckCount += (f.length() / PROGRESS_UBUNTU_ADJUSTMENT);
+                } else if (f.getName().startsWith("device-")) {
+                    estimatedCheckCount += (f.length() / PROGRESS_DEVICE_ADJUSTMENT);
+                } else {
+                    estimatedCheckCount += (f.length() / PROGRESS_CUSTOM_ADJUSTMENT);
+                }
+            }
+        }
+        if (releaseType == ReleaseType.DELTA) {
+            // set double checkpoints for removing files
+            estimatedCheckCount *=2;
+        }
+        return (int)estimatedCheckCount;
+    }
+    
+    /**
+     * Handle download error
+     */
     private Intent handleDownloadError(Intent i, int res, String reason) {
+        mActionOutput += "\n" + reason;
+        if ( res == -2) {
+            // download canceled by user, dismiss progress notification
+            dismissProgressNotification();
+        } else if (isUpdate()) {
+            showUbuntuNotification(R.string.notification_download_failed, LaunchActivity.class);
+        } else {
+            showUbuntuNotification(R.string.notification_download_failed, InstallActivity.class);
+        }
         i.putExtra(DOWNLOAD_RESULT_EXTRA_INT, res);
         i.putExtra(DOWNLOAD_RESULT_EXTRA_STR, reason);
         return i;
     }
 
-    private String doDownloadFile(JsonChannelParser.File file, File targetLocation) throws MalformedURLException,
-    FileNotFoundException, IOException, ECancelException {
-        URL url = new URL(BASE_URL + file.path);
+    private String doDownloadFile(String serverUrl, JsonChannelParser.File file, File targetLocation) 
+            throws MalformedURLException, FileNotFoundException, IOException, ECancelException {
+        URL url = new URL(serverUrl + file.path);
         return doDownloadUrl(url, targetLocation, true);
     }
 
-    private String doDownloadFileSignature(JsonChannelParser.File file, File targetLocation) throws MalformedURLException,
-    FileNotFoundException, IOException, ECancelException {
-        URL url = new URL(BASE_URL + file.signature);
-        return doDownloadUrl(url, targetLocation);
-    }
-    
-    private String doDownloadUrl(URL url, File targertLocation) throws MalformedURLException,
-    FileNotFoundException, IOException, ECancelException {
-        return doDownloadUrl(url, targertLocation, false);
-    }
-
     private String doDownloadUrl(URL url, File targertLocation, boolean resume) throws MalformedURLException,
     FileNotFoundException, IOException, ECancelException {
         Log.v(TAG, "Downloading:" + url.toString());
         URLConnection conn = url.openConnection();
         String fileName = URLUtil.guessFileName(url.toString(), null, null);
-        // TODO: update progress accordingly
-        broadcastProgress(mLastSignalledProgress, "Downloading: " + fileName);
+        broadcastProgress("Downloading: " + fileName);
         File file = new File(targertLocation, fileName);
         if ((! resume) && file.exists() && file.isFile()) {
             file.delete();
@@ -1011,7 +1348,7 @@
         // resumePosition > 0 ==> append mode
         FileOutputStream output = new FileOutputStream(file, resumePosition > 0);
 
-        InputStream input = conn.getInputStream();
+        final InputStream input = conn.getInputStream();
 
         byte[] buffer = new byte[1024];
         int len = 0;
@@ -1021,9 +1358,18 @@
                 output.close();
                 conn = null;
                 // input.close() need more time to close() as donwload large file.
-                input = null;
+                new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            input.close();
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }).start();
                 long flen = file.length();
-                if (flen > 0) {
+                if (flen > 0 && !resume) {
                     try {
                         file.delete();
                         flen = 0;
@@ -1041,7 +1387,7 @@
             if (mLastSignalledProgress < (mProgress * 100 / mTotalSize)) {
                 // update and signal new progress
                 mLastSignalledProgress = (int) (mProgress * 100 / mTotalSize);
-                broadcastProgress(mLastSignalledProgress, null);
+                broadcastProgress(null);
             }
         }
         output.flush();
@@ -1066,52 +1412,42 @@
     }
 
     /**
-     * @return null if success or error
+     * Delete downloaded release
      */
-    private String deleteRelease() {
-        // First delete old release if it exists
-        File rootFolder = new File(mRootOfWorkPath);
-        File release = new File(rootFolder, RELEASE_FOLDER);
-        if (release.exists()) {
-            deleteDirectory(release);
-            // cleanup update command
-            cleanUpdateCommand();
-            // clean up version number.
-            VersionInfo.storeEmptyVersion(getSharedPreferences(SHARED_PREF, Context.MODE_PRIVATE).edit(), PREF_KEY_DOWNLOADED_VERSION);
+    private void doDeleteDownloadedRelease() {
+        //  delete old release if it exists
+        if (mReleaseFolder.exists()) {
+            deleteDirectory(mReleaseFolder);
         }
-        return null;
+        // cleanup update command
+        cleanUpdateCommand();
+        mSharedPreferences.edit()
+        .remove(PREF_KEY_DOWNLOAD_CHANNEL)
+        .remove(PREF_KEY_DOWNLOAD_SERVER)
+        .remove(PREF_KEY_DOWNLOAD_BOOTSTRAP)
+        .remove(PREF_KEY_DOWNLOAD_VERSION)
+        .putBoolean(PREF_KEY_DOWNLOAD_ACTIVE, false)
+        .putLong(PREF_KEY_DOWNLOAD_COMPLETED, 0)
+        .remove(PREF_KEY_DOWNLOAD_TYPE)
+        .commit();
     }
 
-    private void broadcastInstallerState() {
-        Intent i = new Intent(SERVICE_STATE);
-        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());
+        mServiceState = newState;
+        Intent i = new Intent(SERVICE_STATE_CHANGED);
         sendBroadcast(i);        
     }
 
     /**
-     * Check whether storage free space is enough.
+     * Check whether storage free space is enough for install or update
      * @param downloadSize: download size from json. 0 means file already downloaded.
-     * @return true if stoarge size is ok to go.
+     * @return true if storage size is ok to go.
      */
     private boolean isStorageSpaceEnoughBFDownload(long downloadSize) {
-        long dataSizeRequired = INSTALL_SIZE_REQUIRED;
-
-        if (workPathInCache) {
-            if (downloadSize > 0) {
-                long cacheFreeSpace = Utils.getFreeSpaceInBytes("/cache");
-                if (cacheFreeSpace < EXTRA_SIZE_REQUIRED + downloadSize) {
-                    return false;
-                }
-            }
-        } else {
-            dataSizeRequired += downloadSize;
+        long dataSizeRequired = downloadSize;
+        // if Ubuntu is already installed, we don't need that extra space, it will be freed
+        if (!mSharedPreferences.getBoolean(PREF_KEY_UBUNTU_INSTALLED, false)) {
+            dataSizeRequired  += INSTALL_SIZE_REQUIRED;
         }
 
         long dataFreeSpace = Utils.getFreeSpaceInBytes("/data");
@@ -1121,114 +1457,127 @@
         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;
-    }
-
-    /**
-     * Internal helper function to get current DOWNLOAD_VERSION even download is partial
-     * @param context
-     * @return version info for download image.
-     */
-    private static VersionInfo getDownloadVersion(Context context) {
-        return getVersionWithPrefKey(context, PREF_KEY_DOWNLOADED_VERSION);
-    }
-    
-    /**
-     * To get current DOWNLOAD_VERSION for completed download.
-     * @param context
-     * @return Version info for download-ed image.
-     */
-    public static VersionInfo getDownloadedVersion(Context context) {
-        VersionInfo v = getVersionWithPrefKey(context, PREF_KEY_DOWNLOADED_VERSION);
-        if (v != null) {
-            if (v.mDownloadedSize == 0) return v;
-        }
-        return null;
-    }
-
-    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 update_command available for upgrade.
-     *
-     * @param c
-     * @return
-     */
-    public static boolean isUpgradeable(Context c) {
-        String cmd = c.getSharedPreferences(SHARED_PREF, Context.MODE_PRIVATE).getString(PREF_KEY_UPDATE_COMMAND, "");
-        return (cmd.startsWith("/cache/"));
-    }
-
-    /**
-     * check if recovery command is exist on the system.
+
+    /**
+     * Check if recovery command exists on the system.
      * system-image in Ubuntu Touch downloaded new version of image at /cache/recovery.
      * This function check if there is a ubuntu_command file in /cache/recovery.
      *
      * The ubuntu_command  will be renamed or removed after installation.
-     *
-     * @return if there is upgradeable images stored in /cache.
-     */
-    public boolean findInstallCommand () {
-        String[] candidates = {
-                "/cache/recovery/ubuntu_command",
-                "/cache/ubunturecovery/ubuntu_command",
-        };
-        boolean ret = false;
-        for(String command: candidates) {
-            if(new File("/cache").canRead()) {
-                // if we have permission, we can read /cache.
-                File cmd = new File(command);
-                if(cmd.exists() && cmd.isFile()) {
-                    Log.d(TAG, "Found upgrade command - " + cmd.getAbsoluteFile().toString());
-                    // find the upgradeable file, stored into pref.
-                    setUpdateCommand(cmd.getAbsolutePath());
-                    ret = true;
-                }
-            } else {
-                // check the file with su
-                File workingFolder = new File(mRootOfWorkPath + "/" + TEMP_FOLDER);
-                if (!workingFolder.exists() && !workingFolder.mkdir()) {
-                    Log.e(TAG, "can not create working folder");
-                    ret = false;
-                }
-                try {
-                    int r = executeSUCommands(new String[] {
-                            String.format("%s %s\n", UPGRADECHECKER, command),
-                    });
-                    if(r == 1) {
-                        Log.d(TAG, "Found upgradeable file - " + command);
-                        setUpdateCommand(command);
-                        ret = true;
-                    }
-                } catch (EShellExecException e) {
-                    ret = false;
-                }
-            }
-        }
-        if(ret) {
-            // FIXME we don't know what's the version in /cache.
-            SharedPreferences pref = getSharedPreferences(SHARED_PREF, Context.MODE_PRIVATE);
-            VersionInfo v = new VersionInfo(pref, PREF_KEY_INSTALLED_VERSION);
-            v.storeVersion(pref.edit(), PREF_KEY_DOWNLOADED_VERSION);
-        }
-        return ret;
+     */
+    public void findPendingUpdates () {
+        
+        // check is there is update in linked upgrader folder
+        File linkedUpgrader = new File(getFilesDir(), LINKED_UPGRADER_COMMAND );
+        File downloadedUpdate = new File(mReleaseFolder, UPDATE_COMMAND );
+        boolean updateAvailable = false;
+        if (linkedUpgrader.exists()) {
+            updateAvailable = true;
+        	setUpdateCommand(linkedUpgrader.getAbsolutePath());
+        	// parse file, if it has "format system", it will full install
+        	if (Utils.parseAndUpdateInstallCommand(this,linkedUpgrader)) {
+        	    // remove channel and server so it's parsed from new install
+        	    mSharedPreferences.edit()
+        	    .remove(PREF_KEY_DOWNLOAD_CHANNEL)
+        	    .remove(PREF_KEY_DOWNLOAD_SERVER).commit();
+        	}
+        	// if there is anything downloaded by this installer, we prefer updates from Ubuntu updater
+            if (mReleaseFolder.exists()) {
+                deleteDirectory(mReleaseFolder);
+            }
+        } else if (downloadedUpdate.exists()) {
+            updateAvailable = true;
+            setUpdateCommand(downloadedUpdate.getAbsolutePath());
+        }
+        if (updateAvailable) {
+            mSharedPreferences.edit().putBoolean(PREF_KEY_PENDING_UPDATE,true);
+            sendBroadcast(new Intent(UBUNTU_UPDATE_PENDING));
+            showUbuntuUpdateNotification(R.string.notification_update_available);
+        }
+        // check if there is also Android update
+        checkForPendingAndroidUpdate();
+        File androidUpdate = new File(getFilesDir(), PENDING_ANDROID_UPDATE);
+        if (androidUpdate.exists()) {
+            // delete file, we don't need it anymore
+            androidUpdate.delete();
+            sendBroadcast(new Intent(ANDROID_UPDATE_PENDING));
+            // show notification only if it is desired by user
+            if (!mSharedPreferences.getBoolean(PREF_KEY_ANDROID_UPDATE_DISMISSED, false)) {
+                showAndroidUpdateNotification();
+            }
+        }
+    }
+    
+    /**
+     * Check if there is pending android update zip package already downloaded
+     */
+    private void checkForPendingAndroidUpdate() {
+        try {
+            executeSUCommands(new String[] {
+                String.format("if [[ ! -z $(busybox find /cache/ -maxdepth 1 -iname '*%s*%s*.zip') ]]; then touch %s/%s; chmod 777 %s/%s; fi\n",
+                        Build.PRODUCT.toLowerCase(Locale.US),
+                        Build.ID,
+                        getFilesDir().toString(),
+                        PENDING_ANDROID_UPDATE,
+                        getFilesDir().toString(),
+                        PENDING_ANDROID_UPDATE)
+            });
+        } catch (EShellExecException e1) {
+            // ignore error
+        }
+    }
+    
+    /**
+     * Check if there is available update to be downloaded
+     */
+    private void checkForAvailableUpdate() {
+        String channel = mSharedPreferences.getString(PREF_KEY_DOWNLOAD_CHANNEL, null);
+        String server = mSharedPreferences.getString(PREF_KEY_DOWNLOAD_SERVER, null);
+        if (channel == null || server == null) {
+            // no stored channel or server URL
+            return;
+        }
+        String jsonStr = Utils.httpDownload(String.format("%s/%s", server, channel));
+        if (jsonStr != null) {
+            List<Image> releases = JsonChannelParser.getAvailableReleases(jsonStr, ReleaseType.DELTA);
+            if (releases.size() == 0 || releases.get(0).files.length == 0 ) {
+                // something is wrong, empty release
+                Log.e(TAG, "Empty releas");
+                return;
+            }
+            // look for version with right base
+            String baseStr = mSharedPreferences.getString(PREF_KEY_VERSION_NUMBER, "0");
+            int base = Integer.valueOf(baseStr);
+            for(Image r : releases) {
+                if (r.base == base) {
+                    Log.d(TAG, "Found update to version:" + r.version);
+                    mSharedPreferences.edit().putBoolean(PREF_KEY_PENDING_UPDATE, true).commit();
+                    Intent intent = new Intent(UBUNTU_UPDATE_AVAILABLE);
+                    sendBroadcast(intent);
+                    // show notification
+                    showUbuntuUpdateNotification(R.string.notification_update_available);
+                    return;
+                }
+            }
+        }
+    }
+    
+    /**
+     * Update used storage
+     * @return broadcast about data being updated
+     */
+    private void doUpdateStorageUse() {
+        try {
+			executeSUCommands(
+		        new String[]{
+		            String.format("busybox du -sm %s || true\n", UBUNTU_ROOTFS),
+		            String.format("busybox du -sm %s || true\n", UBUNTU_SYSTEM_DATA),
+		            String.format("busybox du -sm %s || true\n", UBUNTU_USER_DATA),
+			} );
+		} catch (EShellExecException e) {
+			// ignore error
+			e.printStackTrace();
+		}
     }
 
     /**
@@ -1236,7 +1585,7 @@
      * @file absolute file path of Ubuntu Command file.
      */
     private String getUpdateCommand(){
-        return getSharedPreferences(SHARED_PREF, Context.MODE_PRIVATE).getString(PREF_KEY_UPDATE_COMMAND, "");
+        return mSharedPreferences.getString(PREF_KEY_UPDATE_COMMAND, "");
     }
 
     /**
@@ -1244,27 +1593,60 @@
      * @file absolute file path of Ubuntu Command file.
      */
     private void setUpdateCommand(String file){
-        getSharedPreferences(SHARED_PREF, Context.MODE_PRIVATE).
-        edit().
-        putString(PREF_KEY_UPDATE_COMMAND, file).
-        commit();
+        mSharedPreferences.edit().putString(PREF_KEY_UPDATE_COMMAND, file).commit();
     }
 
     /**
      * clean update command string stored in shared preferences.
      */
     private void cleanUpdateCommand() {
-        this.setUpdateCommand("");
-    }
-    
-    private void broadcastProgress(int val, String progress) {
-        Intent i = new Intent(PROGRESS);
-        i.putExtra(PROGRESS_EXTRA_INT, val);
-        if (progress!= null) {
-            i.putExtra(PROGRESS_EXTRA_TEXT, progress);
+        mSharedPreferences.edit()
+        .remove(PREF_KEY_UPDATE_COMMAND)
+        .commit();
+    }
+    
+    /**
+     * Clean installed version info and all othe values
+     */
+    private void setUbuntuUninstalled() {
+        mSharedPreferences.edit()
+        .remove(PREF_KEY_SIZE_ROOTFS)
+        .remove(PREF_KEY_VERSION_NUMBER)
+        .remove(PREF_KEY_VERSION_CHANNEL)
+        .remove(PREF_KEY_VERSION_CHANNEL_TARGET)
+        .remove(PREF_KEY_VERSION_DESCRIPTION)
+        .remove(PREF_KEY_VERSION_BASE)
+        .putBoolean(PREF_KEY_UBUNTU_INSTALLED, false)
+        .putBoolean(PREF_KEY_PENDING_UPDATE, false)
+        .commit();
+        Utils.unregisterUpdateCheckAlarm(this);
+        dismissUbuntuNotification();
+        dismissProgressNotification();
+        dismissUbuntuUpdateNotification();
+    }
+    
+    private void broadcastProgress(String progress) {
+
+        Intent i = null;
+        if (progress == null) {            
+            i = new Intent(PROGRESS);
+            // update notification
+            showProgressNotification();
+        } else {
+            mActionOutput += "\n" + progress;
+            i = new Intent(PROGRESS_OUPUT);
         }
         sendBroadcast(i);
     }
+    
+    private boolean isNetworkAvailable() {
+        final ConnectivityManager conMgr =  (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+        final NetworkInfo activeNetwork = conMgr.getActiveNetworkInfo();
+        if (activeNetwork != null && activeNetwork.isConnected()) {
+            return true;
+        }
+        return false;
+    }
 
     /**
      * Check if there is downloaded release ready to install.
@@ -1272,25 +1654,157 @@
      * @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);
-        VersionInfo versionInfo = getDownloadVersion(context);
-        if (versionInfo == null) return false;
-        if (versionInfo.getDownloadedSize() != 0) return false;
-        
-        String command = pref.getString(PREF_KEY_UPDATE_COMMAND, "");
+    public static boolean isReadyToInstall(SharedPreferences sp) {
+        String command = sp.getString(PREF_KEY_UPDATE_COMMAND, "");
         Log.d(TAG, "checkifReadyToInstall");
-        if (!command.equals("")) {
-            if (new File(command).exists() || command.startsWith("/cache")) {
-                Log.d(TAG, "checkifReadyToInstall - found command file " + command);
-                return true;
+        if (!command.equals("") && new File(command).exists() ) {
+            Log.d(TAG, "checkifReadyToInstall - found command file " + command);
+            return true;
+        } else {
+            sp.edit().remove(PREF_KEY_UPDATE_COMMAND).commit();
+            return false;
+        }
+    }
+    
+    public static boolean isDownloadActive(SharedPreferences sp) {
+        return sp.getBoolean(UbuntuInstallService.PREF_KEY_DOWNLOAD_ACTIVE, false);
+    }
+    
+    public static void startInstallationIfPossible(Context c) {
+        // continue only if battery charge if over 30%
+        if ( MIN_INSTALL_BATTERY_CHARGE  > getBatteryCharge(c) ) {
+            Utils.showToast(c, R.string.not_enough_charge_warning);
+        } else {            
+            c.startService(new Intent(UbuntuInstallService.INSTALL_UBUNTU));
+        }
+    }
+    
+    
+    public static int getBatteryCharge(Context c) {
+        IntentFilter ifilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
+        Intent batteryStatus = c.registerReceiver(null, ifilter);
+        int level = batteryStatus.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);
+        int scale = batteryStatus.getIntExtra(BatteryManager.EXTRA_SCALE, -1);
+        return (level * 100 / scale);
+    }
+    
+    private void showUbuntuNotification(int textRsid, Class<?> act) {
+        Log.d(TAG, "showUbuntuNotification:" + getString(textRsid));
+        dismissProgressNotification();
+        mUbuntuNotification = showNotification(textRsid, 
+                R.id.ubuntu_notification, act);
+    }
+    
+    private void showUbuntuUpdateNotification(int textRsid) {
+        mUbuntuUpdateNotification = showNotification(textRsid, 
+                R.id.ubuntu_update_notification,
+                LaunchActivity.class);
+    }
+    
+    private void showAndroidUpdateNotification() {
+        mAndroidUpdateNotification = showNotification(
+                R.string.notification_android_update, 
+                R.id.android_update_notification,
+                LaunchActivity.class);
+   }
+    
+    
+    private Notification showNotification(int textrRsid, int notificationId, Class<?> act) {
+        Intent updateActivity = new Intent(this, act);
+        updateActivity.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        PendingIntent pendingUpdate = PendingIntent.getActivity(
+                       this, 0, updateActivity, PendingIntent.FLAG_UPDATE_CURRENT);
+
+        Notification notification = new Notification.Builder(this)
+            .setAutoCancel(true)
+            .setSmallIcon(R.drawable.ic_stat_notify_ubuntu)
+            .setContentTitle(getString(R.string.notification_title))
+            .setContentText(getString(textrRsid))
+            .setTicker(getString(textrRsid))
+            .setContentIntent(pendingUpdate)
+            .build();
+       
+       mNotificationManager.notify(notificationId, notification);
+       return notification;
+    }
+
+    private void showProgressNotification() {
+        // we are showing progress, no need for update notification
+        dismissUbuntuUpdateNotification();
+        // choose text based on state downloading/installing and type FULL/DELTA
+        ReleaseType releaseType = ReleaseType.fromValue( // use delta as default for unknown updates
+                mSharedPreferences.getInt(PREF_KEY_DOWNLOAD_TYPE, ReleaseType.DELTA.getValue()));
+        int textRsid = 0;
+        if (mServiceState == InstallerState.DOWNLOADING) {
+            if (releaseType == ReleaseType.FULL) {
+                textRsid = R.string.notification_downloading_release;
             } else {
-                pref.edit().putString(PREF_KEY_UPDATE_COMMAND, "").commit();
-                VersionInfo.storeEmptyVersion(pref.edit(), PREF_KEY_DOWNLOADED_VERSION);
-                return false;
+                textRsid = R.string.notification_downloading_update;
             }
+        } else if (mServiceState == InstallerState.INSTALLING) {
+            if (releaseType == ReleaseType.FULL) {
+                textRsid = R.string.notification_installing_release;
+            } else {
+                textRsid = R.string.notification_installing_update;
+            }            
+        } else {
+            // don't show any notification
+            return;
         }
-        VersionInfo.storeEmptyVersion(pref.edit(), PREF_KEY_DOWNLOADED_VERSION);
-        return false;
+        Intent updateActivity = new Intent(this, InstallActivity.class);
+        updateActivity.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        PendingIntent pendingUpdate = PendingIntent.getActivity(
+                      this, 0, updateActivity, PendingIntent.FLAG_UPDATE_CURRENT);
+
+        mUbuntuProgressNotification = new Notification.Builder(this)
+            .setAutoCancel(true)
+            .setSmallIcon(R.drawable.ic_stat_notify_ubuntu)
+            .setContentTitle(getString(R.string.notification_title))
+            .setContentText(getString(textRsid))
+            .setTicker(getString(textRsid))
+            .setContentIntent(pendingUpdate)
+            .setProgress(100, mLastSignalledProgress, false)
+            .build();
+        mNotificationManager.notify(R.id.ubuntu_progress_notification, mUbuntuProgressNotification);
     }
+   
+   /**
+    * Dismiss progress notification
+    */
+   public void dismissProgressNotification() {
+       if (mUbuntuProgressNotification != null) {
+           mNotificationManager.cancel(R.id.ubuntu_progress_notification);
+           mUbuntuProgressNotification = null;
+       }
+   }
+   
+   /**
+    * Dismiss Ubuntu notification
+    */
+   public void dismissUbuntuNotification() {
+       if (mUbuntuNotification != null) {
+           mUbuntuNotification = null;
+           mNotificationManager.cancel(R.id.ubuntu_notification);
+       }
+   }
+   
+   /**
+    * Dismiss Ubuntu notification
+    */
+   public void dismissUbuntuUpdateNotification() {
+       if (mUbuntuUpdateNotification != null) {
+           mUbuntuUpdateNotification = null;
+           mNotificationManager.cancel(R.id.ubuntu_update_notification);
+       }
+   }
+   
+   /**
+    * Dismiss Android notification
+    */
+   public void dismissAndroidNotification() {
+       if (mAndroidUpdateNotification != null) {
+           mAndroidUpdateNotification = null;
+           mNotificationManager.cancel(R.id.android_update_notification);
+       }
+   }
 }
 
=== modified file 'src/com/canonical/ubuntu/installer/Utils.java'
--- src/com/canonical/ubuntu/installer/Utils.java	2014-01-09 08:54:46 +0000
+++ src/com/canonical/ubuntu/installer/Utils.java	2014-06-09 11:59:50 +0000
@@ -1,14 +1,36 @@
+/*
+ * This file is part of Ubuntu dualboot installer for Android.
+ * Copyright 2013 Canonical Ltd.
+ * 
+ * Ubuntu dualboot installer is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ *
+ * Ubuntu dualboot installer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Ubuntu dualboot installer. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package com.canonical.ubuntu.installer;
 
+import android.app.AlarmManager;
 import android.app.AlertDialog;
+import android.app.PendingIntent;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.res.AssetManager;
 import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.os.StatFs;
 import android.util.Log;
+import android.view.Gravity;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import org.apache.http.HttpEntity;
@@ -22,6 +44,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -30,6 +53,7 @@
 import java.io.StringWriter;
 import java.io.Writer;
 import java.security.MessageDigest;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
@@ -191,18 +215,43 @@
     }
 
     public static String getDeviceModel() {
-        return Build.DEVICE.toLowerCase(Locale.US);
+        String deviceModel = Build.DEVICE.toLowerCase(Locale.US);
+        if (deviceModel.equals("deb") || deviceModel.equals("tilapia")) {
+            deviceModel = "flo";
+        }
+        if (isBringupMode()) {
+            deviceModel = "mako";
+        }
+        return deviceModel;
     }
 
     public static boolean isDeviceSupported() {
         String path = getBootPartitionPath();
-        if ("".equals(path)) return false;
+        if ("".equals(path)) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+    
+    /**
+     * Check if device is in the list of know test devices
+     * of if we are in bringup mode
+     */
+    public static boolean isBringupMode() {
+        if (!UbuntuInstallService.BRINGUP_MODE) {
+            String deviceModel = Build.DEVICE.toLowerCase(Locale.US);
+            if ("bq_aquaris5".equals(deviceModel)) {
+                return true;
+            }
+            return false;