Reworked notification to utils

Reworked notification to utils

Author: galadril

app/src/main/java/nl/hnogames/domoticz/Service/GeofenceTransitionsIntentService.java

@@ -48,6 +48,7 @@
 import nl.hnogames.domoticz.Interfaces.setCommandReceiver;
 import nl.hnogames.domoticz.MainActivity;
 import nl.hnogames.domoticz.R;
+import nl.hnogames.domoticz.Utils.NotificationUtil;
 import nl.hnogames.domoticz.Utils.SharedPrefUtil;
 import nl.hnogames.domoticz.Utils.UsefulBits;
 
@@ -91,9 +92,8 @@ protected void onHandleIntent(Intent intent) {
                     for (Geofence geofence : geoFenceEvent.getTriggeringGeofences()) {
                         LocationInfo locationFound = mSharedPrefs.getLocation(Integer.valueOf(geofence.getRequestId()));
                         Log.d(TAG, "Triggered geofence location: " + locationFound.getName());
-
                         if (mSharedPrefs.isGeofenceNotificationsEnabled())
-                            sendNotification("Entering " + locationFound.getName(), "Entering one of the locations");
+                            NotificationUtil.sendSimpleNotification("Entering " + locationFound.getName(), "Entering one of the locations", this);
 
                         if (locationFound.getSwitchidx() > 0) {
                             handleSwitch(locationFound.getSwitchidx(), true);
@@ -103,9 +103,8 @@ protected void onHandleIntent(Intent intent) {
                     for (Geofence geofence : geoFenceEvent.getTriggeringGeofences()) {
                         LocationInfo locationFound = mSharedPrefs.getLocation(Integer.valueOf(geofence.getRequestId()));
                         Log.d(TAG, "Triggered geofence location: " + locationFound.getName());
-
                         if (mSharedPrefs.isGeofenceNotificationsEnabled())
-                            sendNotification("Leaving " + locationFound.getName(), "Leaving one of the locations");
+                            NotificationUtil.sendSimpleNotification("Leaving " + locationFound.getName(), "Leaving one of the locations", this);
 
                         if (locationFound.getSwitchidx() > 0) {
                             handleSwitch(locationFound.getSwitchidx(), false);
@@ -192,20 +191,6 @@ private void onErrorHandling(Exception error)
         }
     }
 
-    private void sendNotification(String title, String text) {
-        NotificationCompat.Builder builder =
-                new NotificationCompat.Builder(this)
-                        .setSmallIcon(R.drawable.ic_launcher)
-                        .setContentTitle(title)
-                        .setContentText(text);
-        int NOTIFICATION_ID = 12345;
-
-        Intent targetIntent = new Intent(this, MainActivity.class);
-        PendingIntent contentIntent = PendingIntent.getActivity(this, 0, targetIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-        builder.setContentIntent(contentIntent);
-        NotificationManager nManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-        nManager.notify(NOTIFICATION_ID, builder.build());
-    }
 
 
     @Override

app/src/main/java/nl/hnogames/domoticz/Utils/NotificationUtil.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2015 Domoticz
+ *
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you 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 nl.hnogames.domoticz.Utils;
+
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.support.v4.app.NotificationCompat;
+
+import nl.hnogames.domoticz.MainActivity;
+import nl.hnogames.domoticz.R;
+
+public class NotificationUtil {
+
+    public static void sendSimpleNotification(String title, String text, Context context) {
+        NotificationCompat.Builder builder =
+                new NotificationCompat.Builder(context)
+                        .setSmallIcon(R.drawable.ic_launcher)
+                        .setContentTitle(title)
+                        .setContentText(text);
+        int NOTIFICATION_ID = 12345;
+
+        Intent targetIntent = new Intent(context, MainActivity.class);
+        PendingIntent contentIntent = PendingIntent.getActivity(context, 0, targetIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+        builder.setContentIntent(contentIntent);
+        NotificationManager nManager = (NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE);
+        nManager.notify(NOTIFICATION_ID, builder.build());
+    }
+
+}