Add ability to update android notification; (#125)

* Handle update notification call in iOS; * Handle update notification call in Android; * Add more option for updating notification;
rekabhq · Aug 17, 2020 · 8651ec6 · 8651ec6
1 parent 09a93d4
commit 8651ec6
Show file tree

Hide file tree

Showing 10 changed files with 129 additions and 27 deletions.
diff --git a/android/src/main/kotlin/rekab/app/background_locator/BackgroundLocatorPlugin.kt b/android/src/main/kotlin/rekab/app/background_locator/BackgroundLocatorPlugin.kt
@@ -1,6 +1,7 @@
 package rekab.app.background_locator
 
 import android.Manifest
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.PendingIntent
 import android.content.Context
@@ -44,6 +45,7 @@ import rekab.app.background_locator.Keys.Companion.METHOD_PLUGIN_IS_REGISTER_LOC
 import rekab.app.background_locator.Keys.Companion.METHOD_PLUGIN_IS_SERVICE_RUNNING
 import rekab.app.background_locator.Keys.Companion.METHOD_PLUGIN_REGISTER_LOCATION_UPDATE
 import rekab.app.background_locator.Keys.Companion.METHOD_PLUGIN_UN_REGISTER_LOCATION_UPDATE
+import rekab.app.background_locator.Keys.Companion.METHOD_PLUGIN_UPDATE_NOTIFICATION
 import rekab.app.background_locator.Keys.Companion.NOTIFICATION_ACTION
 import rekab.app.background_locator.Keys.Companion.NOTIFICATION_CALLBACK_HANDLE_KEY
 import rekab.app.background_locator.Keys.Companion.SETTINGS_ACCURACY
@@ -72,6 +74,7 @@ class BackgroundLocatorPlugin
         @JvmStatic
         private var channel: MethodChannel? = null
 
+        @SuppressLint("MissingPermission")
         @JvmStatic
         private fun registerLocator(context: Context,
                                     client: FusedLocationProviderClient,
@@ -217,6 +220,26 @@ class BackgroundLocatorPlugin
             return
         }
 
+        @JvmStatic
+        private fun updateNotificationText(context: Context, args: Map<Any, Any>) {
+            val intent = Intent(context, IsolateHolderService::class.java)
+            intent.action = IsolateHolderService.ACTION_UPDATE_NOTIFICATION
+            if (args.containsKey(SETTINGS_ANDROID_NOTIFICATION_TITLE)) {
+                intent.putExtra(SETTINGS_ANDROID_NOTIFICATION_TITLE,
+                        args[SETTINGS_ANDROID_NOTIFICATION_TITLE] as String)
+            }
+            if (args.containsKey(SETTINGS_ANDROID_NOTIFICATION_MSG)) {
+                intent.putExtra(SETTINGS_ANDROID_NOTIFICATION_MSG,
+                        args[SETTINGS_ANDROID_NOTIFICATION_MSG] as String)
+            }
+            if (args.containsKey(SETTINGS_ANDROID_NOTIFICATION_BIG_MSG)) {
+                intent.putExtra(SETTINGS_ANDROID_NOTIFICATION_BIG_MSG,
+                        args[SETTINGS_ANDROID_NOTIFICATION_BIG_MSG] as String)
+            }
+
+            ContextCompat.startForegroundService(context, intent)
+        }
+
         @JvmStatic
         private fun setCallbackDispatcherHandle(context: Context, handle: Long) {
             context.getSharedPreferences(SHARED_PREFERENCES_KEY, Context.MODE_PRIVATE)
@@ -314,6 +337,11 @@ class BackgroundLocatorPlugin
                     locatorClient)
             METHOD_PLUGIN_IS_REGISTER_LOCATION_UPDATE -> isRegisterLocator(result)
             METHOD_PLUGIN_IS_SERVICE_RUNNING -> isServiceRunning(result)
+            METHOD_PLUGIN_UPDATE_NOTIFICATION -> {
+                val args: Map<Any, Any> = call.arguments()
+                updateNotificationText(context!!, args)
+                result.success(true)
+            }
             else -> result.notImplemented()
         }
     }

