Bug 1219895 - Cleanup the 'share.1' telemetry probes by adding extra context r=margaret

mobile/android/base/BrowserApp.java

@@ -1364,28 +1364,6 @@ public class BrowserApp extends GeckoApp
         });
     }
 
-    private void shareCurrentUrl() {
-        Tab tab = Tabs.getInstance().getSelectedTab();
-        if (tab == null) {
-            return;
-        }
-
-        String url = tab.getURL();
-        if (url == null) {
-            return;
-        }
-
-        if (AboutPages.isAboutReader(url)) {
-            url = ReaderModeUtils.getUrlFromAboutReader(url);
-        }
-
-        GeckoAppShell.openUriExternal(url, "text/plain", "", "",
-                                      Intent.ACTION_SEND, tab.getDisplayTitle(), false);
-
-        // Context: Sharing via chrome list (no explicit session is active)
-        Telemetry.sendUIEvent(TelemetryContract.Event.SHARE, TelemetryContract.Method.LIST);
-    }
-
     private void setToolbarMargin(int margin) {
         ((RelativeLayout.LayoutParams) mGeckoLayout.getLayoutParams()).topMargin = margin;
         mGeckoLayout.requestLayout();
@@ -3248,7 +3226,20 @@ public class BrowserApp extends GeckoApp
         }
 
         if (itemId == R.id.share) {
-            shareCurrentUrl();
+            tab = Tabs.getInstance().getSelectedTab();
+            if (tab != null) {
+                String url = tab.getURL();
+                if (url != null) {
+                    if (AboutPages.isAboutReader(url)) {
+                        url = ReaderModeUtils.getUrlFromAboutReader(url);
+                    }
+
+                    // Context: Sharing via chrome list (no explicit session is active)
+                    Telemetry.sendUIEvent(TelemetryContract.Event.SHARE, TelemetryContract.Method.LIST, "menu");
+
+                    GeckoAppShell.openUriExternal(url, "text/plain", "", "", Intent.ACTION_SEND, tab.getDisplayTitle(), false);
+                }
+            }
             return true;
         }
 

mobile/android/base/GeckoApp.java

@@ -646,7 +646,7 @@ public abstract class GeckoApp
             GeckoAppShell.openUriExternal(text, "text/plain", "", "", Intent.ACTION_SEND, title, false);
 
             // Context: Sharing via chrome list (no explicit session is active)
-            Telemetry.sendUIEvent(TelemetryContract.Event.SHARE, TelemetryContract.Method.LIST);
+            Telemetry.sendUIEvent(TelemetryContract.Event.SHARE, TelemetryContract.Method.LIST, "text");
 
         } else if ("Snackbar:Show".equals(event)) {
             final String msg = message.getString("message");

mobile/android/base/home/HomeFragment.java

@@ -206,7 +206,7 @@ public abstract class HomeFragment extends Fragment {
                                               Intent.ACTION_SEND, info.getDisplayTitle(), false);
 
                 // Context: Sharing via chrome homepage contextmenu list (home session should be active)
-                Telemetry.sendUIEvent(TelemetryContract.Event.SHARE, TelemetryContract.Method.LIST);
+                Telemetry.sendUIEvent(TelemetryContract.Event.SHARE, TelemetryContract.Method.LIST, "home_contextmenu");
                 return true;
             }
         }

mobile/android/base/prompts/PromptListAdapter.java

@@ -210,7 +210,7 @@ public class PromptListAdapter extends ArrayAdapter<PromptListItem> {
                         provider.chooseActivity(p);
 
                         // Context: Sharing via content contextmenu list (no explicit session is active)
-                        Telemetry.sendUIEvent(TelemetryContract.Event.SHARE, TelemetryContract.Method.LIST);
+                        Telemetry.sendUIEvent(TelemetryContract.Event.SHARE, TelemetryContract.Method.LIST, "promptlist");
                     }
 
                     @Override

mobile/android/base/widget/GeckoActionProvider.java

@@ -233,7 +233,7 @@ public class GeckoActionProvider {
             chooseActivity(item.getItemId());
 
             // Context: Sharing via chrome mainmenu list (no explicit session is active)
-            Telemetry.sendUIEvent(TelemetryContract.Event.SHARE, TelemetryContract.Method.LIST);
+            Telemetry.sendUIEvent(TelemetryContract.Event.SHARE, TelemetryContract.Method.LIST, "actionprovider");
             return true;
         }
 
@@ -243,7 +243,7 @@ public class GeckoActionProvider {
             chooseActivity(index);
 
             // Context: Sharing via chrome mainmenu and content contextmenu quickshare (no explicit session is active)
-            Telemetry.sendUIEvent(TelemetryContract.Event.SHARE, TelemetryContract.Method.BUTTON);
+            Telemetry.sendUIEvent(TelemetryContract.Event.SHARE, TelemetryContract.Method.BUTTON, "actionprovider");
         }
     }
 

toolkit/components/reader/AboutReader.jsm

@@ -351,7 +351,7 @@ AboutReader.prototype = {
       url: this._article.url,
       title: this._article.title
     });
-    UITelemetry.addEvent("share.1", "list", null);
+    UITelemetry.addEvent("share.1", "list", null, "reader");
   },
 
   /**