Show "converting to mms" message
There's one path when we have to downscale an attached picture where
we weren't showing the "converting to mms" message.
diff --git a/src/com/android/mms/data/WorkingMessage.java b/src/com/android/mms/data/WorkingMessage.java
index 0635fd8..7806728 100644
--- a/src/com/android/mms/data/WorkingMessage.java
+++ b/src/com/android/mms/data/WorkingMessage.java
@@ -622,7 +622,7 @@
* Force the message to be saved as MMS and return the Uri of the message.
* Typically used when handing a message off to another activity.
*/
- public Uri saveAsMms() {
+ public Uri saveAsMms(boolean notify) {
if (DEBUG) LogTag.debug("save mConversation=%s", mConversation);
if (mDiscarded) {
@@ -633,7 +633,7 @@
// the message seem non-empty (and thus not discarded). This bit
// is sticky until the last other MMS bit is removed, at which
// point the message will fall back to SMS.
- updateState(FORCE_MMS, true, false);
+ updateState(FORCE_MMS, true, notify);
// Collect our state to be written to disk.
prepareForSave(true /* notify */);
diff --git a/src/com/android/mms/ui/ComposeMessageActivity.java b/src/com/android/mms/ui/ComposeMessageActivity.java
index 32edb7d..266f915 100644
--- a/src/com/android/mms/ui/ComposeMessageActivity.java
+++ b/src/com/android/mms/ui/ComposeMessageActivity.java
@@ -273,7 +273,7 @@
//==========================================================
private void editSlideshow() {
- Uri dataUri = mWorkingMessage.saveAsMms();
+ Uri dataUri = mWorkingMessage.saveAsMms(false);
Intent intent = new Intent(this, SlideshowEditActivity.class);
intent.setData(dataUri);
startActivityForResult(intent, REQUEST_CODE_CREATE_SLIDESHOW);
@@ -2383,15 +2383,6 @@
}
}
- private void addImage(Bitmap bitmap) {
- try {
- Uri messageUri = mWorkingMessage.saveAsMms();
- addImage(MessageUtils.saveBitmapAsPart(this, messageUri, bitmap), false);
- } catch (MmsException e) {
- handleAddAttachmentError(WorkingMessage.UNKNOWN_ERROR, R.string.type_picture);
- }
- }
-
private final ResizeImageResultCallback mResizeImageCallback = new ResizeImageResultCallback() {
// TODO: make this produce a Uri, that's what we want anyway
public void onResizeResult(PduPart part, boolean append) {
@@ -2404,7 +2395,7 @@
PduPersister persister = PduPersister.getPduPersister(context);
int result;
- Uri messageUri = mWorkingMessage.saveAsMms();
+ Uri messageUri = mWorkingMessage.saveAsMms(true);
try {
Uri dataUri = persister.persistPart(part, ContentUris.parseId(messageUri));
result = mWorkingMessage.setAttachment(WorkingMessage.IMAGE, dataUri, append);
diff --git a/src/com/android/mms/ui/MessageUtils.java b/src/com/android/mms/ui/MessageUtils.java
index 471814f..5b30fe6 100644
--- a/src/com/android/mms/ui/MessageUtils.java
+++ b/src/com/android/mms/ui/MessageUtils.java
@@ -806,7 +806,7 @@
if (slideshow.isSimple()) {
MessageUtils.viewSimpleSlideshow(context, slideshow);
} else {
- Uri uri = msg.saveAsMms();
+ Uri uri = msg.saveAsMms(false);
viewMmsMessageAttachment(context, uri, slideshow);
}
}
