From 752cdb04a5564989fd50d446487b301458a7201f Mon Sep 17 00:00:00 2001
From: Pierre HUBERT <pierre.git@communiquons.org>
Date: Wed, 14 Apr 2021 18:14:08 +0200
Subject: [PATCH] Background service works

---
 .../NotificationsChannel.java                   |  4 +---
 .../NotificationsService.java                   | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/android/app/src/main/java/org/communiquons/comunic/independentnotifications/NotificationsChannel.java b/android/app/src/main/java/org/communiquons/comunic/independentnotifications/NotificationsChannel.java
index a4c31a7..4016fc2 100644
--- a/android/app/src/main/java/org/communiquons/comunic/independentnotifications/NotificationsChannel.java
+++ b/android/app/src/main/java/org/communiquons/comunic/independentnotifications/NotificationsChannel.java
@@ -52,9 +52,7 @@ public class NotificationsChannel implements MethodChannel.MethodCallHandler {
 
     private boolean needPreConfiguration() {
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
-            if (!context.getSystemService(PowerManager.class).isIgnoringBatteryOptimizations(context.getPackageName())) {
-                return true;
-            }
+            return !context.getSystemService(PowerManager.class).isIgnoringBatteryOptimizations(context.getPackageName());
         }
         return false;
     }
diff --git a/android/app/src/main/java/org/communiquons/comunic/independentnotifications/NotificationsService.java b/android/app/src/main/java/org/communiquons/comunic/independentnotifications/NotificationsService.java
index d870037..10fff31 100644
--- a/android/app/src/main/java/org/communiquons/comunic/independentnotifications/NotificationsService.java
+++ b/android/app/src/main/java/org/communiquons/comunic/independentnotifications/NotificationsService.java
@@ -10,6 +10,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.IBinder;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -20,6 +21,8 @@ import org.communiquons.comunic.MainActivity;
 import org.communiquons.comunic.R;
 
 public class NotificationsService extends Service {
+    private static final String TAG = NotificationsService.class.getSimpleName();
+
     public static final String CHANNEL_ID = "IndependentPushServiceChannel";
     private static final String INDEPENDENT_PUSH_NOTIFICATIONS_SERVICE = "independent-push-notifications-service";
     private static final String WS_URL_PREF_KEY = "ws_url";
@@ -73,9 +76,9 @@ public class NotificationsService extends Service {
                 .setContentIntent(pendingIntent)
                 .build();
         startForeground(1, notification);
-        
+
         initService();
-        
+
         return START_STICKY;
     }
 
@@ -96,11 +99,17 @@ public class NotificationsService extends Service {
     public IBinder onBind(Intent intent) {
         return null;
     }
-    
+
+    @Override
+    public void onDestroy() {
+        Log.v(TAG, "Destroying service");
+        super.onDestroy();
+    }
+
     private void initService() {
         String url = getSharedPreferences(INDEPENDENT_PUSH_NOTIFICATIONS_SERVICE, MODE_PRIVATE)
                 .getString(WS_URL_PREF_KEY, null);
-        
+
         System.out.println("START HEAVY WORK HERE !!!!");
         System.out.println("Connect to " + url);
     }