Refactor codes to run only the bitmap converting logic in background

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.app.Activity;
 import android.app.AlertDialog;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.AsyncTask;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.ApplicationState;
@@ skipping 11 matching lines @@
 
 /**
  * A helper class that helps to start an intent to share titles and URLs.
  */
 public class ShareHelper {
 
     private static final String TAG = "ShareHelper";
 
     private static final String PACKAGE_NAME_KEY = "last_shared_package_name";
     private static final String CLASS_NAME_KEY = "last_shared_class_name";
+    private static final String EXTRA_RAW_FILE_PATH = "raw-file-path";

[Ted C, 2015/03/04 00:43:35]

unused?

[Jaekyun Seok (inactive), 2015/03/04 00:48:13]

Done.

 
     /**
      * Directory name for screenshots.
      */
     private static final String SCREENSHOT_DIRECTORY_NAME = "screenshot";
 
     private ShareHelper() {}
 
     private static void deleteScreenshotFiles(File file) {
         if (!file.exists()) return;
@@ skipping 51 matching lines @@
     /**
      * Creates and shows a share intent picker dialog.
      *
      * @param activity Activity that is used to access package manager.
      * @param title Title of the page to be shared.
      * @param url URL of the page to be shared.
      * @param screenshot Screenshot of the page to be shared.
      */
     private static void showShareDialog(final Activity activity, final String title,
             final String url, final Bitmap screenshot) {
-        Intent intent = getShareIntent(activity, title, url, null);
+        Intent intent = getShareIntent(title, url, null);
         PackageManager manager = activity.getPackageManager();
         List<ResolveInfo> resolveInfoList = manager.queryIntentActivities(intent, 0);
         assert resolveInfoList.size() > 0;
         if (resolveInfoList.size() == 0) return;
         Collections.sort(resolveInfoList, new ResolveInfo.DisplayNameComparator(manager));
 
         final ShareDialogAdapter adapter =
                 new ShareDialogAdapter(activity, manager, resolveInfoList);
         AlertDialog.Builder builder = new AlertDialog.Builder(activity);
         builder.setTitle(activity.getString(R.string.share_link_chooser_title));
@@ skipping 26 matching lines @@
     private static void shareWithLastUsed(
             Activity activity, String title, String url, Bitmap screenshot) {
         ComponentName component = getLastShareComponentName(activity);
         if (component == null) return;
         makeIntentAndShare(activity, title, url, screenshot, component);
     }
 
     private static void makeIntentAndShare(final Activity activity, final String title,
             final String url, final Bitmap screenshot, final ComponentName component) {
         if (screenshot == null) {
-            activity.startActivity(
-                    getDirectShareIntentForComponent(activity, title, url, null, component));
+            activity.startActivity(getDirectShareIntentForComponent(title, url, null, component));
         } else {
-            new AsyncTask<Void, Void, Intent>() {
+            new AsyncTask<Void, Void, File>() {
                 @Override
-                protected Intent doInBackground(Void... params) {
-                    return getDirectShareIntentForComponent(
-                            activity, title, url, screenshot, component);
+                protected File doInBackground(Void... params) {
+                    FileOutputStream fOut = null;
+                    try {
+                        File path = new File(UiUtils.getDirectoryForImageCapture(activity),
+                                SCREENSHOT_DIRECTORY_NAME);
+                        if (path.exists() || path.mkdir()) {
+                            File saveFile = File.createTempFile(
+                                    String.valueOf(System.currentTimeMillis()), ".jpg", path);
+                            fOut = new FileOutputStream(saveFile);
+                            screenshot.compress(Bitmap.CompressFormat.JPEG, 85, fOut);
+                            fOut.flush();
+                            fOut.close();
+
+                            return saveFile;
+                        }
+                    } catch (IOException ie) {
+                        if (fOut != null) {
+                            try {
+                                fOut.close();
+                            } catch (IOException e) {
+                                // Ignore exception.
+                            }
+                        }
+                    }
+
+                    return null;
                 }
 
                 @Override
-                protected void onPostExecute(Intent intent) {
+                protected void onPostExecute(File saveFile) {
                     if (ApplicationStatus.getStateForApplication()
                             != ApplicationState.HAS_DESTROYED_ACTIVITIES) {
-                        activity.startActivity(intent);
+                        Uri screenshotUri = saveFile == null
+                                ? null : UiUtils.getUriForImageCaptureFile(activity, saveFile);
+                        activity.startActivity(getDirectShareIntentForComponent(
+                                title, url, screenshotUri, component));
                     }
                 }
             }.execute();
         }
     }
 
     /**
      * 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.
@@ skipping 16 matching lines @@
         }
 
         item.setIcon(directShareIcon);
         if (directShareTitle != null) {
             item.setTitle(activity.getString(R.string.accessibility_menu_share_via,
                     directShareTitle));
         }
     }
 
     @VisibleForTesting
-    public static Intent getShareIntent(
-            Context context, String title, String url, Bitmap screenshot) {
+    public static Intent getShareIntent(String title, String url, Uri screenshotUri) {
         url = DomDistillerUrlUtils.getOriginalUrlFromDistillerUrl(url);
         Intent intent = new Intent(Intent.ACTION_SEND);
         intent.addFlags(ApiCompatibilityUtils.getActivityNewDocumentFlag());
         intent.setType("text/plain");
         intent.putExtra(Intent.EXTRA_SUBJECT, title);
         intent.putExtra(Intent.EXTRA_TEXT, url);
-        if (screenshot != null) {
-            FileOutputStream fOut = null;
-            try {
-                File path = new File(
-                        UiUtils.getDirectoryForImageCapture(context), SCREENSHOT_DIRECTORY_NAME);
-                if (path.exists() || path.mkdir()) {
-                    File saveFile = File.createTempFile(
-                            String.valueOf(System.currentTimeMillis()), ".jpg", path);
-                    fOut = new FileOutputStream(saveFile);
-                    screenshot.compress(Bitmap.CompressFormat.JPEG, 85, fOut);
-                    fOut.flush();
-                    fOut.close();
-
-                    intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-                    intent.putExtra(Intent.EXTRA_STREAM,
-                            UiUtils.getUriForImageCaptureFile(context, saveFile));
-                }
-            } catch (IOException ie) {
-                if (fOut != null) {
-                    try {
-                        fOut.close();
-                    } catch (IOException e) {
-                        // Ignore exception.
-                    }
-                }
-            }
-        }
+        if (screenshotUri != null) intent.putExtra(Intent.EXTRA_STREAM, screenshotUri);
         return intent;
     }
 
     private static Intent getDirectShareIntentForComponent(
-            Context context, String title, String url, Bitmap screenshot, ComponentName component) {
-        Intent intent = getShareIntent(context, title, url, screenshot);
+            String title, String url, Uri screenshotUri, ComponentName component) {
+        Intent intent = getShareIntent(title, url, screenshotUri);
         intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT
                 | Intent.FLAG_ACTIVITY_PREVIOUS_IS_TOP);
         intent.setComponent(component);
         return intent;
     }
 
     private static ComponentName getLastShareComponentName(Context context) {
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
         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);
     }
 
     private static void setLastShareComponentName(Context context, ComponentName component) {
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
         SharedPreferences.Editor editor = preferences.edit();
         editor.putString(PACKAGE_NAME_KEY, component.getPackageName());
         editor.putString(CLASS_NAME_KEY, component.getClassName());
         editor.apply();
     }
 }