From 0aa778b33578a613729b6fd5a561632ca74a7031 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 22 Sep 2014 13:54:58 +1000
Subject: White space cleanups.

---
 AndroidManifest.xml                               |  42 ++---
 res/layout/main.xml                               | 114 +++++++-------
 res/values/strings.xml                            |  92 +++++------
 src/net/onefang/toyboxInstaller/MainActivity.java | 182 ++++++++++++----------
 4 files changed, 224 insertions(+), 206 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bfd6400..35e0ff7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,25 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="net.onefang.toyboxInstaller"
-    android:versionCode="1"
-    android:versionName="0.4.9" >
+  package="net.onefang.toyboxInstaller"
+  android:versionCode="1"
+  android:versionName="0.4.9" >
 
-    <uses-sdk 
-        android:minSdkVersion="4" 
-        android:targetSdkVersion="16" />
+  <!-- min versien used to be 4, 9 is needed for DownloadManager. -->
+  <uses-sdk 
+    android:minSdkVersion="9"
+    android:targetSdkVersion="16" />
 
-    <application
-        android:icon="@drawable/ic_launch_placitas_green_pillow"
-        android:label="@string/app_name" >
-        <activity
-            android:label="@string/app_name"
-            android:name=".MainActivity" >
-            <intent-filter >
-                <action android:name="android.intent.action.MAIN" />
+  <!--uses-permission android:name="android.permission.READ_PHONE_STATE"></uses-permission-->
+  <!--uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission-->
+  <!--uses-permission android:name="android.permission.INTERNET"></uses-permission-->
+  <!--uses-permission android:name="android.permission.WRITE_EXTERNAL_STOROGE"></uses-permission-->
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
+  <application
+    android:icon="@drawable/ic_launch_placitas_green_pillow"
+    android:label="@string/app_name" >
+    <activity
+      android:label="@string/app_name"
+      android:name=".MainActivity" >
+      <intent-filter >
+        <action android:name="android.intent.action.MAIN" />
+
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+  </application>
 
 </manifest>
diff --git a/res/layout/main.xml b/res/layout/main.xml
index eec86f2..0b27286 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -1,73 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:gravity="center"
-    android:orientation="vertical" >
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent"
+  android:gravity="center"
+  android:orientation="vertical" >
 
-    <TextView android:id="@+id/hello"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/hello" />
+  <TextView android:id="@+id/hello"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="@string/hello" />
 
-    <TextView android:id="@+id/version"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/version" />
+  <TextView android:id="@+id/version"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="@string/version" />
 
-		<TextView android:id="@+id/versionsPrompt"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/versionsPrompt" />
+  <TextView android:id="@+id/versionsPrompt"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="@string/versionsPrompt" />
 
-		<Spinner android:id="@+id/versions"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:prompt="@+id/versionsPrompt" />
+  <Spinner android:id="@+id/versions"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:prompt="@+id/versionsPrompt" />
 
-    <TextView android:id="@+id/cpusPrompt"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/cpusPrompt" />
+  <TextView android:id="@+id/cpusPrompt"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="@string/cpusPrompt" />
 
-    <Spinner android:id="@+id/cpus"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-				android:prompt="@+id/cpusPrompt" />
+  <Spinner android:id="@+id/cpus"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:prompt="@+id/cpusPrompt" />
 
-    <TextView android:id="@+id/path"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/path" />
+  <TextView android:id="@+id/path"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="@string/path" />
 
-		<TextView android:id="@+id/pathsPrompt"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/pathsPrompt" />
+  <TextView android:id="@+id/pathsPrompt"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="@string/pathsPrompt" />
 
-		<Spinner android:id="@+id/paths"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:prompt="@+id/pathsPrompt" />
+  <Spinner android:id="@+id/paths"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:prompt="@+id/pathsPrompt" />
 
-    <TextView android:id="@+id/folder"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/folder" />
+  <TextView android:id="@+id/folder"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="@string/folder" />
 
-    <Button android:id="@+id/install"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/button_install"
-        android:onClick="installToybox" />
+  <Button android:id="@+id/install"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="@string/button_install"
+    android:onClick="installToybox" />
 
-		<TextView android:id="@+id/source"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/source" />
+  <TextView android:id="@+id/source"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="@string/source" />
 
