From: Joshua Wise <joshua@joshuawise.com>
Date: Sun, 4 Mar 2012 10:52:23 +0000 (-0800)
Subject: Merge git://git.asmw.org/dumload
X-Git-Url: http://git.joshuawise.com/dumload.git/commitdiff_plain/b45fc5e03d952cfe09a7efb8a16019a42b9091b9?ds=inline;hp=--cc

Merge git://git.asmw.org/dumload
---

b45fc5e03d952cfe09a7efb8a16019a42b9091b9
diff --cc src/com/joshuawise/dumload/Dumload.java
index 9cabe94,f3317c4..c625b3a
--- a/src/com/joshuawise/dumload/Dumload.java
+++ b/src/com/joshuawise/dumload/Dumload.java
@@@ -1,37 -1,21 +1,37 @@@
 +/* Dumload.java
 + * Main front-end glue for Dumload.
 + *
 + * This program is free software: you can redistribute it and/or modify it
 + * under the terms of the GNU General Public License, version 3, as
 + * published by the Free Software Foundation.
 + *
 + * This program is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + * GNU General Public License for more details.
 + *
 + * You should have received a copy of the GNU General Public License
 + * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 + */
 +
  package com.joshuawise.dumload;
  
- import java.io.InputStream;
- 
  import android.app.Activity;
- import android.app.Service;
  import android.content.Intent;
+ import android.content.SharedPreferences;
  import android.net.Uri;
  import android.os.Bundle;
- import android.os.IBinder;
+ import android.preference.PreferenceManager;
+ import android.util.Log;
+ import android.view.View;
+ import android.widget.Button;
  import android.widget.TextView;
  import android.widget.Toast;
- import android.widget.TextView;
- import android.widget.Button;
- import android.view.View;
- import android.util.Log;
  
  public class Dumload extends Activity {
+ 	
+ 	private SharedPreferences prefs;
+ 	
  	/** Called when the activity is first created. */
  	@Override
  	public void onCreate(Bundle savedInstanceState) {
diff --cc src/com/joshuawise/dumload/NotifSlave.java
index ce6bc6f,15d1ad1..197e626
--- a/src/com/joshuawise/dumload/NotifSlave.java
+++ b/src/com/joshuawise/dumload/NotifSlave.java
@@@ -1,39 -1,18 +1,34 @@@
 +/* NotifSlave.java
 + * Notification interface glue for Dumload.
 + *
 + * This program is free software: you can redistribute it and/or modify it
 + * under the terms of the GNU General Public License, version 3, as
 + * published by the Free Software Foundation.
 + *
 + * This program is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + * GNU General Public License for more details.
 + *
 + * You should have received a copy of the GNU General Public License
 + * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 + */
 +
  package com.joshuawise.dumload;
  
- import java.io.InputStream;
- 
  import android.app.Activity;
- import android.app.Service;
+ import android.app.AlertDialog;
+ import android.app.Dialog;
+ import android.content.DialogInterface;
  import android.content.Intent;
- import android.net.Uri;
  import android.os.Bundle;
- import android.os.IBinder;
- import android.widget.TextView;
- import android.widget.Button;
+ import android.os.Message;
+ import android.os.Messenger;
+ import android.util.Log;
  import android.view.View;
+ import android.widget.Button;
+ import android.widget.TextView;
  import android.widget.Toast;
- import android.util.Log;
- import android.os.Messenger;
- import android.os.Message;
- import android.app.AlertDialog;
- import android.app.Dialog;
- import android.content.DialogInterface;
  
  public class NotifSlave extends Activity {
  	/** Called when the activity is first created. */