diff options
author | Martin Brabham <optedoblivion@gmail.com> | 2016-01-21 12:47:43 -0500 |
---|---|---|
committer | jrizzoli <joey@cyanogenmoditalia.it> | 2016-04-26 20:25:44 +0200 |
commit | 1a8e7472c354a150f2318e13aacfb52d82709dde (patch) | |
tree | 76e589a0d45db11d435621ffd2fcdfc6b38f8817 | |
parent | 22398a7d009567d9959d85de6f9c735044508c1b (diff) | |
download | android_packages_apps_Gello-1a8e7472c354a150f2318e13aacfb52d82709dde.tar.gz android_packages_apps_Gello-1a8e7472c354a150f2318e13aacfb52d82709dde.tar.bz2 android_packages_apps_Gello-1a8e7472c354a150f2318e13aacfb52d82709dde.zip |
Gello: kang in two methods which changed their location and access
Cherry-picked from: https://github.com/CyanogenMod/android_packages_apps_Browser/commit/36774d9c6a7b5dbdca88ba974d75895ca835f234
Change-Id: I6dd4b55346f12d015f50bb221d9ba441784e55c9
-rw-r--r-- | src/com/android/browser/ShareDialog.java | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/src/com/android/browser/ShareDialog.java b/src/com/android/browser/ShareDialog.java index 63f6183f..4fe54d3a 100644 --- a/src/com/android/browser/ShareDialog.java +++ b/src/com/android/browser/ShareDialog.java @@ -43,6 +43,7 @@ import android.graphics.Bitmap; import android.net.Uri; import android.os.AsyncTask; import android.os.Build; +import android.os.Environment; import java.util.List; import java.util.Collections; @@ -50,7 +51,6 @@ import java.util.Collections; import android.util.Log; import org.chromium.base.ContentUriUtils; -import org.chromium.ui.UiUtils; import java.io.File; import java.io.FileOutputStream; @@ -67,6 +67,8 @@ public class ShareDialog extends AppItem { public final static String EXTRA_SHARE_FAVICON = "share_favicon"; private static final String SCREENSHOT_DIRECTORY_NAME = "screenshot_share"; private static final int MAX_SCREENSHOT_COUNT = 10; + public static final String EXTERNAL_IMAGE_FILE_PATH = "browser-images"; + public static final String IMAGE_FILE_PATH = "images"; public ShareDialog (Activity activity, String title, String url, Bitmap favicon, Bitmap screenshot) { super(null); @@ -94,7 +96,7 @@ public class ShareDialog extends AppItem { } private File getScreenshotDir() throws IOException { - File baseDir = UiUtils.getDirectoryForImageCapture(activity); + File baseDir = getDirectoryForImageCapture(activity); return new File(baseDir, SCREENSHOT_DIRECTORY_NAME); } @@ -190,7 +192,7 @@ public class ShareDialog extends AppItem { screenshot.compress(Bitmap.CompressFormat.JPEG, 90, fOut); fOut.flush(); fOut.close(); - uri = UiUtils.getUriForImageCaptureFile(activity, saveFile); + uri = getUriForImageCaptureFile(activity, saveFile); } } catch (IOException ie) { if (fOut != null) { @@ -204,4 +206,30 @@ public class ShareDialog extends AppItem { } return uri; } + + public static Uri getUriForImageCaptureFile(Context context, File file) { + return Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2 + ? ContentUriUtils.getContentUriFromFile(context, file) + : Uri.fromFile(file); + } + + public static File getDirectoryForImageCapture(Context context) throws IOException { + File path; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) { + path = new File(context.getFilesDir(), IMAGE_FILE_PATH); + if (!path.exists() && !path.mkdir()) { + throw new IOException("Folder cannot be created."); + } + } else { + File externalDataDir = + Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM); + path = new File( + externalDataDir.getAbsolutePath() + File.separator + EXTERNAL_IMAGE_FILE_PATH); + if (!path.exists() && !path.mkdirs()) { + path = externalDataDir; + } + } + return path; + } + } |