Use the new icon

[dumload.git] / src / com / joshuawise / dumload / NotifSlave.java

diff --git a/src/com/joshuawise/dumload/NotifSlave.java b/src/com/joshuawise/dumload/NotifSlave.java
index 21af25ec5dab8af991286b04fe72b5df3fde7c4f..197e62684a05fa7a26a06dfc1e65468a0d28e80e 100644 (file)
--- a/src/com/joshuawise/dumload/NotifSlave.java
+++ b/src/com/joshuawise/dumload/NotifSlave.java
@@ -1,23 +1,34 @@
-package com.joshuawise.dumload;
+/* 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/>.
+ */

 
 

-import java.io.InputStream;
+package com.joshuawise.dumload;

 
 import android.app.Activity;
 
 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.content.Intent;

-import android.net.Uri;

 import android.os.Bundle;
 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.view.View;

+import android.widget.Button;
+import android.widget.TextView;

 import android.widget.Toast;
 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. */
 
 public class NotifSlave extends Activity {
        /** Called when the activity is first created. */


@@ -62,7 +73,12 @@ public class NotifSlave extends Activity {
                final Messenger m = (Messenger)i.getParcelableExtra("com.joshuawise.dumload.returnmessenger");
                String reqtype = i.getStringExtra("com.joshuawise.dumload.reqtype");
                String prompt = i.getStringExtra("com.joshuawise.dumload.prompt");
                final Messenger m = (Messenger)i.getParcelableExtra("com.joshuawise.dumload.returnmessenger");
                String reqtype = i.getStringExtra("com.joshuawise.dumload.reqtype");
                String prompt = i.getStringExtra("com.joshuawise.dumload.prompt");

-               /* If any of these were null, we'll just take the exception. */
+               
+               if (prompt == null || reqtype == null || m == null)     /* i.e., we got called by a dummy notification */
+               {
+                       this.finish();
+                       return;
+               }

        
                if (reqtype.equals("yesno")) {
                        AlertDialog.Builder builder = new AlertDialog.Builder(this);
        
                if (reqtype.equals("yesno")) {
                        AlertDialog.Builder builder = new AlertDialog.Builder(this);