Merge branch 'master' into release/1.0

mozilla-tw · Dec 20, 2018 · 16e437e · 16e437e
2 parents aca1733 + 43fbb61
commit 16e437e
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/app/src/main/java/org/mozilla/scryer/landingpage/HomeFragment.kt b/app/src/main/java/org/mozilla/scryer/landingpage/HomeFragment.kt
@@ -739,7 +739,8 @@ class HomeFragment : Fragment(), PermissionFlow.ViewDelegate {
         }
 
         PromoteShareHelper.getShareDialog(context, reason, {
-            TelemetryWrapper.shareApp()
+            TelemetryWrapper.clickShareApp(TelemetryWrapper.ExtraValue.FROM_PROMPT,
+                    reasonForTelemetry)
         })?.let {
             if (dialogQueue.tryShow(it, null)) {
                 PromoteShareHelper.onSharingPromoted(context)

diff --git a/app/src/main/java/org/mozilla/scryer/telemetry/TelemetryWrapper.kt b/app/src/main/java/org/mozilla/scryer/telemetry/TelemetryWrapper.kt
@@ -61,6 +61,7 @@ class TelemetryWrapper {
         const val CLICK_FEEDBACK = "Click feedback"
         const val PROMPT_SHARE_DIALOG = "Prompt share dialog"
         const val BACKGROUND_SERVICE_ACTIVE = "Background service active"
+        const val SHARE_APP = "Share app"
     }
 
     private object Method {
@@ -611,6 +612,31 @@ class TelemetryWrapper {
                     .queue()
         }
 
+        @TelemetryDoc(
+                name = Category.SHARE_APP,
+                category = Category.SHARE_APP,
+                method = Method.V1,
+                `object` = Object.GO,
+                value = "",
+                extras = [
+                    TelemetryExtra(
+                            name = Extra.FROM,
+                            value = ExtraValue.FROM_PROMPT + "," + ExtraValue.FROM_SETTINGS
+                    ),
+                    TelemetryExtra(
+                            name = Extra.TRIGGER,
+                            value = ExtraValue.TRIGGER_CAPTURE
+                                    + "," + ExtraValue.TRIGGER_SORT
+                                    + "," + ExtraValue.TRIGGER_OCR
+                    )])
+        fun clickShareApp(from: String, trigger: String = "") {
+            EventBuilder(Category.SHARE_APP, Method.V1, Object.GO)
+                    .extra(Extra.FROM, from)
+                    .extra(Extra.TRIGGER, trigger)
+                    .queue()
+            shareApp()
+        }
+
         fun shareApp() {
             AdjustHelper.trackEvent(ADJUST_EVENT_SHARE_APP)
         }

diff --git a/docs/events.md b/docs/events.md
@@ -37,4 +37,5 @@
 |Prompt feedback dialog|Prompt feedback dialog|1|go|""|"from=prompt,settings,trigger=capture,sort,ocr," 
 |Click feedback|Click feedback|1|go|"positive,negative"|"from=prompt,settings,trigger=capture,sort,ocr," 
 |Prompt share dialog|Prompt share dialog|1|go|""|"from=prompt,settings,trigger=capture,sort,ocr," 
+|Share app|Share app|1|go|""|"from=prompt,settings,trigger=capture,sort,ocr," 
 |Background service active|Background service active|1|go|""|""