-		<TextView android:id="@+id/destination"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/destination" />
+  <TextView android:id="@+id/destination"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="@string/destination" />
 </LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6502964..b0f8aed 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,51 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">toyboxInstaller</string>
-    <string name="hello">
+  <string name="app_name">toyboxInstaller</string>
+  <string name="hello">
 This app is used for installing Rob Landley\'s toybox.\n\n\"Toybox combines common Linux command line utilities together into a single BSD-licensed executable that\'s simple, small, fast, reasonably standards-compliant, and powerful enough to turn Android into a development environment.\"\n\nAt least that\'s Rob\'s plan, toybox is not yet feature complete.\n\n</string>
-    <string name="version">The currently installed toybox version is</string>
-		<string name="versionsPrompt">Select a version to install:-</string>
- 		<string-array name="versions">
-				<item>latest</item>
-				<item>0.3.0</item>
-				<item>0.3.1</item>
-				<item>0.4.0</item>
-				<item>0.4.1</item>
-				<item>0.4.2</item>
-				<item>0.4.3</item>
-				<item>0.4.5</item>
-				<item>0.4.6</item>
-				<item>0.4.7</item>
-				<item>0.4.8</item>
-				<item>0.4.9</item>
-		</string-array>
-		<string name="cpusPrompt">The CPU type here is</string>
-    <string name="cpusPrompt2">, but you may need to select a close match :-</string>
-    <string-array name="cpus">
-        <item>armv4eb</item>
-        <item>armv4l</item>
-        <item>armv4tl</item>
-        <item>armv5l</item>
-        <item>armv6l</item>
-        <item>armv7l</item>
-        <item>i486</item>
-        <item>i586</item>
-        <item>i686</item>
-        <item>m68k</item>
-        <item>mips</item>
-        <item>mips64</item>
-        <item>mipsel</item>
-        <item>powerpc</item>
-        <item>powerpc-440fp</item>
-        <item>sh4</item>
-        <item>sparc</item>
-        <item>x86_64</item>
-    </string-array>
-    <string name="path">Select where you want to install toybox ...\n</string>
-		<string name="pathsPrompt">... into the $PATH :-\n</string>
-    <string name="folder">... or into a folder :-\n</string>
-    <string name="button_install">Install toybox.</string>
-    <string name="source">Install from</string>
-		<string name="destination">Install to</string>
+  <string name="version">The currently installed toybox version is</string>
+  <string name="versionsPrompt">Select a version to install:-</string>
+  <string-array name="versions">
+    <item>latest</item>
+    <item>0.3.0</item>
+    <item>0.3.1</item>
+    <item>0.4.0</item>
+    <item>0.4.1</item>
+    <item>0.4.2</item>
+    <item>0.4.3</item>
+    <item>0.4.5</item>
+    <item>0.4.6</item>
+    <item>0.4.7</item>
+    <item>0.4.8</item>
+    <item>0.4.9</item>
+  </string-array>
+  <string name="cpusPrompt">The CPU type here is</string>
+  <string name="cpusPrompt2">, but you may need to select a close match :-</string>
+  <string-array name="cpus">
+    <item>armv4eb</item>
+    <item>armv4l</item>
+    <item>armv4tl</item>
+    <item>armv5l</item>
+    <item>armv6l</item>
+    <item>armv7l</item>
+    <item>i486</item>
+    <item>i586</item>
+    <item>i686</item>
+    <item>m68k</item>
+    <item>mips</item>
+    <item>mips64</item>
+    <item>mipsel</item>
+    <item>powerpc</item>
+    <item>powerpc-440fp</item>
+    <item>sh4</item>
+    <item>sparc</item>
+    <item>x86_64</item>
+  </string-array>
+  <string name="path">Select where you want to install toybox ...\n</string>
+  <string name="pathsPrompt">... into the $PATH :-\n</string>
+  <string name="folder">... or into a folder :-\n</string>
+  <string name="button_install">Install toybox.</string>
+  <string name="source">Install from</string>
+  <string name="destination">Install to</string>
 </resources>
diff --git a/src/net/onefang/toyboxInstaller/MainActivity.java b/src/net/onefang/toyboxInstaller/MainActivity.java
index 27051bf..36b2b5f 100644
--- a/src/net/onefang/toyboxInstaller/MainActivity.java
+++ b/src/net/onefang/toyboxInstaller/MainActivity.java
@@ -5,100 +5,112 @@ import android.os.*;
 import android.view.*;
 import android.widget.*;
 import java.lang.System.*;