diff --git a/android/src/main/kotlin/rekab/app/background_locator/IsolateHolderService.kt b/android/src/main/kotlin/rekab/app/background_locator/IsolateHolderService.kt
@@ -1,15 +1,13 @@
 package rekab.app.background_locator
 
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.app.Service
+import android.app.*
 import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.os.Handler
 import android.os.IBinder
 import android.os.PowerManager
+import android.util.Log
 import androidx.core.app.NotificationCompat
 import io.flutter.plugin.common.MethodChannel
 import io.flutter.view.FlutterNativeView
@@ -40,6 +38,9 @@ class IsolateHolderService : Service() {
         @JvmStatic
         val ACTION_START = "START"
 
+        @JvmStatic
+        val ACTION_UPDATE_NOTIFICATION = "UPDATE_NOTIFICATION"
+
         @JvmStatic
         private val WAKELOCK_TAG = "IsolateHolderService::WAKE_LOCK"
 
@@ -88,6 +89,7 @@ class IsolateHolderService : Service() {
     private var notificationIconColor = 0
     private var icon = 0
     private var wakeLockTime = 60 * 60 * 1000L // 1 hour default wake lock time
+    private val notificationId = 1
 
     override fun onBind(intent: Intent?): IBinder? {
         return null
@@ -98,6 +100,24 @@ class IsolateHolderService : Service() {
             return
         }
 
+        (getSystemService(Context.POWER_SERVICE) as PowerManager).run {
+            newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, WAKELOCK_TAG).apply {
+                setReferenceCounted(false)
+                acquire(wakeLockTime)
+            }
+        }
+
+        instance = this
+        sendInit()
+
+        // Starting Service as foreground with a notification prevent service from closing
+        val notification = getNotification()
+        startForeground(notificationId, notification)
+
+        isRunning = true
+    }
+
+    private fun getNotification(): Notification {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             // Notification channel is available in Android O and up
             val channel = NotificationChannel(CHANNEL_ID, notificationChannelName,
@@ -110,9 +130,10 @@ class IsolateHolderService : Service() {
         val intent = Intent(this, getMainActivityClass(this))
         intent.action = NOTIFICATION_ACTION
 
-        val pendingIntent: PendingIntent = PendingIntent.getActivity(this, 1, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+        val pendingIntent: PendingIntent = PendingIntent.getActivity(this,
+                1, intent, PendingIntent.FLAG_UPDATE_CURRENT)
 
-        val notification = NotificationCompat.Builder(this, CHANNEL_ID)
+        return NotificationCompat.Builder(this, CHANNEL_ID)
                 .setContentTitle(notificationTitle)
                 .setContentText(notificationMsg)
                 .setStyle(NotificationCompat.BigTextStyle()
@@ -121,22 +142,9 @@ class IsolateHolderService : Service() {
                 .setColor(notificationIconColor)
                 .setPriority(NotificationCompat.PRIORITY_HIGH)
                 .setContentIntent(pendingIntent)
+                .setOnlyAlertOnce(true) // so when data is updated don't make sound and alert in android 8.0+
+                .setOngoing(true)
                 .build()
-
-        (getSystemService(Context.POWER_SERVICE) as PowerManager).run {
-            newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, WAKELOCK_TAG).apply {
-                setReferenceCounted(false)
-                acquire(wakeLockTime)
-            }
-        }
-
-        instance = this
-        sendInit()
-
-        // Starting Service as foreground with a notification prevent service from closing
-        startForeground(1, notification)
-
-        isRunning = true
     }
 
     private fun stop() {
@@ -163,10 +171,16 @@ class IsolateHolderService : Service() {
             return super.onStartCommand(intent, flags, startId)
         }
 
-        if (intent.action == ACTION_SHUTDOWN) {
-            shutdownHolderService()
-        } else if (intent.action == ACTION_START) {
-            startHolderService(intent)
+        when {
+            ACTION_SHUTDOWN == intent.action -> {
+                shutdownHolderService()
+            }
+            ACTION_START == intent.action -> {
+                startHolderService(intent)
+            }
+            ACTION_UPDATE_NOTIFICATION == intent.action -> {
+                updateNotification(intent)
+            }
         }
 
         return START_STICKY
@@ -201,6 +215,24 @@ class IsolateHolderService : Service() {
         stop()
     }
 
+    private fun updateNotification(intent: Intent) {
+        if (intent.hasExtra(SETTINGS_ANDROID_NOTIFICATION_TITLE)) {
+            notificationTitle = intent.getStringExtra(SETTINGS_ANDROID_NOTIFICATION_TITLE)
+        }
+
+        if (intent.hasExtra(SETTINGS_ANDROID_NOTIFICATION_MSG)) {
+            notificationMsg = intent.getStringExtra(SETTINGS_ANDROID_NOTIFICATION_MSG)
+        }
+
+        if (intent.hasExtra(SETTINGS_ANDROID_NOTIFICATION_BIG_MSG)) {
+            notificationBigMsg = intent.getStringExtra(SETTINGS_ANDROID_NOTIFICATION_BIG_MSG)
+        }
+
+        val notification = getNotification()
+        val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        notificationManager.notify(notificationId, notification)
+    }
+
     private fun getMainActivityClass(context: Context): Class<*>? {
         val packageName = context.packageName
         val launchIntent = context.packageManager.getLaunchIntentForPackage(packageName)

diff --git a/android/src/main/kotlin/rekab/app/background_locator/Keys.kt b/android/src/main/kotlin/rekab/app/background_locator/Keys.kt
@@ -34,6 +34,8 @@ class Keys {
         val METHOD_PLUGIN_IS_REGISTER_LOCATION_UPDATE = "LocatorPlugin.isRegisterLocationUpdate"
         @JvmStatic
         val METHOD_PLUGIN_IS_SERVICE_RUNNING = "LocatorPlugin.isServiceRunning"
+        @JvmStatic
+        val METHOD_PLUGIN_UPDATE_NOTIFICATION = "LocatorPlugin.updateNotification"
 
         @JvmStatic
         val ARG_IS_MOCKED = "is_mocked"

diff --git a/example/lib/location_service_repository.dart b/example/lib/location_service_repository.dart
@@ -56,6 +56,7 @@ class LocationServiceRepository {
     final SendPort send = IsolateNameServer.lookupPortByName(isolateName);
     send?.send(locationDto);
     _count++;
+
   }
 
   static Future<void> setLogLabel(String label) async {

diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -58,6 +58,9 @@ class _MyAppState extends State<MyApp> {
 
   Future<void> updateUI(LocationDto data) async {
     final log = await FileManager.readLogFile();
+
+    await _updateNotificationText(data);
+
     setState(() {
       if (data != null) {
         lastLocation = data;
@@ -67,6 +70,17 @@ class _MyAppState extends State<MyApp> {
     });
   }
 
+  Future<void> _updateNotificationText(LocationDto data) async {
+    if (data == null) {
+      return;
+    }
+
+    await BackgroundLocator.updateNotificationText(
+        title: "new location received",
+        msg: "${DateTime.now()}",
+        bigMsg: "${data.latitude}, ${data.longitude}");
+  }
+
   Future<void> initPlatformState() async {
     print('Initializing...');
     await BackgroundLocator.initialize();
@@ -222,8 +236,7 @@ class _MyAppState extends State<MyApp> {
  */
         disposeCallback: LocationCallbackHandler.disposeCallback,
         iosSettings: IOSSettings(
-            accuracy: LocationAccuracy.NAVIGATION,
-            distanceFilter: 0),
+            accuracy: LocationAccuracy.NAVIGATION, distanceFilter: 0),
         autoStop: false,
         androidSettings: AndroidSettings(
             accuracy: LocationAccuracy.NAVIGATION,

diff --git a/ios/Classes/Globals.h b/ios/Classes/Globals.h
@@ -27,6 +27,7 @@ FOUNDATION_EXPORT NSString *const kMethodPluginRegisterLocationUpdate;
 FOUNDATION_EXPORT NSString *const kMethodPluginUnRegisterLocationUpdate;
 FOUNDATION_EXPORT NSString *const kMethodPluginIsRegisteredLocationUpdate;
 FOUNDATION_EXPORT NSString *const kMethodPluginIsServiceRunning;
+FOUNDATION_EXPORT NSString *const kMethodPluginUpdateNotification;
 
 FOUNDATION_EXPORT NSString *const kArgLatitude;
 FOUNDATION_EXPORT NSString *const kArgLongitude;

diff --git a/ios/Classes/Globals.m b/ios/Classes/Globals.m
@@ -25,6 +25,7 @@ @implementation Globals
 NSString *const kMethodPluginUnRegisterLocationUpdate = @"LocatorPlugin.unRegisterLocationUpdate";
 NSString *const kMethodPluginIsRegisteredLocationUpdate = @"LocatorPlugin.isRegisterLocationUpdate";
 NSString *const kMethodPluginIsServiceRunning = @"LocatorPlugin.isServiceRunning";
+NSString *const kMethodPluginUpdateNotification = @"LocatorPlugin.updateNotification";
 
 NSString *const kArgLatitude = @"latitude";
 NSString *const kArgLongitude = @"longitude";

diff --git a/ios/Classes/Helpers/MethodCallHelper.m b/ios/Classes/Helpers/MethodCallHelper.m
@@ -40,6 +40,9 @@ - (void)handleMethodCall:(FlutterMethodCall *)call
     }else if ([kMethodPluginIsServiceRunning isEqualToString:call.method]) {
         BOOL val = [delegate isServiceRunning];
         result(@(val));
+    } else if([kMethodPluginUpdateNotification isEqualToString:call.method]) {
+        // updating notification's text is just for android
+        result(nil);
     } else {
         result(FlutterMethodNotImplemented);
     }

diff --git a/lib/background_locator.dart b/lib/background_locator.dart
@@ -59,4 +59,23 @@ class BackgroundLocator {
     return await _channel
         .invokeMethod<bool>(Keys.METHOD_PLUGIN_IS_SERVICE_RUNNING);
   }
+
+  static Future<void> updateNotificationText(
+      {String title, String msg, String bigMsg}) async {
+    final Map<String, dynamic> arg = {};
+
+    if (title != null) {
+      arg[Keys.SETTINGS_ANDROID_NOTIFICATION_TITLE] = title;
+    }
+
+    if (msg != null) {
+      arg[Keys.SETTINGS_ANDROID_NOTIFICATION_MSG] = msg;
+    }
+
+    if (bigMsg != null) {
+      arg[Keys.SETTINGS_ANDROID_NOTIFICATION_BIG_MSG] = bigMsg;
+    }
+
+    await _channel.invokeMethod(Keys.METHOD_PLUGIN_UPDATE_NOTIFICATION, arg);
+  }
 }
diff --git a/lib/keys.dart b/lib/keys.dart
@@ -14,6 +14,8 @@ class Keys {
       'LocatorPlugin.isRegisterLocationUpdate';
   static const String METHOD_PLUGIN_IS_SERVICE_RUNNING =
       'LocatorPlugin.isServiceRunning';
+  static const String METHOD_PLUGIN_UPDATE_NOTIFICATION =
+      'LocatorPlugin.updateNotification';
 
   static const String ARG_IS_MOCKED = 'is_mocked';
   static const String ARG_LATITUDE = 'latitude';