native-update 1.1.0 → 1.1.2

package/android/build.gradle

@@ -71,6 +71,8 @@ dependencies {
     
     // Kotlin
     implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.22'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3'
     
     // AndroidX
     implementation "androidx.appcompat:appcompat:${androidxAppCompatVersion}"
@@ -90,6 +92,9 @@ dependencies {
     // Security
     implementation 'androidx.security:security-crypto:1.1.0-alpha06'
     
+    // JSON parsing
+    implementation 'com.google.code.gson:gson:2.10.1'
+    
     // Testing
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'

package/android/src/main/java/com/aoneahsan/nativeupdate/AppUpdatePlugin.kt

@@ -17,6 +17,7 @@ import com.google.android.play.core.install.model.InstallStatus
 import com.google.android.play.core.install.model.UpdateAvailability
 import com.google.android.play.core.ktx.isFlexibleUpdateAllowed
 import com.google.android.play.core.ktx.isImmediateUpdateAllowed
+import com.google.android.gms.tasks.Tasks
 import kotlinx.coroutines.tasks.await
 
 class AppUpdatePlugin(
@@ -251,18 +252,18 @@ class AppUpdatePlugin(
     }
     
     // Async method for background update checks
-    suspend fun getAppUpdateInfoAsync(): AppUpdateInfo? {
+    suspend fun getAppUpdateInfoAsync(): AppUpdateStatus? {
         return try {
             val appUpdateInfo = appUpdateManager.appUpdateInfo.await()
             
             if (appUpdateInfo.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE) {
-                AppUpdateInfo(
+                AppUpdateStatus(
                     updateAvailable = true,
                     currentVersion = getCurrentAppVersion(),
                     availableVersion = appUpdateInfo.availableVersionCode().toString()
                 )
             } else {
-                AppUpdateInfo(
+                AppUpdateStatus(
                     updateAvailable = false,
                     currentVersion = getCurrentAppVersion(),
                     availableVersion = null

package/android/src/main/java/com/aoneahsan/nativeupdate/BackgroundNotificationManager.kt

@@ -25,6 +25,14 @@ class BackgroundNotificationManager(
         private const val ACTION_UPDATE_NOW = "com.aoneahsan.nativeupdate.UPDATE_NOW"
         private const val ACTION_UPDATE_LATER = "com.aoneahsan.nativeupdate.UPDATE_LATER"
         private const val ACTION_DISMISS = "com.aoneahsan.nativeupdate.DISMISS"
+        
+        /**
+         * Static method to cancel notification from BroadcastReceiver
+         */
+        fun cancelNotificationStatic(context: Context) {
+            val notificationManager = NotificationManagerCompat.from(context)
+            notificationManager.cancel(NOTIFICATION_ID)
+        }
     }
     
     private var preferences: NotificationPreferences = NotificationPreferences.default()
@@ -98,7 +106,7 @@ class BackgroundNotificationManager(
     }
     
     fun sendUpdateNotification(
-        appUpdate: AppUpdateInfo?,
+        appUpdate: AppUpdateStatus?,
         liveUpdate: LatestVersion?
     ): Boolean {
         val permissionStatus = getPermissionStatus()
@@ -119,7 +127,7 @@ class BackgroundNotificationManager(
             eventData.put("version", appUpdate?.availableVersion ?: liveUpdate?.version ?: "unknown")
             eventData.put("action", "shown")
             
-            plugin.notifyListeners("backgroundUpdateNotification", eventData)
+            plugin.notifyBackgroundUpdateListeners("backgroundUpdateNotification", eventData)
             
             return true
         } catch (e: Exception) {
@@ -133,8 +141,12 @@ class BackgroundNotificationManager(
         notificationManager.cancel(NOTIFICATION_ID)
     }
     
+    fun cancelUpdateNotification() {
+        cancelNotification()
+    }
+    
     private fun createNotificationBuilder(
-        appUpdate: AppUpdateInfo?,
+        appUpdate: AppUpdateStatus?,
         liveUpdate: LatestVersion?
     ): NotificationCompat.Builder {
         val title = determineTitle(appUpdate, liveUpdate)
@@ -171,7 +183,7 @@ class BackgroundNotificationManager(
         return builder
     }
     
-    private fun determineTitle(appUpdate: AppUpdateInfo?, liveUpdate: LatestVersion?): String {
+    private fun determineTitle(appUpdate: AppUpdateStatus?, liveUpdate: LatestVersion?): String {
         return when {
             appUpdate?.updateAvailable == true && liveUpdate?.available == true -> "App Updates Available"
             appUpdate?.updateAvailable == true -> "App Update Available"
@@ -180,7 +192,7 @@ class BackgroundNotificationManager(
         }
     }
     
-    private fun determineContent(appUpdate: AppUpdateInfo?, liveUpdate: LatestVersion?): String {
+    private fun determineContent(appUpdate: AppUpdateStatus?, liveUpdate: LatestVersion?): String {
         return when {
             appUpdate?.updateAvailable == true && liveUpdate?.available == true -> 
                 "App version ${appUpdate.availableVersion} and content updates are available"
@@ -225,7 +237,7 @@ class BackgroundNotificationManager(
         }
     }
     
-    private fun createContentIntent(appUpdate: AppUpdateInfo?, liveUpdate: LatestVersion?): PendingIntent {
+    private fun createContentIntent(appUpdate: AppUpdateStatus?, liveUpdate: LatestVersion?): PendingIntent {
         val intent = context.packageManager.getLaunchIntentForPackage(context.packageName)
             ?: Intent()
         
@@ -242,7 +254,7 @@ class BackgroundNotificationManager(
     
     private fun addActionButtons(
         builder: NotificationCompat.Builder,
-        appUpdate: AppUpdateInfo?,
+        appUpdate: AppUpdateStatus?,
         liveUpdate: LatestVersion?
     ) {
         val actionLabels = preferences.actionLabels ?: ActionLabels.default()
@@ -325,13 +337,13 @@ data class NotificationPreferences(
                 title = obj.getString("title"),
                 description = obj.getString("description"),
                 iconName = obj.getString("iconName"),
-                soundEnabled = obj.getBoolean("soundEnabled", true),
-                vibrationEnabled = obj.getBoolean("vibrationEnabled", true),
-                showActions = obj.getBoolean("showActions", true),
+                soundEnabled = obj.getBoolean("soundEnabled", true) ?: true,
+                vibrationEnabled = obj.getBoolean("vibrationEnabled", true) ?: true,
+                showActions = obj.getBoolean("showActions", true) ?: true,
                 actionLabels = actionLabelsObj?.let { ActionLabels.fromJSObject(it) } ?: ActionLabels.default(),
                 channelId = obj.getString("channelId"),
                 channelName = obj.getString("channelName"),
-                priority = NotificationPriority.fromString(priorityString)
+                priority = NotificationPriority.fromString(priorityString ?: "default")
             )
         }
     }

package/android/src/main/java/com/aoneahsan/nativeupdate/BackgroundUpdatePlugin.kt

@@ -33,6 +33,10 @@ class BackgroundUpdatePlugin : Plugin() {
         BackgroundUpdateManager.registerBackgroundUpdatePlugin(this)
     }
     
+    fun notifyBackgroundUpdateListeners(event: String, data: JSObject) {
+        notifyListeners(event, data)
+    }
+    
     @PluginMethod
     fun enableBackgroundUpdates(call: PluginCall) {
         try {
@@ -67,7 +71,7 @@ class BackgroundUpdatePlugin : Plugin() {
     
     @PluginMethod
     fun scheduleBackgroundCheck(call: PluginCall) {
-        val interval = call.getLong("interval", 24 * 60 * 60 * 1000L) // Default 24 hours
+        val interval = call.getLong("interval") ?: (24 * 60 * 60 * 1000L) // Default 24 hours
         scheduleBackgroundWork(interval)
         call.resolve()
     }
@@ -185,8 +189,8 @@ data class BackgroundUpdateConfig(
 ) {
     companion object {
         fun fromJSObject(obj: JSObject): BackgroundUpdateConfig {
-            val enabled = obj.getBoolean("enabled", false)
-            val checkInterval = obj.getInt("checkInterval", 24 * 60 * 60 * 1000)
+            val enabled = obj.getBoolean("enabled") ?: false
+            val checkInterval = obj.getInt("checkInterval") ?: (24 * 60 * 60 * 1000)
             val updateTypesArray = obj.getJSONArray("updateTypes")
             val updateTypes = mutableListOf<BackgroundUpdateType>()
             
@@ -201,14 +205,14 @@ data class BackgroundUpdateConfig(
                 enabled = enabled,
                 checkInterval = checkInterval,
                 updateTypes = updateTypes,
-                autoInstall = obj.getBoolean("autoInstall", false),
+                autoInstall = obj.getBoolean("autoInstall") ?: false,
                 notificationPreferences = notificationPrefs?.let { NotificationPreferences.fromJSObject(it) },
-                respectBatteryOptimization = obj.getBoolean("respectBatteryOptimization", true),
-                allowMeteredConnection = obj.getBoolean("allowMeteredConnection", false),
-                minimumBatteryLevel = obj.getInt("minimumBatteryLevel", 20),
-                requireWifi = obj.getBoolean("requireWifi", false),
-                maxRetries = obj.getInt("maxRetries", 3),
-                retryDelay = obj.getInt("retryDelay", 5000),
+                respectBatteryOptimization = obj.getBoolean("respectBatteryOptimization") ?: true,
+                allowMeteredConnection = obj.getBoolean("allowMeteredConnection") ?: false,
+                minimumBatteryLevel = obj.getInt("minimumBatteryLevel") ?: 20,
+                requireWifi = obj.getBoolean("requireWifi") ?: false,
+                maxRetries = obj.getInt("maxRetries") ?: 3,
+                retryDelay = obj.getInt("retryDelay") ?: 5000,
                 taskIdentifier = obj.getString("taskIdentifier")
             )
         }
@@ -274,7 +278,7 @@ data class BackgroundUpdateStatus(
 data class BackgroundCheckResult(
     val success: Boolean,
     val updatesFound: Boolean,
-    val appUpdate: AppUpdateInfo? = null,
+    val appUpdate: AppUpdateStatus? = null,
     val liveUpdate: LatestVersion? = null,
     val notificationSent: Boolean = false,
     val error: UpdateError? = null
@@ -306,7 +310,7 @@ data class UpdateError(
 }
 
 // Placeholder data classes - would be defined in other plugins
-data class AppUpdateInfo(
+data class AppUpdateStatus(
     val updateAvailable: Boolean,
     val currentVersion: String,
     val availableVersion: String? = null

package/android/src/main/java/com/aoneahsan/nativeupdate/BackgroundUpdateWorker.kt

@@ -65,7 +65,7 @@ class BackgroundUpdateWorker(
     
     private suspend fun performBackgroundCheck(config: BackgroundUpdateConfig): BackgroundCheckResult {
         try {
-            var appUpdate: AppUpdateInfo? = null
+            var appUpdate: AppUpdateStatus? = null
             var liveUpdate: LatestVersion? = null
             
             // Check for app updates
@@ -99,7 +99,7 @@ class BackgroundUpdateWorker(
         }
     }
     
-    private suspend fun checkForAppUpdate(): AppUpdateInfo? {
+    private suspend fun checkForAppUpdate(): AppUpdateStatus? {
         return withContext(Dispatchers.IO) {
             try {
                 val appUpdatePlugin = BackgroundUpdateManager.getAppUpdatePlugin()
@@ -111,7 +111,7 @@ class BackgroundUpdateWorker(
                     val currentVersion = getCurrentAppVersion()
                     val availableVersion = getAvailableAppVersion()
                     
-                    AppUpdateInfo(
+                    AppUpdateStatus(
                         updateAvailable = availableVersion != currentVersion,
                         currentVersion = currentVersion,
                         availableVersion = if (availableVersion != currentVersion) availableVersion else null
@@ -224,7 +224,7 @@ class BackgroundUpdateWorker(
             progressData.put("status", if (result.success) "completed" else "failed")
             progressData.put("percent", 100)
             
-            plugin?.notifyListeners("backgroundUpdateProgress", progressData)
+            plugin?.notifyBackgroundUpdateListeners("backgroundUpdateProgress", progressData)
             
             // Notify about notification if sent
             if (result.notificationSent) {
@@ -233,7 +233,7 @@ class BackgroundUpdateWorker(
                 notificationData.put("updateAvailable", result.updatesFound)
                 notificationData.put("action", "shown")
                 
-                plugin?.notifyListeners("backgroundUpdateNotification", notificationData)
+                plugin?.notifyBackgroundUpdateListeners("backgroundUpdateNotification", notificationData)
             }
         } catch (e: Exception) {
             android.util.Log.e(TAG, "Failed to notify listeners", e)

package/android/src/main/java/com/aoneahsan/nativeupdate/NativeUpdatePlugin.kt

@@ -77,9 +77,7 @@ class NativeUpdatePlugin : Plugin() {
                 appReviewPlugin.configure(it)
             }
             
-            config.getJSObject("backgroundUpdate")?.let {
-                backgroundUpdatePlugin.configure(it)
-            }
+            // Background update configuration is handled separately via enableBackgroundUpdates
             
             call.resolve()
         } catch (e: Exception) {
@@ -259,7 +257,7 @@ class NativeUpdatePlugin : Plugin() {
         }
     }
     
-    private fun hasRequiredPermissions(): Boolean {
+    override fun hasRequiredPermissions(): Boolean {
         return hasPermission("storage")
     }
 }

package/android/src/main/java/com/aoneahsan/nativeupdate/NotificationActionReceiver.kt

@@ -38,8 +38,7 @@ class NotificationActionReceiver : BroadcastReceiver() {
         }
         
         // Cancel the notification
-        val notificationManager = BackgroundNotificationManager(context)
-        notificationManager.cancelUpdateNotification()
+        BackgroundNotificationManager.cancelNotificationStatic(context)
     }
     
     private fun handleInstallNow(context: Context, intent: Intent) {

package/ios/Plugin/AppUpdate/AppUpdatePlugin.swift

@@ -214,12 +214,12 @@ class AppUpdatePlugin {
 
 // MARK: - Data Models
 
-struct AppUpdateInfo {
-    let updateAvailable: Bool
-    let currentVersion: String
-    let availableVersion: String?
+public struct AppUpdateInfo {
+    public let updateAvailable: Bool
+    public let currentVersion: String
+    public let availableVersion: String?
     
-    func toDictionary() -> [String: Any] {
+    public func toDictionary() -> [String: Any] {
         var obj: [String: Any] = [
             "updateAvailable": updateAvailable,
             "currentVersion": currentVersion

package/ios/Plugin/BackgroundUpdate/BackgroundUpdatePlugin.swift

@@ -8,20 +8,17 @@ public class BackgroundUpdatePlugin: CAPPlugin {
     
     private let backgroundTaskIdentifier = "com.aoneahsan.nativeupdate.background"
     private var backgroundUpdateConfig: BackgroundUpdateConfig?
-    private var backgroundUpdateStatus: BackgroundUpdateStatus
+    private var backgroundUpdateStatus = BackgroundUpdateStatus(
+        enabled: false,
+        isRunning: false,
+        checkCount: 0,
+        failureCount: 0
+    )
     private var notificationManager: BackgroundNotificationManager?
     
     public override func load() {
         super.load()
         
-        // Initialize background update status
-        backgroundUpdateStatus = BackgroundUpdateStatus(
-            enabled: false,
-            isRunning: false,
-            checkCount: 0,
-            failureCount: 0
-        )
-        
         // Initialize notification manager
         notificationManager = BackgroundNotificationManager(plugin: self)
         
@@ -33,6 +30,11 @@ public class BackgroundUpdatePlugin: CAPPlugin {
         }
     }
     
+    func configure(_ config: [String: Any]) throws {
+        // Configuration is handled in enableBackgroundUpdates
+        // This method exists for consistency with other plugins
+    }
+    
     @objc func enableBackgroundUpdates(_ call: CAPPluginCall) {
         guard let configData = call.options else {
             call.reject("Missing configuration")
@@ -40,7 +42,13 @@ public class BackgroundUpdatePlugin: CAPPlugin {
         }
         
         do {
-            let config = try BackgroundUpdateConfig.from(configData)
+            // Convert [AnyHashable: Any] to [String: Any]
+            let stringKeyedConfig = configData.reduce(into: [String: Any]()) { result, pair in
+                if let key = pair.key as? String {
+                    result[key] = pair.value
+                }
+            }
+            let config = try BackgroundUpdateConfig.from(stringKeyedConfig)
             backgroundUpdateConfig = config
             backgroundUpdateStatus.enabled = config.enabled
             
@@ -88,7 +96,14 @@ public class BackgroundUpdatePlugin: CAPPlugin {
             return
         }
         
-        notificationManager?.setPreferences(preferences)
+        // Convert [AnyHashable: Any] to [String: Any]
+        let stringKeyedPreferences = preferences.reduce(into: [String: Any]()) { result, pair in
+            if let key = pair.key as? String {
+                result[key] = pair.value
+            }
+        }
+        
+        notificationManager?.setPreferences(stringKeyedPreferences)
         call.resolve()
     }
     
@@ -172,6 +187,8 @@ public class BackgroundUpdatePlugin: CAPPlugin {
             return BackgroundCheckResult(
                 success: false,
                 updatesFound: false,
+                appUpdate: nil,
+                liveUpdate: nil,
                 notificationSent: false,
                 error: UpdateError(code: "INVALID_CONFIG", message: "Background updates not enabled")
             )
@@ -214,7 +231,8 @@ public class BackgroundUpdatePlugin: CAPPlugin {
                 updatesFound: updatesFound,
                 appUpdate: appUpdate,
                 liveUpdate: liveUpdate,
-                notificationSent: notificationSent
+                notificationSent: notificationSent,
+                error: nil
             )
             
         } catch {
@@ -230,6 +248,8 @@ public class BackgroundUpdatePlugin: CAPPlugin {
             return BackgroundCheckResult(
                 success: false,
                 updatesFound: false,
+                appUpdate: nil,
+                liveUpdate: nil,
                 notificationSent: false,
                 error: updateError
             )

package/ios/Plugin/LiveUpdate/LiveUpdatePlugin.swift

@@ -7,7 +7,7 @@ class LiveUpdatePlugin {
     private var config: [String: Any]?
     private var progressListener: (([String: Any]) -> Void)?
     private var stateChangeListener: (([String: Any]) -> Void)?
-    private var session: URLSession
+    private var session: URLSession!
     private var downloadTask: URLSessionDownloadTask?
     private let securityManager = SecurityManager()
     
@@ -444,10 +444,15 @@ class LiveUpdatePlugin {
     }
     
     private func getCurrentVersion() -> String {
-        if let bundle = getCurrentBundleInfo(),
-           let version = bundle["version"] as? String {
+        // First check if we have an active bundle with version
+        let defaults = UserDefaults.standard
+        if let activeBundleId = defaults.string(forKey: "native_update_active_bundle"),
+           let bundles = defaults.dictionary(forKey: "native_update_bundles"),
+           let bundleInfo = bundles[activeBundleId] as? [String: Any],
+           let version = bundleInfo["version"] as? String {
             return version
         }
+        // Fall back to app version
         return Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "1.0.0"
     }
     
@@ -484,7 +489,7 @@ class LiveUpdatePlugin {
         // Return default bundle
         return [
             "bundleId": "default",
-            "version": getCurrentVersion(),
+            "version": Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "1.0.0",
             "path": "/",
             "downloadTime": Date().timeIntervalSince1970 * 1000,
             "size": 0,
@@ -555,19 +560,14 @@ class LiveUpdatePlugin {
         // Create destination directory
         try FileManager.default.createDirectory(at: destinationUrl, withIntermediateDirectories: true)
         
-        // Use system unzip command
-        let process = Process()
-        process.executableURL = URL(fileURLWithPath: "/usr/bin/unzip")
-        process.arguments = ["-o", zipUrl.path, "-d", destinationUrl.path]
+        // Use FileManager to extract (requires iOS unzip library or manual implementation)
+        // For now, we'll use a simple file copy as placeholder
+        // In production, you would use a library like ZIPFoundation or SSZipArchive
         
-        try process.run()
-        process.waitUntilExit()
-        
-        if process.terminationStatus != 0 {
-            throw NSError(domain: "LiveUpdatePlugin", code: 5, userInfo: [
-                NSLocalizedDescriptionKey: "Failed to extract bundle"
-            ])
-        }
+        // This is a placeholder - in real implementation, use a proper unzip library
+        throw NSError(domain: "LiveUpdatePlugin", code: 5, userInfo: [
+            NSLocalizedDescriptionKey: "Unzip functionality not implemented. Please integrate a zip library like ZIPFoundation."
+        ])
     }
     
     private func configureWebViewPath(_ path: String) {
@@ -581,11 +581,11 @@ class LiveUpdatePlugin {
 
 // MARK: - Data Models
 
-struct LatestVersion {
-    let available: Bool
-    let version: String?
+public struct LatestVersion {
+    public let available: Bool
+    public let version: String?
     
-    func toDictionary() -> [String: Any] {
+    public func toDictionary() -> [String: Any] {
         var obj: [String: Any] = [
             "available": available
         ]
@@ -646,8 +646,8 @@ class CertificatePinningDelegate: NSObject, URLSessionDelegate {
     
     private func getCertificatePins(for host: String) -> [String] {
         // Get pins from security manager configuration
-        guard let securityInfo = securityManager.getSecurityInfo(),
-              let certificatePinning = securityInfo["certificatePinning"] as? [String: Any],
+        let securityInfo = securityManager.getSecurityInfo()
+        guard let certificatePinning = securityInfo["certificatePinning"] as? [String: Any],
               certificatePinning["enabled"] as? Bool == true,
               let hostPins = certificatePinning["pins"] as? [String: [String]] else {
             return []

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "native-update",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Foundation package for building a comprehensive update system for Capacitor apps. Provides architecture and interfaces but requires backend implementation.",
   "type": "module",
   "main": "dist/plugin.cjs.js",