Livesport metrics config updated

apptentive-core/src/main/java/apptentive/com/android/platform/SharedPrefConstants.kt

@@ -36,4 +36,5 @@ object SharedPrefConstants {
     const val CRYPTO_ENABLED = "should_encrypt"
     const val CRYPTO_KEY_ALIAS = "crypto.key.alias"
     const val CRYPTO_KEY_WRAPPER_ALIAS = "_crypto.key.wrapper.alias" // to store wrapper key of multi-user encryption key
+    const val METRICS_ENABLED = "metrics_enabled"
 }

apptentive-feedback/src/main/java/apptentive/com/android/feedback/ApptentiveDefaultClient.kt

@@ -698,16 +698,23 @@ class ApptentiveDefaultClient(
         // store event locally
         conversationManager.recordEvent(event)
 
-        // send event to the backend
-        enqueuePayload(
-            EventPayload(
-                label = event.fullName,
-                interactionId = interactionId,
-                data = data,
-                customData = customData,
-                extendedData = extendedData
+        val metricsConfiguration = conversationManager.getConversation().configuration
+
+        if (metricsConfiguration.metricsEnabled || event.vendor == "com.apptentive" || BuildConfig.DEBUG) {
+            Log.d(EVENT, "Recording event: ${event.fullName}")
+            // send event to the backend
+            enqueuePayload(
+                EventPayload(
+                    label = event.fullName,
+                    interactionId = interactionId,
+                    data = data,
+                    customData = customData,
+                    extendedData = extendedData
+                )
             )
-        )
+        } else {
+            Log.v(EVENT, "Metrics are disabled. Not sending event: ${event.fullName}")
+        }
     }
 
     override fun setLocalManifest(json: String) {

apptentive-feedback/src/main/java/apptentive/com/android/feedback/conversation/ConversationManager.kt

@@ -45,6 +45,7 @@ import apptentive.com.android.feedback.utils.isMarshmallowOrGreater
 import apptentive.com.android.feedback.utils.toSecretKeyBytes
 import apptentive.com.android.network.UnexpectedResponseException
 import apptentive.com.android.platform.AndroidSharedPrefDataStore
+import apptentive.com.android.platform.SharedPrefConstants.METRICS_ENABLED
 import apptentive.com.android.platform.SharedPrefConstants.SDK_CORE_INFO
 import apptentive.com.android.platform.SharedPrefConstants.SDK_VERSION
 import apptentive.com.android.serialization.json.JsonConverter
@@ -178,7 +179,12 @@ internal class ConversationManager(
         val existingConversation = loadExistingConversation()
         if (existingConversation != null) {
             Log.i(CONVERSATION, "Loaded an existing conversation")
-            return existingConversation
+            return existingConversation.copy(
+                configuration = existingConversation.configuration.copy(
+                    metricsEnabled = DependencyProvider.of<AndroidSharedPrefDataStore>()
+                        .getBoolean(SDK_CORE_INFO, METRICS_ENABLED, existingConversation.configuration.metricsEnabled)
+                )
+            )
         }
 
         val legacyConversation = tryMigrateLegacyConversation()
@@ -507,7 +513,7 @@ internal class ConversationManager(
         val conversation = activeConversationSubject.value
         val configuration = conversation.configuration
 
-        if (isInThePast(configuration.expiry) || isDebuggable) {
+        if (isInThePast(configuration.expiry) || isDebuggable || !DependencyProvider.of<AndroidSharedPrefDataStore>().containsKey(SDK_CORE_INFO, METRICS_ENABLED)) {
             Log.d(CONVERSATION, "Fetching configuration")
             val token = conversation.conversationToken
             val id = conversation.conversationId
@@ -523,6 +529,8 @@ internal class ConversationManager(
                             activeConversationSubject.value = activeConversationSubject.value.copy(
                                 configuration = it.data
                             )
+                            DependencyProvider.of<AndroidSharedPrefDataStore>()
+                                .putBoolean(SDK_CORE_INFO, METRICS_ENABLED, it.data.metricsEnabled)
                         }
                         is Result.Error -> {
                             Log.e(CONVERSATION, "Error while fetching configuration", it.error)

apptentive-feedback/src/main/java/apptentive/com/android/feedback/model/Configuration.kt

@@ -7,11 +7,20 @@ import apptentive.com.android.util.InternalUseOnly
  * Data container class for Apptentive configuration.
  *
  * @param expiry - Length of time before Configuration expires and should re-fetch from server
+ *
+ * @param messageCenter - Configuration for Message Center
+ *
+ * @param metricsEnabled - Determines if the Apptentive SDK should collect metrics.
+ *
+ *  If `true`, the SDK will collect metrics and send them to the Apptentive API.
+ *
+ *  If `false`, the SDK will collect metrics to user internally. It won't send them to the Apptentive API.
  */
 @InternalUseOnly
 data class Configuration(
     var expiry: TimeInterval = 0.0,
-    val messageCenter: MessageCenter = MessageCenter()
+    val messageCenter: MessageCenter = MessageCenter(),
+    val metricsEnabled: Boolean = true,
 ) {
     /**
      * Data container class for Apptentive Message Center configuration.

build.gradle

@@ -67,8 +67,8 @@ buildscript {
     }
 
     project.ext {
-        sonatypeVersion = '6.9.3'
-        jfrogVersion = '6.8.1'
+        sonatypeVersion = '6.9.4'
+        jfrogVersion = '6.9.4'
 
         // Change this depending on where you are publishing to
         repoVersion = sonatypeVersion
@@ -83,6 +83,9 @@ buildscript {
         repositories {
             google()
             mavenCentral()
+            maven {
+                url "https://apptentive.jfrog.io/artifactory/NewAndroidSDK"
+            }
             maven {
                 def artifactoryProperties = new Properties()
                 if (project.rootProject.file('local.properties').exists()) {

publish.gradle

@@ -85,9 +85,9 @@ publishing {
     }
 }
 
-signing {
-    sign publishing.publications
-}
+//signing {
+//    sign publishing.publications
+//}
 
 artifactory {
     contextUrl = 'https://apptentive.jfrog.io/artifactory'