+import android.net.*;
 import android.speech.*;
 
 public class MainActivity extends Activity implements AdapterView.OnItemSelectedListener
 {
-		private String requstedVersion = "latest";
-		private String requestedCPU = "";
-		private String requestedPath = "";
+  private String requstedVersion = "latest";
+  private String requestedCPU = "";
+  private String requestedPath = "";
 
-    /** Called when the activity is first created. */
-    @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.main);
-				requestedCPU = java.lang.System.getProperty("os.arch");
+  /** Called when the activity is first created. */
+  @Override
+  public void onCreate(Bundle savedInstanceState)
+  {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.main);
+    requestedCPU = java.lang.System.getProperty("os.arch");
 
-	TextView version = (TextView) findViewById(R.id.version);
-	String   VERSION = getString(R.string.version);
-	Spinner  versions = (Spinner) findViewById(R.id.versions);
-	ArrayAdapter<CharSequence> VERSIONS = ArrayAdapter.createFromResource(this, R.array.versions, android.R.layout.simple_spinner_item);
-	TextView cpu = (TextView) findViewById(R.id.cpusPrompt);
-	String   CPU = getString(R.string.cpusPrompt);
-  String   CPU2 = getString(R.string.cpusPrompt2);
-  Spinner  cpus = (Spinner) findViewById(R.id.cpus);
-  ArrayAdapter<CharSequence> CPUS = ArrayAdapter.createFromResource(this, R.array.cpus, android.R.layout.simple_spinner_item);
-	TextView path = (TextView) findViewById(R.id.path);
-	String   PATH = getString(R.string.path);
-	Spinner  paths = (Spinner) findViewById(R.id.paths);
-	ArrayAdapter<String> PATHS;
-	String   pathSep = java.lang.System.getProperty("path.separator");
-	TextView folder = (TextView) findViewById(R.id.folder);
-	String   FOLDER = getString(R.string.folder);
-	TextView source = (TextView) findViewById(R.id.source);
-	String   SOURCE = getString(R.string.source);
-	TextView destination = (TextView) findViewById(R.id.destination);
-	String   DESTINATION = getString(R.string.destination);
-				
-	version.setText(VERSION + " " + "unknown" + ".\n");
-	VERSIONS.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-	versions.setAdapter(VERSIONS);
-	versions.setOnItemSelectedListener(this);
-	cpu.setText(CPU + " " + requestedCPU + " " + CPU2 + "\n");
-  CPUS.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-  cpus.setAdapter(CPUS);
-  cpus.setSelection(CPUS.getPosition(requestedCPU));
-  cpus.setOnItemSelectedListener(this);
-  PATHS = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item,
-		java.lang.System.getenv("PATH").split("\\" + pathSep));
-	PATHS.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-	paths.setAdapter(PATHS);
-	paths.setOnItemSelectedListener(this);
-	folder.setText(FOLDER + " " + "" + "\n");
-	source.setText(SOURCE + " " + ""  + "\n");
-	destination.setText(DESTINATION + " " + ""  + "\n");
-    }
+    TextView version = (TextView) findViewById(R.id.version);
+    String   VERSION = getString(R.string.version);
+    Spinner  versions = (Spinner) findViewById(R.id.versions);
+    ArrayAdapter<CharSequence> VERSIONS = ArrayAdapter.createFromResource(this, R.array.versions, android.R.layout.simple_spinner_item);
+    TextView cpu = (TextView) findViewById(R.id.cpusPrompt);
+    String   CPU = getString(R.string.cpusPrompt);
+    String   CPU2 = getString(R.string.cpusPrompt2);
+    Spinner  cpus = (Spinner) findViewById(R.id.cpus);
+    ArrayAdapter<CharSequence> CPUS = ArrayAdapter.createFromResource(this, R.array.cpus, android.R.layout.simple_spinner_item);
+    TextView path = (TextView) findViewById(R.id.path);
+    String   PATH = getString(R.string.path);
+    Spinner  paths = (Spinner) findViewById(R.id.paths);
+    ArrayAdapter<String> PATHS;
+    String   pathSep = java.lang.System.getProperty("path.separator");
+    TextView folder = (TextView) findViewById(R.id.folder);
+    String   FOLDER = getString(R.string.folder);
+    TextView source = (TextView) findViewById(R.id.source);
+    String   SOURCE = getString(R.string.source);
+    TextView destination = (TextView) findViewById(R.id.destination);
+    String   DESTINATION = getString(R.string.destination);
 
