Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(android): upgrade native sdk to 2.3.8 #77

Merged
merged 1 commit into from
Sep 29, 2023
Merged

chore(android): upgrade native sdk to 2.3.8 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 29 additions & 30 deletions src/android/com/smartlook/cordovaplugin/SmartlookPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.smartlook.cordovaplugin

import android.graphics.Rect
import android.view.View
import android.webkit.WebView
import com.smartlook.android.core.api.Session
import com.smartlook.android.core.api.Smartlook
Expand All @@ -9,10 +10,11 @@ import com.smartlook.android.core.api.enumeration.Status
import com.smartlook.android.core.api.extension.isSensitive
import com.smartlook.android.core.api.model.Properties
import com.smartlook.android.core.api.model.RecordingMask
import com.smartlook.android.core.api.model.Referrer
import com.smartlook.android.core.bridge.BridgeInterface
import com.smartlook.android.core.bridge.model.BridgeFrameworkInfo
import com.smartlook.sdk.bridge.model.BridgeFrameworkInfo
import com.smartlook.sdk.bridge.model.BridgeInterface
import com.smartlook.sdk.bridge.model.BridgeWireframe
import com.smartlook.android.core.video.annotation.RenderingMode
import com.smartlook.sdk.bridge.BridgeManager
import com.smartlook.sdk.log.LogAspect
import org.apache.cordova.CallbackContext
import org.apache.cordova.CordovaPlugin
Expand All @@ -32,9 +34,9 @@ class SmartlookPlugin : CordovaPlugin() {
try {
val pluginVersion = args.getString(0)
val frameworkVersion = args.getString(1)
val cdvBridgeInterface = CordovaBridgeInterface(pluginVersion, frameworkVersion)
val cdvBridgeInterface = CordovaBridgeInterface(pluginVersion, frameworkVersion, true)

smartlook.bridgeInterfaces.add(cdvBridgeInterface)
BridgeManager.bridgeInterfaces.add(cdvBridgeInterface)
callbackContext.success()
} catch (e: Exception) {
callbackContext.error(e.message)
Expand Down Expand Up @@ -90,16 +92,7 @@ class SmartlookPlugin : CordovaPlugin() {
}
}
"setReferrer" -> {
try {
val referrer = args.getString(0)
val source = args.getString(1)
val referrerObject = Referrer(referrer, source)

smartlook.referrer = referrerObject
callbackContext.success()
} catch (e: Exception) {
callbackContext.error(e.message)
}
callbackContext.success("Action $action is not implemented in the Cordova Smartlook Android bridge.")
}
"putStringEventProperty" -> {
try {
Expand Down Expand Up @@ -259,14 +252,7 @@ class SmartlookPlugin : CordovaPlugin() {
}
}
"setJobUploadEnabled" -> {
try {
val isEnabled = args.getBoolean(0)
smartlook.preferences.isUploadUsingAndroidJobsEnabled = isEnabled

callbackContext.success()
} catch (e: Exception) {
callbackContext.error(e.message)
}
callbackContext.success("Action $action is not implemented in the Cordova Smartlook Android bridge.")
}
"setAdaptiveFrameRateEnabled" -> {
callbackContext.success("Action $action is not implemented in the Cordova Smartlook Android bridge.")
Expand Down Expand Up @@ -457,13 +443,26 @@ class SmartlookPlugin : CordovaPlugin() {
}
}

class CordovaBridgeInterface(private val pluginVersion: String, private val frameworkVersion: String): BridgeInterface {
override fun obtainFrameworkInfo(callback: (frameworkInfo: BridgeFrameworkInfo) -> Unit) {
callback(BridgeFrameworkInfo(
"CORDOVA",
pluginVersion,
frameworkVersion
)
class CordovaBridgeInterface(
private val frameworkVersion: String,
private val pluginVersion: String,
override val isRecordingAllowed: Boolean
): BridgeInterface {
override fun obtainFrameworkInfo(callback: (BridgeFrameworkInfo?) -> Unit) {
val frameworkInfo = BridgeFrameworkInfo(
framework = "CORDOVA",
frameworkPluginVersion = this.pluginVersion,
frameworkVersion = this.frameworkVersion
)

callback(frameworkInfo)
}

override fun obtainWireframeData(instance: View, callback: (BridgeWireframe?) -> Unit) {
callback(null)
}

override fun obtainWireframeRootClasses(): List<Class<out View>> {
return emptyList()
}
}
4 changes: 3 additions & 1 deletion src/android/plugin.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,7 @@ repositories {
}

dependencies {
implementation "com.smartlook.android:smartlook-analytics:2.2.0"
implementation "com.smartlook.android:smartlook-analytics:2.3.8"
implementation "com.smartlook.android:smartlook-analytics-bridge:2.3.8"
implementation "com.smartlook.android:smartlook-analytics-wireframe:2.3.8"
}