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

[Yuan-Chen Cheng]

error return intent and dispaly download error toast

tested on n4

[Rex Tsai (chihchun)]

LOTM, +1

review: Approve

=== modified file 'src/com/canonical/ubuntu/installer/InstallActivity.java'
--- src/com/canonical/ubuntu/installer/InstallActivity.java	2013-12-20 03:39:53 +0000
+++ src/com/canonical/ubuntu/installer/InstallActivity.java	2013-12-20 08:53:31 +0000
@@ -402,11 +402,11 @@
                     Utils.showToast(context, "Download completed, ready to install Ubuntu");
                     startInstallationIfPossible();
                 } else {
+                    String reason = intent.getStringExtra(UbuntuInstallService.INSTALL_RESULT_EXTRA_STR);
                     // make sure it was not cancelled by user
                     if (r != -2) {
-                        Utils.showToast(context, "Downlload failed:");    
+                        reason = "Download failed: " + reason;
                     }
-                    String reason = intent.getStringExtra(UbuntuInstallService.INSTALL_RESULT_EXTRA_STR);
                     Utils.showToast(context, reason);
                     updateInfoOnUiThread(reason);
                     // delete failed download

=== modified file 'src/com/canonical/ubuntu/installer/UbuntuInstallService.java'
--- src/com/canonical/ubuntu/installer/UbuntuInstallService.java	2013-12-20 03:39:53 +0000
+++ src/com/canonical/ubuntu/installer/UbuntuInstallService.java	2013-12-20 08:53:31 +0000
@@ -924,8 +924,8 @@
     }
     
     private Intent handleDownloadError(Intent i, int res, String reason) {
-        i.putExtra(DOWNLOAD_RESULT_EXTRA_INT, -1);
-        i.putExtra(DOWNLOAD_RESULT_EXTRA_STR, "Failed to generate update command");
+        i.putExtra(DOWNLOAD_RESULT_EXTRA_INT, res);
+        i.putExtra(DOWNLOAD_RESULT_EXTRA_STR, reason);
         deleteRelease();
         return i;
     }