Merge pull request #91 from superwall-me/develop

1.0.0-alpha.43
superwall · Jan 26, 2024 · 0efd1f3 · 0efd1f3
2 parents 05988c5 + e7b40bd
commit 0efd1f3
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 The changelog for `Superwall`. Also see the [releases](https://github.com/superwall-me/Superwall-Android/releases) on GitHub.
 
+## 1.0.0-alpha.43
+
+### Enhancements
+
+- Adds `handleLog` to the `SuperwallDelegate`.
+
 ## 1.0.0-alpha.42
 
 ### Fixes

diff --git a/superwall/build.gradle.kts b/superwall/build.gradle.kts
@@ -19,7 +19,7 @@ plugins {
     id("maven-publish")
 }
 
-version = "1.0.0-alpha.42"
+version = "1.0.0-alpha.43"
 
 android {
     compileSdk = 33

diff --git a/superwall/src/main/java/com/superwall/sdk/delegate/SuperwallDelegateAdapter.kt b/superwall/src/main/java/com/superwall/sdk/delegate/SuperwallDelegateAdapter.kt
@@ -57,17 +57,23 @@ class SuperwallDelegateAdapter {
             ?: javaDelegate?.subscriptionStatusDidChange(newValue)
     }
 
-    private fun handleLog(
+    fun handleLog(
         level: String,
         scope: String,
         message: String?,
         info: Map<String, Any>?,
         error: Throwable?
     ) {
-        Logger.debug(
-            logLevel = LogLevel.valueOf(level),
-            scope = LogScope.valueOf(scope),
-            message = message ?: "No message",
+        kotlinDelegate?.handleLog(
+            level = level,
+            scope = scope,
+            message = message,
+            info = info,
+            error = error
+        ) ?: javaDelegate?.handleLog(
+            level = level,
+            scope = scope,
+            message = message,
             info = info,
             error = error
         )

diff --git a/superwall/src/main/java/com/superwall/sdk/logger/Logger.kt b/superwall/src/main/java/com/superwall/sdk/logger/Logger.kt
@@ -41,16 +41,15 @@ interface Loggable {
                 dumping["error"] = it
             }
 
-            // TODO: Add logging to the delegate
-            // Launch a coroutine to handle the logging
-
-//                Superwall.instance.dependencyContainer.delegateAdapter.handleLog(
-//                    level = logLevel.toString(),
-//                    scope = scope.toString(),
-//                    message = message,
-//                    info = info,
-//                    error = error
-//                )
+            if (Superwall.initialized) {
+                Superwall.instance.dependencyContainer.delegateAdapter.handleLog(
+                    level = logLevel.toString(),
+                    scope = scope.toString(),
+                    message = message,
+                    info = info,
+                    error = error
+                )
+            }
 
             if (!shouldPrint(logLevel, scope)) {
                 return