Merge branch 'main' into fix-custom-salt

lib/src/main/java/com/telemetrydeck/sdk/NavigationStatus.kt

@@ -0,0 +1,13 @@
+package com.telemetrydeck.sdk
+
+interface NavigationStatus {
+    /**
+     * Apply the provided path as a visited destination.
+     */
+    fun applyDestination(path: String)
+
+    /**
+     * Returns the last destination path or an empty string if none has been provided.
+     */
+    fun getLastDestination(): String
+}

lib/src/main/java/com/telemetrydeck/sdk/NavigationStatusCache.kt

@@ -0,0 +1,19 @@
+package com.telemetrydeck.sdk
+
+class MemoryNavigationStatus(private var previousNavigationPath: String? = null) :
+    NavigationStatus {
+
+    /**
+     * Apply the provided path as a visited destination.
+     */
+    override fun applyDestination(path: String) {
+        previousNavigationPath = path
+    }
+
+    /**
+     * Returns the last destination path or an empty string if none has been provided.
+     */
+    override fun getLastDestination(): String {
+        return previousNavigationPath ?: ""
+    }
+}

lib/src/main/java/com/telemetrydeck/sdk/PayloadParameters.kt

@@ -0,0 +1,8 @@
+package com.telemetrydeck.sdk
+
+enum class PayloadParameters(val type: String) {
+    TelemetryDeckNavigationSchemaVersion("TelemetryDeck.Navigation.schemaVersion"),
+    TelemetryDeckNavigationIdentifier("TelemetryDeck.Navigation.identifier"),
+    TelemetryDeckNavigationSourcePath("TelemetryDeck.Navigation.sourcePath"),
+    TelemetryDeckNavigationDestinationPath("TelemetryDeck.Navigation.destinationPath"),
+}

lib/src/main/java/com/telemetrydeck/sdk/PersistentSignalCache.kt

@@ -1,14 +1,13 @@
 package com.telemetrydeck.sdk
 
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
 import java.io.File
-import java.lang.Exception
 
