Remove nullwire service

Android Market will report traces for things installed via Market.
Nullwire's stuff isn't really worth it.

Also, the TerminalManager isn't really a "background" service since the
calls into it still runs on the UI looper.

3 files changed, 6 insertions, 20 deletions

diff --git a/src/org/connectbot/ConsoleActivity.java b/src/org/connectbot/ConsoleActivity.java
index 31ba444..5882a84 100644
--- a/src/org/connectbot/ConsoleActivity.java
+++ b/src/org/connectbot/ConsoleActivity.java
@@ -75,8 +75,6 @@ import android.widget.Toast;
 import android.widget.ViewFlipper;
 import android.widget.AdapterView.OnItemClickListener;
 
-import com.nullwire.trace.ExceptionHandler;
-
 import de.mud.terminal.vt320;
 
 public class ConsoleActivity extends Activity {
@@ -276,8 +274,6 @@ public class ConsoleActivity extends Activity {
 
 		this.setContentView(R.layout.act_console);
 
-		ExceptionHandler.register(this);
-
 		clipboard = (ClipboardManager)getSystemService(CLIPBOARD_SERVICE);
 		prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
diff --git a/src/org/connectbot/HostListActivity.java b/src/org/connectbot/HostListActivity.java
index 3b02530..a0e40e8 100644
--- a/src/org/connectbot/HostListActivity.java
+++ b/src/org/connectbot/HostListActivity.java
@@ -63,8 +63,6 @@ import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.AdapterView.OnItemClickListener;
 
-import com.nullwire.trace.ExceptionHandler;
-
 public class HostListActivity extends ListActivity {
 	public final static int REQUEST_EDIT = 1;
 
@@ -135,8 +133,6 @@ public class HostListActivity extends ListActivity {
 	@Override
 	public void onResume() {
 		super.onResume();
-
-		ExceptionHandler.checkForTraces(this);
 	}
 
 	@Override
@@ -165,8 +161,6 @@ public class HostListActivity extends ListActivity {
 				getResources().getText(R.string.app_name),
 				getResources().getText(R.string.title_hosts_list)));
 
-		ExceptionHandler.register(this);
-
 		// check for eula agreement
 		this.prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
diff --git a/src/org/connectbot/service/TerminalManager.java b/src/org/connectbot/service/TerminalManager.java
index 86a30f5..3bfcdde 100644
--- a/src/org/connectbot/service/TerminalManager.java
+++ b/src/org/connectbot/service/TerminalManager.java
@@ -59,12 +59,10 @@ import android.os.Vibrator;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
-import com.nullwire.trace.ExceptionHandler;
-
 /**
- * Manager for SSH connections that runs as a background service. This service
- * holds a list of currently connected SSH bridges that are ready for connection
- * up to a GUI if needed.
+ * Manager for SSH connections that runs as a service. This service holds a list
+ * of currently connected SSH bridges that are ready for connection up to a GUI
+ * if needed.
  *
  * @author jsharkey
  */
@@ -120,9 +118,7 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen
 
 	@Override
 	public void onCreate() {
-		Log.i(TAG, "Starting background service");
-
-		ExceptionHandler.register(this);
+		Log.i(TAG, "Starting service");
 
 		prefs = PreferenceManager.getDefaultSharedPreferences(this);
 		prefs.registerOnSharedPreferenceChangeListener(this);
@@ -171,7 +167,7 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen
 
 	@Override
 	public void onDestroy() {
-		Log.i(TAG, "Destroying background service");
+		Log.i(TAG, "Destroying service");
 
 		disconnectAll(true);
 
@@ -453,7 +449,7 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen
 				idleTimer.schedule(new IdleTask(), IDLE_TIMEOUT);
 			}
 		} else {
-			Log.d(TAG, "Stopping background service immediately");
+			Log.d(TAG, "Stopping service immediately");
 			stopSelf();
 		}
 	}