From 2bb4e567689fabfac70b12682c8f6a1e929ef25d Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Thu, 21 Apr 2011 21:09:52 -0400
Subject: [PATCH] Changed random code in arbitrary places to fix mysterious
 crash

---
 project/java/DataDownloader.java | 11 ++++++-----
 project/java/MainActivity.java   |  6 +++---
 project/java/Settings.java       |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/project/java/DataDownloader.java b/project/java/DataDownloader.java
index 2e0f78ec9..fc7aaf466 100644
--- a/project/java/DataDownloader.java
+++ b/project/java/DataDownloader.java
@@ -46,6 +46,7 @@ import java.io.InputStream;
 import android.content.Context;
 import android.content.res.Resources;
 import java.lang.String;
+import android.text.SpannedString;
 
 
 class CountingInputStream extends BufferedInputStream {
@@ -115,7 +116,7 @@ class DataDownloader extends Thread
 	{
 		private TextView Status;
 		private MainActivity Parent;
-		private String oldText = "";
+		private SpannedString oldText = new SpannedString("");
 
 		public StatusWriter( TextView _Status, MainActivity _Parent )
 		{
@@ -127,7 +128,7 @@ class DataDownloader extends Thread
 			synchronized(DataDownloader.this) {
 				Status = _Status;
 				Parent = _Parent;
-				setText( oldText );
+				setText( oldText.toString() );
 			}
 		}
 		
@@ -136,7 +137,7 @@ class DataDownloader extends Thread
 			class Callback implements Runnable
 			{
 				public TextView Status;
-				public String text;
+				public SpannedString text;
 				public void run()
 				{
 					Status.setText(text);
@@ -144,8 +145,8 @@ class DataDownloader extends Thread
 			}
 			synchronized(DataDownloader.this) {
 				Callback cb = new Callback();
-				oldText = new String(str);
-				cb.text = new String(str);
+				oldText = new SpannedString(str);
+				cb.text = new SpannedString(str);
 				cb.Status = Status;
 				if( Parent != null && Status != null )
 					Parent.runOnUiThread(cb);
diff --git a/project/java/MainActivity.java b/project/java/MainActivity.java
index 6d9b7d55c..e51712da8 100644
--- a/project/java/MainActivity.java
+++ b/project/java/MainActivity.java
@@ -44,7 +44,7 @@ import java.io.FileOutputStream;
 import java.io.File;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
-
+import android.text.SpannedString;
 
 
 public class MainActivity extends Activity {
@@ -367,7 +367,7 @@ public class MainActivity extends Activity {
 		class Callback implements Runnable
 		{
 			MainActivity Parent;
-			public String text;
+			public SpannedString text;
 			public void run()
 			{
 				Parent.setUpStatusLabel();
@@ -376,7 +376,7 @@ public class MainActivity extends Activity {
 			}
 		}
 		Callback cb = new Callback();
-		cb.text = new String(t);
+		cb.text = new SpannedString(t);
 		cb.Parent = this;
 		this.runOnUiThread(cb);
 	}
diff --git a/project/java/Settings.java b/project/java/Settings.java
index bdcc2cc60..e5ffea09f 100644
--- a/project/java/Settings.java
+++ b/project/java/Settings.java
@@ -63,7 +63,7 @@ import android.graphics.Bitmap;
 import android.widget.TextView;
 import android.widget.EditText;
 import android.text.Editable;
-
+import android.text.SpannedString;
 
 
 // TODO: too much code here, split into multiple files, possibly auto-generated menus?