-		@Override
-		public void onItemSelected(AdapterView<?> parent, View view, int pos, long id)
-		{
-				String s = (String) parent.getItemAtPosition(pos);
-        TextView source = (TextView) findViewById(R.id.source);
-        String   SOURCE = getString(R.string.source);
-        TextView destination = (TextView) findViewById(R.id.destination);
-        String   DESTINATION = getString(R.string.destination);
-        
-				switch (parent.getId())
-				{
-						case R.id.versions :
-						{
-							requstedVersion = s;
-							break;
-						}
-            case R.id.cpus :
-            {
-               requestedCPU = s;
-               break;
-            }
-            case R.id.paths:
-						{
-								requestedPath = s;
-                break;
-						}
-				}
-        source.setText(SOURCE + " http://landley.net/code/toybox/downloads/binaries/" + requstedVersion + "/toybox-" + requestedCPU + "\n");
-        destination.setText(DESTINATION + " " + requestedPath + "\n");
-		}
+    version.setText(VERSION + " " + "unknown" + ".\n");
+    VERSIONS.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+    versions.setAdapter(VERSIONS);
+    versions.setOnItemSelectedListener(this);
+    cpu.setText(CPU + " " + requestedCPU + " " + CPU2 + "\n");
+    CPUS.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+    cpus.setAdapter(CPUS);
+    cpus.setSelection(CPUS.getPosition(requestedCPU));
+    cpus.setOnItemSelectedListener(this);
+    PATHS = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item,
+      java.lang.System.getenv("PATH").split("\\" + pathSep));
+    PATHS.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+    paths.setAdapter(PATHS);
+    paths.setOnItemSelectedListener(this);
+    folder.setText(FOLDER + " " + "" + "\n");
+    source.setText(SOURCE + " " + ""  + "\n");
+    destination.setText(DESTINATION + " " + ""  + "\n");
+  }
 
-		@Override
-		public void onNothingSelected(AdapterView<?> parent)
-		{
-				// TODO: Nothing to do here, maybe?
-		}
+  @Override
+  public void onItemSelected(AdapterView<?> parent, View view, int pos, long id)
+  {
+    String s = (String) parent.getItemAtPosition(pos);
+    TextView source = (TextView) findViewById(R.id.source);
+    String   SOURCE = getString(R.string.source);
+    TextView destination = (TextView) findViewById(R.id.destination);
+    String   DESTINATION = getString(R.string.destination);
 
-    public void installToybox(View view)
+    switch (parent.getId())
     {
+      case R.id.versions :
+      {
+	requstedVersion = s;
+	break;
+      }
+
+      case R.id.cpus :
+      {
+	requestedCPU = s;
+	break;
+      }
+
+      case R.id.paths:
+      {
+	requestedPath = s;
+	break;
+      }
     }
+    source.setText(SOURCE + " http://landley.net/code/toybox/downloads/binaries/" + requstedVersion + "/toybox-" + requestedCPU + "\n");
+    destination.setText(DESTINATION + " " + requestedPath + "\n");
+  }
+
+  @Override
+  public void onNothingSelected(AdapterView<?> parent)
+  {
+    // TODO: Nothing to do here, maybe?
+  }
+
+  public void installToybox(View view)
+  {
+    String url = "http://landley.net/code/toybox/downloads/binaries/" + requstedVersion + "/toybox-" + requestedCPU;
+    DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
+    DownloadManager manager = (DownloadManager) getSystemService(DOWNLOAD_SERVICE);
+
+    request.setDescription("toybox v" + requstedVersion + " for " + requestedCPU);
+    request.setTitle("toybox");
+    request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
+    request.setDestinationInExternalFilesDir(this, Environment.DIRECTORY_DOWNLOADS, requstedVersion + "/toybox-" + requestedCPU);
+    manager.enqueue(request);
+  }
 }
-- 
cgit v1.1