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

[Yuan-Chen Cheng]

Dump:
1. Board fingerprint
2. apk version
3. content of terminal
on /sdcard to make it easy to debug

[Rex Tsai (chihchun)]

LGTM, +1

review: Approve

=== modified file 'res/menu/installer_menu.xml'
--- res/menu/installer_menu.xml	2013-12-20 03:39:53 +0000
+++ res/menu/installer_menu.xml	2013-12-25 06:14:14 +0000
@@ -5,6 +5,11 @@
         android:orderInCategory="100"
         android:showAsAction="never"
         android:title="@string/action_detele_download"/>
+    <item
+        android:id="@+id/action_dump_terminal"
+        android:orderInCategory="100"
+        android:showAsAction="never"
+        android:title="@string/action_dump_terminal"/>
 <!--  <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
 
=== modified file 'res/values/strings.xml'
--- res/values/strings.xml	2013-12-20 03:39:53 +0000
+++ res/values/strings.xml	2013-12-25 06:14:14 +0000
@@ -4,6 +4,7 @@
     <string name="app_name">Ubuntu Dual Boot</string>
     <string name="action_settings">Settings</string>
     <string name="action_detele_download">Delete download</string>
+    <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>
@@ -29,7 +30,10 @@
     <string name="deleting_user_data">Deleting Ubuntu user data</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 to file success</string>
+    <string name="terminal_dump_fail">Dump Terminal to file fail</string>
+    <string name="external_storage_unavailable">External Storage is not available</string>
     <!-- Strings for Launch screen -->
     <string name="launch_title">Ubuntu</string>
     <string name="label_channel">Channel:</string>
 
=== modified file 'src/com/canonical/ubuntu/installer/InstallActivity.java'
--- src/com/canonical/ubuntu/installer/InstallActivity.java	2013-12-23 09:13:47 +0000
+++ src/com/canonical/ubuntu/installer/InstallActivity.java	2013-12-25 06:14:14 +0000
@@ -1,7 +1,12 @@
 package com.canonical.ubuntu.installer;
 
+import java.io.File;
+import java.io.FileWriter;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 
 import com.canonical.ubuntu.installer.R;
 import com.canonical.ubuntu.installer.TextPickerDialog;
@@ -12,6 +17,7 @@
 import com.canonical.ubuntu.widget.UbuntuButton;
 
 import android.os.Bundle;
+import android.os.Environment;
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.BroadcastReceiver;
@@ -19,6 +25,8 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.text.Html;
 import android.text.method.ScrollingMovementMethod;
 import android.util.Log;
@@ -126,6 +134,44 @@
                 mDownloadedVersion = null;
                 requestServiceState();
                 break;
+            case R.id.action_dump_terminal:
+                CharSequence terminalText = mTerminal.getText();
+                if (terminalText.length() == 0) {
+                    Utils.showToast(this.getApplicationContext(), R.string.terminal_is_empty);
+                    break;
+                }
+
+                Calendar c = Calendar.getInstance();
+                SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss", Locale.US);
+                String formattedDate = df.format(c.getTime());
+
+                String filename = "UbuntuInstaller-" + formattedDate + ".log";
+                File dumpFile = null;
+                try {
+                    File vSDCard;
+                    if(Environment.getExternalStorageState().equals(Environment.MEDIA_REMOVED)) {
+                        Utils.showToast(this.getApplicationContext(), R.string.external_storage_unavailable);
+                        break;
+                    } else {
+                        vSDCard = Environment.getExternalStorageDirectory();
+                    }
+
+                    dumpFile = new File(vSDCard + "/" + filename);
+                    FileWriter dumpFileWriter = new FileWriter(dumpFile);
+                    dumpFileWriter.write("Device: " + android.os.Build.FINGERPRINT + "\n");
+
+                    Context context = this.getApplicationContext();
+                    PackageInfo pInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), PackageManager.GET_META_DATA);
+                    String versionInfo = pInfo.versionName;
+                    dumpFileWriter.write("APK Version: " + versionInfo + "\n");
+
+                    dumpFileWriter.write(terminalText.toString());
+                    dumpFileWriter.close();
+                    Utils.showToast(this.getApplicationContext(), getResources().getString(R.string.terminal_dump_succ) + ": " + dumpFile.getPath());
+                } catch (Exception e) {
+                    Utils.showToast(this.getApplicationContext(), getResources().getString(R.string.terminal_dump_fail) + ": " + dumpFile.getPath());
+                }
+                break;
         }
         return super.onOptionsItemSelected(item);
     }