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

[Yuan-Chen Cheng]

1. add Design.txt document.
2. add volatile to mIsCanceled to make sure no thread local cache.
3. work around http downloading input stream close takes too long.

it took seconds to cancel download if we do input.close()

[Rex Tsai (chihchun)]

This should goes in 3 different commit for changes tracking. :-)

review: Approve

=== added directory 'doc'
=== added file 'doc/Design.txt'
--- doc/Design.txt	1970-01-01 00:00:00 +0000
+++ doc/Design.txt	2013-12-27 07:19:45 +0000
@@ -0,0 +1,40 @@
+
+How dual boot works ?
+=====================
+
+Android have two partition that can store image that can boot.
+One is boot partition, and the other is recovery partition.
+
+We put ubuntu kernel and ramdisk in recovery partition. We put
+ubuntu program in userdata partition as flie system.img and
+also a swap file there.
+
+For other files that created as ubuntu runs, we keep it at:
+
+	/data/user-data: store user data, like /home/phablet
+	/data/system-data: store system data, like /etc, /var
+
+
+Android Installer APP Design
+============================
+
+How we detect system status ?
+
+Preferecne
+	We use PREF_KEY_XXX variable in UbuntuInstallService as key to
+	store value for certain status value. In the following paragraph,
+	if you saw PREF_KEY_XXX, it means the value for that key in
+	preference.
+
+	PREF_KEY_INSTALLED_VERSION
+		valid: ubuntu installed and we go to LaunchActivity.
+		invalid: ubuntu not installed and we go to InstallActivity.
+		
+	PREF_KEY_DOWNLOADED_VERSION
+		invalid: ubuntu has not been downloaded
+		valid and mDownloadedSize is 0: full downloaded.
+		valid and mDownloadedSize > 0: partial downloaded.
+
+	As full downloaded complete, the PREF_KEY_UPDATE_COMMAND will be
+	set.
+

=== modified file 'src/com/canonical/ubuntu/installer/UbuntuInstallService.java'
--- src/com/canonical/ubuntu/installer/UbuntuInstallService.java	2013-12-26 07:18:14 +0000
+++ src/com/canonical/ubuntu/installer/UbuntuInstallService.java	2013-12-27 07:19:45 +0000
@@ -185,7 +185,7 @@
     // FIXME make workPath in Cache a private function
     private boolean workPathInCache = false;
     private String mRootOfWorkPath;
-    private boolean mIsCanceled;
+    private volatile boolean mIsCanceled;
     
     // progress values
     private long mProgress; // so far handled amount downloaded/processed 
@@ -1018,7 +1018,8 @@
             if (mIsCanceled) {
                 output.close();
                 conn = null;
-                input.close();
+                // input.close() need more time to close() as donwload large file.
+                input = null;
                 long flen = file.length();
                 if (flen > 0) {
                     try {

=== modified file 'src/com/canonical/ubuntu/installer/VersionInfo.java'
--- src/com/canonical/ubuntu/installer/VersionInfo.java	2013-12-25 11:31:43 +0000
+++ src/com/canonical/ubuntu/installer/VersionInfo.java	2013-12-27 07:19:45 +0000
@@ -12,7 +12,7 @@
     private static final String JSON = "_json";
     private static final String DESCRIPTION = "_description";
     private static final String VERSION = "_version";
-    // partial download: long
+    // DOWNLOADED_SIZE: long
     //     full-download: d_version is not empty and this value is 0
     //     partial download: d_version is not empty and this value is > 0
     private static final String DOWNLOADED_SIZE = "_downloaded-size";