Added actions to notifications (this required a slight detour)

app/src/main/java/ch/dissem/apps/abit/service/BitmessageIntentService.java

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2016 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.apps.abit.service;
+
+import android.app.IntentService;
+import android.content.Intent;
+
+import ch.dissem.apps.abit.dialog.FullNodeDialogActivity;
+import ch.dissem.apps.abit.util.Preferences;
+import ch.dissem.bitmessage.BitmessageContext;
+import ch.dissem.bitmessage.entity.Plaintext;
+
+import static ch.dissem.apps.abit.MainActivity.updateNodeSwitch;
+
+/**
+ * @author Christian Basler
+ */
+
+public class BitmessageIntentService extends IntentService {
+    public static final String EXTRA_DELETE_MESSAGE = "ch.dissem.abit.DeleteMessage";
+    public static final String EXTRA_STARTUP_NODE = "ch.dissem.abit.StartFullNode";
+    public static final String EXTRA_SHUTDOWN_NODE = "ch.dissem.abit.StopFullNode";
+
+    private BitmessageContext bmc;
+
+    public BitmessageIntentService() {
+        super("BitmessageIntentService");
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        bmc = Singleton.getBitmessageContext(this);
+    }
+
+    @Override
+    protected void onHandleIntent(Intent intent) {
+        if (intent.hasExtra(EXTRA_DELETE_MESSAGE)) {
+            Plaintext item = (Plaintext) intent.getSerializableExtra(EXTRA_DELETE_MESSAGE);
+            bmc.labeler().delete(item);
+            bmc.messages().save(item);
+        }
+        if (intent.hasExtra(EXTRA_STARTUP_NODE)) {
+            if (Preferences.isConnectionAllowed(this)) {
+                startService(new Intent(this, BitmessageService.class));
+                updateNodeSwitch();
+            } else {
+                Intent dialogIntent = new Intent(this, FullNodeDialogActivity.class);
+                dialogIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                startActivity(dialogIntent);
+                sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
+            }
+        }
+        if (intent.hasExtra(EXTRA_SHUTDOWN_NODE)) {
+            stopService(new Intent(this, BitmessageService.class));
+        }
+    }
+}

app/src/main/java/ch/dissem/apps/abit/service/BitmessageService.java

@@ -18,14 +18,14 @@ package ch.dissem.apps.abit.service;
 
 import android.app.Service;
 import android.content.Intent;
-import android.os.Binder;
 import android.os.IBinder;
+import android.support.annotation.Nullable;
 
 import ch.dissem.apps.abit.notification.NetworkNotification;
 import ch.dissem.bitmessage.BitmessageContext;
 import ch.dissem.bitmessage.utils.Property;
 
-import static ch.dissem.apps.abit.notification.NetworkNotification.ONGOING_NOTIFICATION_ID;
+import static ch.dissem.apps.abit.notification.NetworkNotification.NETWORK_NOTIFICATION_ID;
 
 /**
  * Define a Service that returns an IBinder for the
@@ -44,55 +44,41 @@ public class BitmessageService extends Service {
 
     @Override
     public void onCreate() {
-        synchronized (BitmessageService.class) {
-            if (bmc == null) {
-                bmc = Singleton.getBitmessageContext(this);
-            }
-            notification = new NetworkNotification(this);
+        if (bmc == null) {
+            bmc = Singleton.getBitmessageContext(this);
         }
+        notification = new NetworkNotification(this);
+        running = false;
     }
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        return Service.START_STICKY;
-    }
-
-    @Override
-    public void onDestroy() {
-        if (bmc.isRunning()) bmc.shutdown();
-        running = false;
-    }
-
-    /**
-     * Return an object that allows the system to invoke
-     * the sync adapter.
-     */
-    @Override
-    public IBinder onBind(Intent intent) {
-        return new BitmessageBinder();
-    }
-
-    public class BitmessageBinder extends Binder {
-        public void startupNode() {
-            startService(new Intent(BitmessageService.this, BitmessageService.class));
+        if (!isRunning()) {
             running = true;
             notification.connecting();
-            startForeground(ONGOING_NOTIFICATION_ID, notification.getNotification());
+            startForeground(NETWORK_NOTIFICATION_ID, notification.getNotification());
             if (!bmc.isRunning()) {
                 bmc.startup();
             }
             notification.show();
         }
+        return Service.START_STICKY;
+    }
 
-        public void shutdownNode() {
-            if (bmc.isRunning()) {
-                bmc.shutdown();
-            }
-            running = false;
-            stopForeground(true);
-            notification.show();
-            stopSelf();
+    @Override
+    public void onDestroy() {
+        if (bmc.isRunning()) {
+            bmc.shutdown();
         }
+        running = false;
+        notification.showShutdown();
+        stopSelf();
+    }
+
+    @Nullable
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
     }
 
     public static Property getStatus() {