diff options
| author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-28 14:35:25 +0000 |
|---|---|---|
| committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-28 14:35:25 +0000 |
| commit | 73e83d5df91129711f1583e172ebe1275a62bfe5 (patch) | |
| tree | bb29c08f4d84dd566da5f431b6477881f475509c /chrome/android | |
| parent | 795ebc3fcb515495bd5dea7c6e1fcc101b78aabc (diff) | |
| download | chromium_src-73e83d5df91129711f1583e172ebe1275a62bfe5.zip chromium_src-73e83d5df91129711f1583e172ebe1275a62bfe5.tar.gz chromium_src-73e83d5df91129711f1583e172ebe1275a62bfe5.tar.bz2 | |
Changes to InetHelper to accept optional fileToAttach argument for the
SendEmail method. Will be used by chrome://net-internals to send
net_internals log files via email. This will help us to debug network
connectivity related bugs.
BUG=151512
R=tedchoc@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11364247
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169932 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/android')
| -rw-r--r-- | chrome/android/java/src/org/chromium/chrome/browser/IntentHelper.java | 12 | ||||
| -rw-r--r-- | chrome/android/testshell/java/AndroidManifest.xml | 1 |
2 files changed, 11 insertions, 2 deletions
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHelper.java index ffc0695..6cb7990 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHelper.java @@ -8,12 +8,14 @@ import android.accounts.Account; import android.accounts.AccountManager; import android.content.Context; import android.content.Intent; +import android.net.Uri; import android.text.Html; import android.text.TextUtils; import android.util.Patterns; import org.chromium.base.CalledByNative; +import java.io.File; import java.util.HashSet; import java.util.Set; import java.util.regex.Pattern; @@ -34,10 +36,11 @@ public abstract class IntentHelper { * @param subject The subject of the email. * @param body The body of the email. * @param chooserTitle The title of the activity chooser. + * @param fileToAttach The file name of the attachment. */ @CalledByNative - static void sendEmail( - Context context, String email, String subject, String body, String chooserTitle) { + static void sendEmail(Context context, String email, String subject, String body, + String chooserTitle, String fileToAttach) { Set<String> possibleEmails = new HashSet<String>(); if (!TextUtils.isEmpty(email)) { @@ -60,6 +63,11 @@ public abstract class IntentHelper { } send.putExtra(Intent.EXTRA_SUBJECT, subject); send.putExtra(Intent.EXTRA_TEXT, Html.fromHtml(body)); + if (!TextUtils.isEmpty(fileToAttach)) { + File fileIn = new File(fileToAttach); + send.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(fileIn)); + } + try { Intent chooser = Intent.createChooser(send, chooserTitle); // we start this activity outside the main activity. diff --git a/chrome/android/testshell/java/AndroidManifest.xml b/chrome/android/testshell/java/AndroidManifest.xml index 08447fb..c48f160 100644 --- a/chrome/android/testshell/java/AndroidManifest.xml +++ b/chrome/android/testshell/java/AndroidManifest.xml @@ -65,6 +65,7 @@ <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="16" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> + <uses-permission android:name="android.permission.GET_ACCOUNTS"/> <uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.READ_PHONE_STATE"/> <uses-permission android:name="android.permission.VIBRATE"/> |