am 9b00ec91: Bug 17262099: MMS API changes (multi-project).

* commit '9b00ec9132fc426c7787c70546f84779e62cf3d2':
  Bug 17262099: MMS API changes (multi-project).

samples/ApiDemos/AndroidManifest.xml

@@ -1366,6 +1366,12 @@
             </intent-filter>
         </service>
 
+        <provider android:name=".os.MmsFileProvider"
+                  android:authorities="com.example.android.apis.os.MmsFileProvider"
+                  android:enabled="@bool/atLeastLRelease"
+                  android:permission="android.permission.MODIFY_PHONE_STATE"
+                  android:exported="true"/>
+
         <!-- ************************************* -->
         <!--     ANDROID.ANIMATION PACKAGE SAMPLES         -->
         <!-- ************************************* -->

samples/ApiDemos/src/com/example/android/apis/os/MmsFileProvider.java

@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.android.apis.os;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.ParcelFileDescriptor;
+import android.text.TextUtils;
+
+/**
+ * A very simple content provider that can serve mms files from our cache directory so that
+ * SmsManager#sendMultimdeiaMessage and SmsManager#downloadMultimediaMessage can read/write
+ * the content of the MMS messages to send/download.
+ */
+public class MmsFileProvider extends ContentProvider {
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
+            String sortOrder) {
+        // Don't support queries.
+        return null;
+    }
+
+    @Override
+    public Uri insert(Uri uri, ContentValues values) {
+        // Don't support inserts.
+        return null;
+    }
+
+    @Override
+    public int delete(Uri uri, String selection, String[] selectionArgs) {
+        // Don't support deletes.
+        return 0;
+    }
+
+    @Override
+    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+        // Don't support updates.
+        return 0;
+    }
+
+    @Override
+    public String getType(Uri uri) {
+        // For this sample, assume all files have no type.
+        return null;
+    }
+
+    @Override
+    public ParcelFileDescriptor openFile(Uri uri, String fileMode) throws FileNotFoundException {
+        File file = new File(getContext().getCacheDir(), uri.getPath());
+        int mode = (TextUtils.equals(fileMode, "r") ? ParcelFileDescriptor.MODE_READ_ONLY :
+            ParcelFileDescriptor.MODE_WRITE_ONLY
+                   |ParcelFileDescriptor.MODE_TRUNCATE
+                   |ParcelFileDescriptor.MODE_CREATE);
+        return ParcelFileDescriptor.open(file, mode);
+    }
+}

samples/ApiDemos/src/com/example/android/apis/os/MmsMessagingDemo.java

@@ -32,14 +32,18 @@ import com.google.android.mms.pdu.SendReq;
 
 import android.app.Activity;
 import android.app.PendingIntent;
+import android.app.PendingIntent.CanceledException;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.ParcelFileDescriptor;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.SmsManager;
 import android.telephony.TelephonyManager;
@@ -54,6 +58,13 @@ import android.widget.TextView;
 
 import com.example.android.apis.R;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Random;