-class PersistentSignalCache(private var signalQueue: MutableList<Signal> = mutableListOf()): SignalCache {
+class PersistentSignalCache(private var signalQueue: MutableList<Signal> = mutableListOf()) :
+    SignalCache {
     val cacheFileName: String = "telemetrydeck.json"
-    var file: File? = null
+    private var file: File? = null
 
     constructor(cacheDir: File, logger: DebugLogger?) : this() {
         if (!cacheDir.isDirectory) {
@@ -56,7 +55,7 @@ class PersistentSignalCache(private var signalQueue: MutableList<Signal> = mutab
         }
     }
 
-    fun saveSignals() {
+    private fun saveSignals() {
         file?.createNewFile()
         val json = Json.encodeToString(signalQueue)
         file?.writeText(json)

lib/src/main/java/com/telemetrydeck/sdk/SignalType.kt

@@ -1,14 +1,13 @@
 package com.telemetrydeck.sdk
 
 enum class SignalType(val type: String) {
-    ActivityCreated("ActivityCreated"),
-    ActivityStarted("ActivityStarted"),
-    ActivityResumed("ActivityResumed"),
-    ActivityPaused("ActivityPaused"),
-    ActivityStopped("ActivityStopped"),
-    ActivitySaveInstanceState("ActivitySaveInstanceState"),
-    ActivityDestroyed("ActivityDestroyed"),
-    AppBackground("AppBackground"),
-    AppForeground("AppForeground"),
-    NewSessionBegan("NewSessionBegan"),
+    ActivityCreated("ActivityCreated"), ActivityStarted("ActivityStarted"), ActivityResumed("ActivityResumed"), ActivityPaused(
+        "ActivityPaused"
+    ),
+    ActivityStopped("ActivityStopped"), ActivitySaveInstanceState("ActivitySaveInstanceState"), ActivityDestroyed(
+        "ActivityDestroyed"
+    ),
+    AppBackground("AppBackground"), AppForeground("AppForeground"), NewSessionBegan("NewSessionBegan"), TelemetryDeckNavigationPathChanged(
+        "TelemetryDeck.Navigation.pathChanged"
+    )
 }

lib/src/main/java/com/telemetrydeck/sdk/TelemetryManager.kt

@@ -6,7 +6,7 @@ import android.content.pm.ApplicationInfo
 import java.lang.ref.WeakReference
 import java.net.URL
 import java.security.MessageDigest
-import java.util.*
+import java.util.UUID
 import kotlin.Result.Companion.failure
 import kotlin.Result.Companion.success
 
@@ -20,6 +20,7 @@ class TelemetryManager(
 
     var cache: SignalCache? = null
     var logger: DebugLogger? = null
+    private val navigationStatus: NavigationStatus = MemoryNavigationStatus()
 
     override fun newSession(sessionID: UUID) {
         this.configuration.sessionID = sessionID
@@ -45,6 +46,23 @@ class TelemetryManager(
         queue(signalType.type, clientUser, additionalPayload)
     }
 
+    override fun navigate(sourcePath: String, destinationPath: String, clientUser: String?) {
+        navigationStatus.applyDestination(destinationPath)
+
+        val payload: Map<String, String> = mapOf(
+            PayloadParameters.TelemetryDeckNavigationSchemaVersion.type to "1",
+            PayloadParameters.TelemetryDeckNavigationIdentifier.type to "$sourcePath -> $destinationPath",
+            PayloadParameters.TelemetryDeckNavigationSourcePath.type to sourcePath,
+            PayloadParameters.TelemetryDeckNavigationDestinationPath.type to destinationPath
+        )
+
+        queue(SignalType.TelemetryDeckNavigationPathChanged, clientUser, payload)
+    }
+
+    override fun navigate(destinationPath: String, clientUser: String?) {
+        navigate(navigationStatus.getLastDestination(), destinationPath, clientUser)
+    }
+
     override suspend fun send(
         signalType: String,
         clientUser: String?,
@@ -79,7 +97,7 @@ class TelemetryManager(
             )
             client.send(signals)
             success(Unit)
-        } catch(e: Exception) {
+        } catch (e: Exception) {
             logger?.error("Failed to send signals due to an error ${e} ${e.stackTraceToString()}")
             failure(e)
         }
@@ -104,8 +122,10 @@ class TelemetryManager(
             enrichedPayload = provider.enrich(signalType, clientUser, enrichedPayload)
         }
         val userValue = clientUser ?: configuration.defaultUser ?: ""
-        val userValueWithSalt = userValue +( configuration.salt ?: "")
-        val hashedUser = hashString(userValueWithSalt, "SHA-256")
+
+        val userValueWithSalt = userValue + (configuration.salt ?: "")
+        val hashedUser = hashString(userValue, "SHA-256")
+
         val payload = SignalPayload(additionalPayload = enrichedPayload)
         val signal = Signal(
             appID = configuration.telemetryAppID,
@@ -207,6 +227,14 @@ class TelemetryManager(
             getInstance()?.queue(signalType, clientUser, additionalPayload)
         }
 
+        override fun navigate(sourcePath: String, destinationPath: String, clientUser: String?) {
+            getInstance()?.navigate(sourcePath, destinationPath, clientUser = clientUser)
+        }
+
+        override fun navigate(destinationPath: String, clientUser: String?) {
+            getInstance()?.navigate(destinationPath, clientUser = clientUser)
+        }
+
         override suspend fun send(
             signalType: String,
             clientUser: String?,
@@ -364,7 +392,7 @@ class TelemetryManager(
                 }
             }
 
-            var salt = this.salt
+            val salt = this.salt
             if (salt != null) {
                 config.salt = salt
             }

lib/src/main/java/com/telemetrydeck/sdk/TelemetryManagerSignals.kt

@@ -1,6 +1,6 @@
 package com.telemetrydeck.sdk
 
-import java.util.*
+import java.util.UUID
 
 interface TelemetryManagerSignals {
 
@@ -38,6 +38,20 @@ interface TelemetryManagerSignals {
         additionalPayload: Map<String, String> = emptyMap()
     )
 
+    /**
+     * Send a signal that represents a navigation event with a source and a destination.
+     *
+     * @see <a href="https://telemetrydeck.com/docs/articles/navigation-signals/">Navigation Signals</a>
+     * */
+    fun navigate(sourcePath: String, destinationPath: String, clientUser: String? = null)
+
+    /**
+     * Send a signal that represents a navigation event with a destination and a default source.
+     *
+     * @see <a href="https://telemetrydeck.com/docs/articles/navigation-signals/">Navigation Signals</a>
+     * */
+    fun navigate(destinationPath: String, clientUser: String? = null)
+
 
     /**
      * Send a signal immediately