capacitor-pica-network-logger 0.2.1 → 0.2.3

package/CapacitorPicaNetworkLogger.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'CapacitorPicaNetworkLogger'
-  s.version = '0.1.6'
+  s.version = '0.2.3'
   s.summary = 'Capacitor HTTP inspector'
   s.license = 'MIT'
   s.author = { 'Nikos Linakis' => 'nikos@linakis.net' }

package/android/build.gradle

@@ -1,6 +1,7 @@
 plugins {
     id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
+    id 'org.jetbrains.kotlin.plugin.compose'
 }
 
 android {
@@ -10,15 +11,6 @@ android {
     defaultConfig {
         minSdk 23
     }
-
-    buildFeatures {
-        buildConfig true
-        compose true
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.5.10'
-    }
 }
 
 dependencies {

package/android/src/main/AndroidManifest.xml

@@ -4,6 +4,7 @@
         <activity
             android:name="com.linakis.capacitorpicanetworklogger.InspectorActivity"
             android:exported="false"
+            android:taskAffinity="com.linakis.capacitorpicanetworklogger.inspector"
             android:theme="@style/Theme.MaterialComponents.DayNight.NoActionBar" />
     </application>
 </manifest>

package/android/src/main/java/com/linakis/capacitorpicanetworklogger/InspectorNotifications.kt

@@ -9,35 +9,68 @@ import android.os.Build
 import androidx.core.app.NotificationCompat
 
 object InspectorNotifications {
-    private const val channelId = "pica_network_logger"
-    private const val channelName = "Network Logger"
+    private const val CHANNEL_ID = "pica_network_inspector"
+    private const val CHANNEL_NAME = "Network Logger"
+    private const val GROUP_KEY = "pica_network_inspector_group"
+    private const val SUMMARY_ID = 0
 
     fun show(context: Context, method: String, url: String, status: Int?) {
         val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val channel = NotificationChannel(channelId, channelName, NotificationManager.IMPORTANCE_LOW)
+            val channel = NotificationChannel(CHANNEL_ID, CHANNEL_NAME, NotificationManager.IMPORTANCE_LOW)
+            channel.setSound(null, null)
+            channel.enableVibration(false)
             manager.createNotificationChannel(channel)
         }
 
         val intent = Intent(context, InspectorActivity::class.java).apply {
-            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
         }
+
+        val requestCode = (System.currentTimeMillis() % 10000).toInt()
         val pendingIntent = PendingIntent.getActivity(
             context,
-            0,
+            requestCode,
             intent,
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
         )
 
         val title = if (status != null) "$method $status" else method
-        val notification = NotificationCompat.Builder(context, channelId)
+        val notification = NotificationCompat.Builder(context, CHANNEL_ID)
             .setSmallIcon(android.R.drawable.stat_notify_sync)
             .setContentTitle(title)
             .setContentText(url)
             .setContentIntent(pendingIntent)
             .setAutoCancel(true)
+            .setSilent(true)
+            .setGroup(GROUP_KEY)
+            .build()
+
+        manager.notify(requestCode, notification)
+
+        // Summary notification for the group
+        val summaryIntent = Intent(context, InspectorActivity::class.java).apply {
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
+        }
+        val summaryNotification = NotificationCompat.Builder(context, CHANNEL_ID)
+            .setSmallIcon(android.R.drawable.stat_notify_sync)
+            .setContentTitle(CHANNEL_NAME)
+            .setContentText("Tap to open inspector")
+            .setContentIntent(
+                PendingIntent.getActivity(
+                    context,
+                    0,
+                    summaryIntent,
+                    PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+                )
+            )
+            .setAutoCancel(true)
+            .setSilent(true)
+            .setGroup(GROUP_KEY)
+            .setGroupSummary(true)
             .build()
 
-        manager.notify((System.currentTimeMillis() % 10000).toInt(), notification)
+        manager.notify(SUMMARY_ID, summaryNotification)
     }
 }

package/android/src/main/java/com/linakis/capacitorpicanetworklogger/LoggerConfigProvider.kt

@@ -5,11 +5,11 @@ import com.getcapacitor.Plugin
 
 class LoggerConfigProvider {
     fun getConfig(plugin: Plugin): JSObject {
-        val config = plugin.config.getObject("PicaNetworkLogger", JSObject())
+        val config = plugin.bridge.config.getPluginConfiguration("PicaNetworkLogger")
         val output = JSObject()
         output.put("maxBodySize", config.getInt("maxBodySize", 131072))
-        output.put("redactHeaders", config.optJSONArray("redactHeaders"))
-        output.put("redactJsonFields", config.optJSONArray("redactJsonFields"))
+        output.put("redactHeaders", config.getArray("redactHeaders"))
+        output.put("redactJsonFields", config.getArray("redactJsonFields"))
         output.put("notify", config.getBoolean("notify", true))
         return output
     }

package/android/src/main/java/com/linakis/capacitorpicanetworklogger/PicaNetworkLoggerPlugin.kt

@@ -8,6 +8,7 @@ import com.getcapacitor.annotation.CapacitorPlugin
 import android.content.pm.PackageManager
 import android.os.Build
 import androidx.core.app.ActivityCompat
+import org.json.JSONObject
 
 @CapacitorPlugin(name = "PicaNetworkLogger")
 class PicaNetworkLoggerPlugin : Plugin() {
@@ -32,8 +33,8 @@ class PicaNetworkLoggerPlugin : Plugin() {
             }
         }
         LogRepositoryStore.updateRedaction(redactHeaders, redactJsonFields)
-        LogRepositoryStore.updateNotify(config.getBoolean("notify", true))
-        requestNotificationPermissionIfNeeded(config.getBoolean("notify", true))
+        LogRepositoryStore.updateNotify(config.optBoolean("notify", true))
+        requestNotificationPermissionIfNeeded(config.optBoolean("notify", true))
     }
 
     private fun requestNotificationPermissionIfNeeded(notifyEnabled: Boolean) {
@@ -58,7 +59,7 @@ class PicaNetworkLoggerPlugin : Plugin() {
         val headers = call.getObject("headers")?.let { obj ->
             obj.keys().asSequence().associateWith { key -> obj.getString(key) ?: "" }
         }
-        val body = call.getString("body")
+        val body = call.data.opt("body")?.let { if ( it == JSONObject.NULL) null else it.toString() }
         val id = java.util.UUID.randomUUID().toString()
         LogRepositoryStore.logStart(id, method, url, headers, body)
         val ret = JSObject()
@@ -73,7 +74,7 @@ class PicaNetworkLoggerPlugin : Plugin() {
         val headers = call.getObject("headers")?.let { obj ->
             obj.keys().asSequence().associateWith { key -> obj.getString(key) ?: "" }
         }
-        val body = call.getString("body")
+        val body = call.data.opt("body")?.let { if ( it == JSONObject.NULL) null else it.toString() }
         val error = call.getString("error")
         LogRepositoryStore.logFinish(id, status, headers, body, error, null, null)
         call.resolve()

package/ios/Plugin/InspectorNotifications.swift

@@ -1,10 +1,12 @@
 import Foundation
 import UserNotifications
 
-class InspectorNotifications: NSObject {
+class InspectorNotifications: NSObject, UNUserNotificationCenterDelegate {
     static let shared = InspectorNotifications()
 
     static func show(method: String, url: String, status: Int?) {
+        let center = UNUserNotificationCenter.current()
+        center.delegate = shared
         let content = UNMutableNotificationContent()
         if let status = status {
             content.title = "\(method) \(status)"
@@ -12,7 +14,12 @@ class InspectorNotifications: NSObject {
             content.title = method
         }
         content.body = url
+        content.sound = nil
         let request = UNNotificationRequest(identifier: UUID().uuidString, content: content, trigger: nil)
-        UNUserNotificationCenter.current().add(request, withCompletionHandler: nil)
+        center.add(request, withCompletionHandler: nil)
+    }
+
+    func userNotificationCenter(_ center: UNUserNotificationCenter, willPresent notification: UNNotification, withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) {
+        completionHandler([])
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-pica-network-logger",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Capacitor HTTP network logger with debug-only native capture",
   "license": "MIT",
   "repository": {