+
 public class MmsMessagingDemo extends Activity {
     private static final String TAG = "MmsMessagingDemo";
 
@@ -68,6 +79,9 @@ public class MmsMessagingDemo extends Activity {
     private EditText mTextInput;
     private TextView mSendStatusView;
     private Button mSendButton;
+    private File mSendFile;
+    private File mDownloadFile;
+    private Random mRandom = new Random();
 
     private BroadcastReceiver mSentReceiver = new BroadcastReceiver() {
         @Override
@@ -144,15 +158,49 @@ public class MmsMessagingDemo extends Activity {
         Log.d(TAG, "Sending");
         mSendStatusView.setText(getResources().getString(R.string.mms_status_sending));
         mSendButton.setEnabled(false);
+        final String fileName = "send." + String.valueOf(Math.abs(mRandom.nextLong())) + ".dat";
+        mSendFile = new File(getCacheDir(), fileName);
+
         // Making RPC call in non-UI thread
         AsyncTask.THREAD_POOL_EXECUTOR.execute(new Runnable() {
             @Override
             public void run() {
                 final byte[] pdu = buildPdu(MmsMessagingDemo.this, recipients, subject, text);
+                Uri writerUri = (new Uri.Builder())
+                       .authority("com.example.android.apis.os.MmsFileProvider")
+                       .path(fileName)
+                       .scheme(ContentResolver.SCHEME_CONTENT)
+                       .build();
                 final PendingIntent pendingIntent = PendingIntent.getBroadcast(
                         MmsMessagingDemo.this, 0, new Intent(ACTION_MMS_SENT), 0);
-                SmsManager.getDefault().sendMultimediaMessage(
+                FileOutputStream writer = null;
-                        pdu, null/*locationUrl*/, null/*configOverrides*/, pendingIntent);
+                Uri contentUri = null;
+                try {
+                    writer = new FileOutputStream(mSendFile);
+                    writer.write(pdu);
+                    contentUri = writerUri;
+                } catch (final IOException e) {
+                    Log.e(TAG, "Error writing send file", e);
+                } finally {
+                    if (writer != null) {
+                        try {
+                            writer.close();
+                        } catch (IOException e) {
+                        }
+                    }
+                }
+
+                if (contentUri != null) {
+                    SmsManager.getDefault().sendMultimediaMessage(contentUri,
+                            null/*locationUrl*/, null/*configOverrides*/, pendingIntent);
+                } else {
+                    Log.e(TAG, "Error writing sending Mms");
+                    try {
+                        pendingIntent.send(SmsManager.MMS_ERROR_IO_ERROR);
+                    } catch (CanceledException ex) {
+                        Log.e(TAG, "Mms pending intent cancelled?", ex);
+                    }
+                }
             }
         });
     }
@@ -164,19 +212,27 @@ public class MmsMessagingDemo extends Activity {
         mRecipientsInput.setText("");
         mSubjectInput.setText("");
         mTextInput.setText("");
+        final String fileName = "download." + String.valueOf(Math.abs(mRandom.nextLong())) + ".dat";
+        mDownloadFile = new File(getCacheDir(), fileName);
         // Making RPC call in non-UI thread
         AsyncTask.THREAD_POOL_EXECUTOR.execute(new Runnable() {
             @Override
             public void run() {
+                Uri contentUri = (new Uri.Builder())
+                        .authority("com.example.android.apis.os.MmsFileProvider")
+                        .path(fileName)
+                        .scheme(ContentResolver.SCHEME_CONTENT)
+                        .build();
                 final PendingIntent pendingIntent = PendingIntent.getBroadcast(
                         MmsMessagingDemo.this, 0, new Intent(ACTION_MMS_RECEIVED), 0);
-                SmsManager.getDefault().downloadMultimediaMessage(locationUrl,
+                SmsManager.getDefault().downloadMultimediaMessage(locationUrl, contentUri,
                         null/*configOverrides*/, pendingIntent);
             }
         });
     }
 
     private void handleSentResult(int code, Intent intent) {
+        mSendFile.delete();
         int status = R.string.mms_status_failed;
         if (code == Activity.RESULT_OK) {
             final byte[] response = intent.getByteArrayExtra(SmsManager.MMS_EXTRA_DATA);
@@ -198,6 +254,8 @@ public class MmsMessagingDemo extends Activity {
         } else {
             Log.e(TAG, "MMS not sent, error=" + code);
         }
+
+        mSendFile = null;
         mSendStatusView.setText(status);
         mSendButton.setEnabled(true);
     }
@@ -216,24 +274,36 @@ public class MmsMessagingDemo extends Activity {
     private void handleReceivedResult(Context context, int code, Intent intent) {
         int status = R.string.mms_status_failed;
         if (code == Activity.RESULT_OK) {
-            final byte[] response = intent.getByteArrayExtra(SmsManager.MMS_EXTRA_DATA);
+            try {
-            if (response != null) {
+                final int nBytes = (int) mDownloadFile.length();
-                final GenericPdu pdu = new PduParser(response).parse();
+                FileInputStream reader = new FileInputStream(mDownloadFile);
-                if (pdu instanceof RetrieveConf) {
+                final byte[] response = new byte[nBytes];
-                    final RetrieveConf retrieveConf = (RetrieveConf) pdu;
+                final int read = reader.read(response, 0, nBytes);
-                    mRecipientsInput.setText(getRecipients(context, retrieveConf));
+                if (read == nBytes) {
-                    mSubjectInput.setText(getSubject(retrieveConf));
+                    final GenericPdu pdu = new PduParser(response).parse();
-                    mTextInput.setText(getMessageText(retrieveConf));
+                    if (pdu instanceof RetrieveConf) {
-                    status = R.string.mms_status_downloaded;
+                        final RetrieveConf retrieveConf = (RetrieveConf) pdu;
+                        mRecipientsInput.setText(getRecipients(context, retrieveConf));
+                        mSubjectInput.setText(getSubject(retrieveConf));
+                        mTextInput.setText(getMessageText(retrieveConf));
+                        status = R.string.mms_status_downloaded;
+                    } else {
+                        Log.e(TAG, "MMS received, invalid response");
+                    }
                 } else {
-                    Log.e(TAG, "MMS received, invalid response");
+                    Log.e(TAG, "MMS received, empty response");
                 }
-            } else {
+            } catch (FileNotFoundException e) {
-                Log.e(TAG, "MMS received, empty response");
+                Log.e(TAG, "MMS received, file not found exception", e);
+            } catch (IOException e) {
+                Log.e(TAG, "MMS received, io exception", e);
+            } finally {
+                mDownloadFile.delete();
             }
         } else {
             Log.e(TAG, "MMS not received, error=" + code);
         }
+        mDownloadFile = null;
         mSendStatusView.setText(status);
         mSendButton.setEnabled(true);
     }