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.

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

Activity lifecycle logging #309

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
10 changes: 9 additions & 1 deletion example/src/main/java/io/radar/example/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ class MainActivity : AppCompatActivity() {
setContentView(R.layout.activity_main)

val receiver = MyRadarReceiver()
Radar.initialize(this, "prj_test_pk_0000000000000000000000000000000000000000", receiver, Radar.RadarLocationServicesProvider.GOOGLE, true)
Radar.initialize(this, "org_test_pk_5857c63d9c1565175db8b00750808a66a002acb8", receiver, Radar.RadarLocationServicesProvider.GOOGLE, true)
nickpatrick marked this conversation as resolved.
Show resolved Hide resolved
Radar.setLogLevel(Radar.RadarLogLevel.DEBUG)

requestLocationPermissionLauncher = registerForActivityResult(
ActivityResultContracts.RequestMultiplePermissions()
Expand Down Expand Up @@ -57,6 +58,11 @@ class MainActivity : AppCompatActivity() {
}

fun runDemo() {
Radar.trackVerified { status, location, events, user ->
Log.v("example", "Track verified: status = ${status}; location = $location; events = $events; user = $user")
}

/*
Radar.getLocation { status, location, stopped ->
Log.v("example", "Location: status = ${status}; location = $location; stopped = $stopped")
}
Expand Down Expand Up @@ -215,6 +221,8 @@ class MainActivity : AppCompatActivity() {
) { status, event ->
Log.v("example", "Conversion name = ${event?.conversionName}: status = $status; event = $event")
}

*/
}

}
2 changes: 1 addition & 1 deletion sdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ apply plugin: "org.jetbrains.dokka"
apply plugin: 'io.radar.mvnpublish'

ext {
radarVersion = '3.8.9'
radarVersion = '3.8.10-beta.1'
}

String buildNumber = ".${System.currentTimeMillis()}"
Expand Down
2 changes: 1 addition & 1 deletion sdk/src/main/java/io/radar/sdk/Radar.kt
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ object Radar {
if (fraud) {
RadarSettings.setSharing(this.context, false)
}
application?.registerActivityLifecycleCallbacks(RadarActivityLifecycleCallbacks(fraud))
application?.registerActivityLifecycleCallbacks(RadarActivityLifecycleCallbacks(this.logger, fraud))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor style nit, but we're passing logger instead of this.logger in the rest of the initialize

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good callout, updated



val featureSettings = RadarSettings.getFeatureSettings(this.context)
Expand Down
26 changes: 19 additions & 7 deletions sdk/src/main/java/io/radar/sdk/RadarActivityLifecycleCallbacks.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,25 @@ import android.app.Activity
import android.app.Application
import android.content.pm.PackageManager
import android.os.Bundle
import android.util.Log
import android.view.InputDevice
import android.view.MotionEvent
import android.view.View
import android.view.ViewGroup
import io.radar.sdk.Radar.RadarStatus
import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat
import io.radar.sdk.model.RadarConfig
import kotlin.math.max


internal class RadarActivityLifecycleCallbacks(
private val logger: RadarLogger,
private val fraud: Boolean = false
) : Application.ActivityLifecycleCallbacks {
private var count = 0

companion object {
var foreground: Boolean = false
private set

private const val TAG = "RadarActivityLifecycle"
}

private fun updatePermissionsDenied(activity: Activity) {
Expand All @@ -40,7 +37,7 @@ internal class RadarActivityLifecycleCallbacks(
RadarSettings.setPermissionsDenied(activity.applicationContext, true)
}
} catch (e: Exception) {
Log.e(TAG, e.message, e)
logger.e("Error updating permissions status", Radar.RadarLogType.SDK_EXCEPTION, e)
}
}

Expand All @@ -58,12 +55,14 @@ internal class RadarActivityLifecycleCallbacks(
})
}
} catch (e: Exception) {
Log.e(TAG, e.message, e)
logger.e("Error updating session ID", Radar.RadarLogType.SDK_EXCEPTION, e)
}
}
count++
foreground = count > 0

logger.d("Activity resumed | count = $count; foreground = $foreground")

Radar.logOpenedAppConversion()

updatePermissionsDenied(activity)
Expand All @@ -73,11 +72,12 @@ internal class RadarActivityLifecycleCallbacks(
override fun dispatchTouchEvent(event: MotionEvent): Boolean {
try {
val inputDevice = InputDevice.getDevice(event.deviceId)
logger.d("Intercepted touch | inputDevice = ${inputDevice}; inputDevice.virtual = ${inputDevice.isVirtual}; event: $event")
if (event.getToolType(0) == MotionEvent.TOOL_TYPE_UNKNOWN || inputDevice.isVirtual) {
RadarSettings.setSharing(activity.applicationContext, true)
}
} catch (e: Exception) {
Log.e(TAG, e.message, e)
logger.e("Error intercepting touch", Radar.RadarLogType.SDK_EXCEPTION, e)
}
return super.dispatchTouchEvent(event)
}
Expand All @@ -92,26 +92,38 @@ internal class RadarActivityLifecycleCallbacks(
count = max(count - 1, 0)
foreground = count > 0

logger.d("Activity paused | count = $count; foreground = $foreground")

updatePermissionsDenied(activity)
}

override fun onActivityStarted(activity: Activity) {
logger.d("Activity started")

updatePermissionsDenied(activity)
}

override fun onActivityStopped(activity: Activity) {
logger.d("Activity stopped")

updatePermissionsDenied(activity)
}

override fun onActivityDestroyed(activity: Activity) {
logger.d("Activity destroyed")

updatePermissionsDenied(activity)
}

override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
logger.d("Activity save instance state")

updatePermissionsDenied(activity)
}

override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
logger.d("Activity created")

updatePermissionsDenied(activity)
}
}