Add a Share Icon to Tabular Context Menu

chrome/android/java/src/org/chromium/chrome/browser/share/ShareHelper.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.share;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
@@ skipping 296 matching lines @@
         } else {
             showShareDialog(
                     saveLastUsed, activity, title, text, url, offlineUri, screenshotUri, callback);
         }
     }
 
     /**
      * Trigger the share action for the given image data.
      * @param activity The activity used to trigger the share action.
      * @param jpegImageData The image data to be shared in jpeg format.
+     * @param name When this is not null, it will share the image directly with whatever the
+     *             component name is.

[Theresa, 2017/03/30 15:12:45]

nit: ...will share the image directly with the app associated with the {@link
ComponentName}.

[JJ, 2017/03/30 16:20:17]

Whoops. You just got a glimpse into what my javadocs look like before I clean
them up.

      */
-    public static void shareImage(final Activity activity, final byte[] jpegImageData) {
+    public static void shareImage(
+            final Activity activity, final byte[] jpegImageData, final ComponentName name) {
         if (jpegImageData.length == 0) {
             Log.w(TAG, "Share failed -- Received image contains no data.");
             return;
         }
 
         new AsyncTask<Void, Void, File>() {
             @Override
             protected File doInBackground(Void... params) {
                 FileOutputStream fOut = null;
                 try {
@@ skipping 25 matching lines @@
             }
 
             @Override
             protected void onPostExecute(File saveFile) {
                 if (saveFile == null) return;
 
                 if (ApplicationStatus.getStateForApplication()
                         != ApplicationState.HAS_DESTROYED_ACTIVITIES) {
                     Uri imageUri = ApiCompatibilityUtils.getUriForImageCaptureFile(saveFile);
 
-                    Intent chooserIntent = Intent.createChooser(getShareImageIntent(imageUri),
-                            activity.getString(R.string.share_link_chooser_title));
-                    fireIntent(activity, chooserIntent);
+                    if (name == null) {
+                        Intent chooserIntent = Intent.createChooser(getShareImageIntent(imageUri),
+                                activity.getString(R.string.share_link_chooser_title));
+                        fireIntent(activity, chooserIntent);
+                    } else {
+                        Intent imageIntent = getShareImageIntent(imageUri);
+                        imageIntent.setComponent(name);
+                        fireIntent(activity, imageIntent);
+                    }
                 }
             }
         }.execute();
     }
 
     /**
      * Persists the screenshot file and notifies the file provider that the file is ready to be
      * accessed by the client.
      *
      * The bitmap is compressed to JPEG before being written to the file.
@@ skipping 155 matching lines @@
         shareIntent(saveLastUsed, activity, intent, callback);
     }
 
     /**
      * Set the icon and the title for the menu item used for direct share.
      *
      * @param activity Activity that is used to access the package manager.
      * @param item The menu item that is used for direct share
      */
     public static void configureDirectShareMenuItem(Activity activity, MenuItem item) {
+        Drawable directShareIcon;
+        CharSequence directShareTitle;

[Theresa, 2017/03/30 15:12:45]

nit: these can both defined when they are set below:

Pair<Drawable, CharSequence> directShare = getShareableIconAndName(activity);
Drawable directShareIcon = directShare.first;
CharSequence directShareTitle = directShare.second;

[JJ, 2017/03/30 16:20:17]

Done.

+
+        Pair<Drawable, CharSequence> directShare = getShareableIconAndName(activity);
+        directShareIcon = directShare.first;
+        directShareTitle = directShare.second;
+
+        item.setIcon(directShareIcon);
+        if (directShareTitle != null) {
+            item.setTitle(
+                    activity.getString(R.string.accessibility_menu_share_via, directShareTitle));
+        }
+    }
+
+    /**
+     * Get the icon and name of the most recently shared app within chrome.
+     * @param activity Activity that is used to access the package manager.
+     * @return The Image and the String of the recently shared Icon.
+     */
+    public static Pair<Drawable, CharSequence> getShareableIconAndName(Activity activity) {
         Drawable directShareIcon = null;
         CharSequence directShareTitle = null;
 
         final ComponentName component = getLastShareComponentName();
         boolean isComponentValid = false;
         if (component != null) {
             Intent intent = getShareIntent(activity, "", "", "", null, null);
             intent.setPackage(component.getPackageName());
             PackageManager manager = activity.getPackageManager();
             List<ResolveInfo> resolveInfoList = manager.queryIntentActivities(intent, 0);
@@ skipping 37 matching lines @@
                 // Use the default null values.
             } catch (ExecutionException ee) {
                 // Use the default null values.
             } catch (TimeoutException te) {
                 // Use the default null values.
             }
             RecordHistogram.recordBooleanHistogram(
                     "Android.IsLastSharedAppInfoRetrieved", retrieved);
         }
 
-        item.setIcon(directShareIcon);
-        if (directShareTitle != null) {
-            item.setTitle(activity.getString(R.string.accessibility_menu_share_via,
-                    directShareTitle));
-        }
+        return new Pair<>(directShareIcon, directShareTitle);
     }
 
     /*
      * Stores the component selected for sharing last time share was called.
      *
      * This method is public since it is used in tests to avoid creating share dialog.
      */
     @VisibleForTesting
     public static void setLastShareComponentName(ComponentName component) {
         SharedPreferences preferences = ContextUtils.getAppSharedPreferences();
@@ skipping 52 matching lines @@
 
     private static Intent getDirectShareIntentForComponent(Activity activity, String title,
             String text, String url, Uri offlineUri, Uri screenshotUri, ComponentName component) {
         Intent intent = getShareIntent(activity, title, text, url, offlineUri, screenshotUri);
         intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT
                 | Intent.FLAG_ACTIVITY_PREVIOUS_IS_TOP);
         intent.setComponent(component);
         return intent;
     }
 
-    private static ComponentName getLastShareComponentName() {
+    public static ComponentName getLastShareComponentName() {
         SharedPreferences preferences = ContextUtils.getAppSharedPreferences();
         String packageName = preferences.getString(PACKAGE_NAME_KEY, null);
         String className = preferences.getString(CLASS_NAME_KEY, null);
         if (packageName == null || className == null) return null;
         return new ComponentName(packageName, className);
     }
 }