0xdroid:packages_apps_mms.git
7 years agoImport revised translations. DO NOT MERGE leb-0xdroid 0x7-leb-gingerbread
Eric Fischer [Mon, 7 Feb 2011 21:21:08 +0000 (13:21 -0800)]
Import revised translations.  DO NOT MERGE

Change-Id: Ie4ed80305df9ece30aa7c589a259a4035d28b64c

7 years agoSupport video/mp4 content type
Sang-Jun Park [Tue, 1 Feb 2011 03:02:25 +0000 (12:02 +0900)]
Support video/mp4 content type

Change-Id: I388e6066b05872993c3f15167d2250d7732c6d8f
Signed-off-by: Sang-Jun Park <sj2202.park@samsung.com>
7 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Thu, 3 Feb 2011 22:24:09 +0000 (14:24 -0800)]
merge in gingerbread-release history after reset to gingerbread

7 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Thu, 3 Feb 2011 02:29:39 +0000 (18:29 -0800)]
merge in gingerbread-release history after reset to gingerbread

7 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Thu, 3 Feb 2011 01:45:10 +0000 (17:45 -0800)]
merge in gingerbread-release history after reset to gingerbread

7 years agoMerge branch 'gingerbread' of ssh://review.source.android.com:29418/platform/packages...
Jean-Baptiste Queru [Wed, 2 Feb 2011 15:47:44 +0000 (07:47 -0800)]
Merge branch 'gingerbread' of ssh://review.source.android.com:29418/platform/packages/apps/Mms into HEAD

7 years agoMerge "Fix the delivery report error" into gingerbread
Jean-Baptiste Queru [Wed, 2 Feb 2011 15:46:42 +0000 (07:46 -0800)]
Merge "Fix the delivery report error" into gingerbread

7 years agoMerge from open-source gingerbread
Jean-Baptiste Queru [Wed, 2 Feb 2011 15:32:40 +0000 (07:32 -0800)]
Merge from open-source gingerbread

Change-Id: Ia574c3da7273fea835eadfa0f48cde5392ab10e7

7 years agoMerge "The problem is that attached files(ex. Image, Movie) on MMS are not displayed...
Jean-Baptiste Queru [Wed, 2 Feb 2011 15:28:07 +0000 (07:28 -0800)]
Merge "The problem is that attached files(ex. Image, Movie) on MMS are not displayed among other devices." into gingerbread

7 years agoFix the delivery report error
Sang-Jun Park [Wed, 2 Feb 2011 00:18:43 +0000 (09:18 +0900)]
Fix the delivery report error

Although TP-status is PENDING or FAILED, delivery report is displayed.
Only in case of SUCCESS, it should be displayed to users.

Change-Id: I00eeed61f8797ff1d468c0bf23a7f3431ed02fae
Signed-off-by: Sang-Jun Park <sj2202.park@samsung.com>
7 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Mon, 31 Jan 2011 00:03:23 +0000 (16:03 -0800)]
merge in gingerbread-release history after reset to gingerbread

7 years agoMerge from open-source gingerbread
Jean-Baptiste Queru [Sun, 30 Jan 2011 23:31:38 +0000 (15:31 -0800)]
Merge from open-source gingerbread

Change-Id: I9c91c58901533a01df03ff62c1a08b6271a3f26c

7 years agoThe problem is that attached files(ex. Image, Movie) on MMS are not displayed among...
Sang-Jun Park [Sun, 30 Jan 2011 23:29:02 +0000 (08:29 +0900)]
The problem is that attached files(ex. Image, Movie) on MMS are not displayed among other devices.

- Symptom
1. Attached Movie, Image files are not displayed
2. Attached MP4 file is not displayed : NexusS to NexusOne
3. Attached 3GP files can't be played : NexusS to A877/A797
4. Attached JPG file is not shown : NexusS to A877
5. Attached JPG file is not shown : Iphone to NexusS

Change-Id: I443bbcca6b6a678cd816a3d0c2bf72f544d8fd56
Signed-off-by: Sang-Jun Park <sj2202.park@samsung.com>
7 years agoMerge "fix mms crash when large video file is sent" into gingerbread
Jean-Baptiste Queru [Sun, 30 Jan 2011 23:17:48 +0000 (15:17 -0800)]
Merge "fix mms crash when large video file is sent" into gingerbread

7 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 28 Jan 2011 22:45:16 +0000 (14:45 -0800)]
merge in gingerbread-release history after reset to gingerbread

7 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 28 Jan 2011 21:21:07 +0000 (13:21 -0800)]
Import revised translations.  DO NOT MERGE

Change-Id: I72f6a1b939cf6362e251590c32cc9a979d1272b0

7 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 27 Jan 2011 22:02:34 +0000 (14:02 -0800)]
Import revised translations.  DO NOT MERGE

Change-Id: If77f65948df08eec3a21fb532a58c1f51c5a3f91

7 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Thu, 27 Jan 2011 02:55:34 +0000 (18:55 -0800)]
merge in gingerbread-release history after reset to gingerbread

7 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Wed, 26 Jan 2011 23:13:07 +0000 (15:13 -0800)]
merge in gingerbread-release history after reset to gingerbread

7 years agofix mms crash when large video file is sent
Ritu Srivastava [Wed, 26 Jan 2011 00:19:10 +0000 (16:19 -0800)]
fix mms crash when large video file is sent

If we try to attach a video with size more than allowed by
CarrierContentRestriction in the Messaging  application
(ComposeMessageActivity), the app crashes since it tries to delete a
message from database with improper URI (null value). Prevent the
deletion of message with null URI in correctAttachmentSize()

Change-Id: Icc08419accc23f13e80376b2078b2494815ee87f

Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
7 years agoFix crash in WorkingMessage.saveAsMms
Tom Taylor [Tue, 25 Jan 2011 22:29:19 +0000 (14:29 -0800)]
Fix crash in WorkingMessage.saveAsMms

A set of steps will correctly cause the working message to get marked
as discarded. However, when restarting, the discarded working message
was not replaced with a good working message. Bug 1866477

Change-Id: I4b42402e3d539df2792b20fa5c3a2f4567085f08

7 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 21 Jan 2011 01:21:00 +0000 (17:21 -0800)]
merge in gingerbread-release history after reset to gingerbread

7 years agoMerge branch 'gingerbread-release' into saved-gingerbread-release
android-merger [Wed, 19 Jan 2011 22:13:19 +0000 (14:13 -0800)]
Merge branch 'gingerbread-release' into saved-gingerbread-release

7 years agoReconcile with open-source gingerbread
Jean-Baptiste Queru [Wed, 19 Jan 2011 19:10:37 +0000 (11:10 -0800)]
Reconcile with open-source gingerbread

Change-Id: I749917e5bf130ac5458cf6d84a8442176c17cd84

7 years agoSms sent to wrong recipient
Tom Taylor [Wed, 5 Jan 2011 03:37:32 +0000 (19:37 -0800)]
Sms sent to wrong recipient

Remove the empty conversation from the conversation cache.
Bug 3057952

Change-Id: I5b208f5d071dac89af0ac9bd5af43b0286bbf60f

7 years agoNotification goes to conv list
Tom Taylor [Tue, 4 Jan 2011 22:22:22 +0000 (14:22 -0800)]
Notification goes to conv list

Selecting sms notification often goes to conversation list instead
of the individual conversation. Bug 3322081

Change-Id: I67382208daea657b46593d82b23c6d2461414331

7 years agobug #3319036: fix one of the (severe) SMS bugs where the wrong conversation is opened.
Wei Huang [Tue, 4 Jan 2011 09:01:04 +0000 (01:01 -0800)]
bug #3319036: fix one of the (severe) SMS bugs where the wrong conversation is opened.

- the code in ConversationList.onListItemClicked() was extracting the conversation data
from the ConversationListItem view passed in. However, ListItem views can be recycled
when rebound, so the view we got could now be reassigned to a different list position
and contain different data.

Intead of depend on ConversationListItem to store the conversation data, always load
the cursor at the position clicked, and get the conversation data from the cursor.

Change-Id: I4ce80a323771a3f0f91f2f62da17af9cc02a5084

7 years agoFix build issue with last merge
android-merger [Mon, 17 Jan 2011 18:23:08 +0000 (10:23 -0800)]
Fix build issue with last merge

Change-Id: I7530e23e4054389b9595c2248dc89261ec357f63

7 years agoSms sent to wrong recipient
Tom Taylor [Wed, 5 Jan 2011 03:37:32 +0000 (19:37 -0800)]
Sms sent to wrong recipient

Remove the empty conversation from the conversation cache.
Bug 3057952

Change-Id: I5b208f5d071dac89af0ac9bd5af43b0286bbf60f

7 years agomanual merge d2ff1f81a3f68f99a8d62fc61256e6bc94ae45a7
android-merger [Mon, 17 Jan 2011 06:04:13 +0000 (22:04 -0800)]
manual merge d2ff1f81a3f68f99a8d62fc61256e6bc94ae45a7

Change-Id: If37e57c8e8b6f35f4073e5094e14185e63f25ec7

7 years agomanual merge a7ce913d3b55de6e5808e8b29e50e186a2d4e96a
android-merger [Mon, 17 Jan 2011 06:00:47 +0000 (22:00 -0800)]
manual merge a7ce913d3b55de6e5808e8b29e50e186a2d4e96a

Change-Id: Iae7405f8aaf90d08172ed9c199783bd0ec37dbf4

7 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Mon, 17 Jan 2011 00:22:07 +0000 (16:22 -0800)]
merge in gingerbread-release history after reset to gingerbread

7 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Sun, 16 Jan 2011 16:53:54 +0000 (08:53 -0800)]
merge in gingerbread-release history after reset to gingerbread

7 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 14 Jan 2011 15:48:56 +0000 (07:48 -0800)]
merge in gingerbread-release history after reset to gingerbread

7 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Thu, 13 Jan 2011 15:48:22 +0000 (07:48 -0800)]
merge in gingerbread-release history after reset to gingerbread

7 years agoSquash commits of the following patchs cherry-picked from other branch - do not merge.
James Dong [Sat, 4 Dec 2010 00:54:37 +0000 (16:54 -0800)]
Squash commits of the following patchs cherry-picked from other branch - do not merge.

o Replace call to MediaMetadataRetriever.captureFrame() with MediaMetadataRetriver.getFrameAtTime()
  as part of the preparation for publishing MediaMetadataRetriever java API

o Don't call MediaMetadataRetriever.setMode(), which is going to be removed.

bug - 3309041

Change-Id: Ic9b33a0dad21e5bc96b21b2717de2e1c41f6c479

7 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Wed, 12 Jan 2011 15:21:05 +0000 (07:21 -0800)]
merge in gingerbread-release history after reset to gingerbread

7 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Tue, 11 Jan 2011 15:34:53 +0000 (07:34 -0800)]
merge in gingerbread-release history after reset to gingerbread

7 years agoFix java.lang.IllegalStateException: attempt to re-open an already-closed object
Tom Taylor [Tue, 11 Jan 2011 01:17:57 +0000 (17:17 -0800)]
Fix java.lang.IllegalStateException: attempt to re-open an already-closed object

Wrong cursor getting closed. Bug 3338157

Change-Id: I13d7233a0aafa4a363766b64a8a3bf5aa7990f8c

7 years agoOOM at com.android.mms.ui.UriImage.getResizedImageData
Tom Taylor [Thu, 6 Jan 2011 20:00:34 +0000 (12:00 -0800)]
OOM at com.android.mms.ui.UriImage.getResizedImageData

Recycle the bitmap each time through the loop and catch OOM when we
try and convert the bitmap to a byte array. Bug 3263587

Change-Id: I83dde7ed10f18ad6a6f81ca34babe4e455a5ec42

7 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Mon, 10 Jan 2011 15:39:57 +0000 (07:39 -0800)]
merge in gingerbread-release history after reset to gingerbread

7 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 7 Jan 2011 01:24:29 +0000 (17:24 -0800)]
merge in gingerbread-release history after reset to gingerbread

7 years agoMerge "Import translations for additional languages." into gingerbread
Eric Fischer [Thu, 6 Jan 2011 22:06:34 +0000 (14:06 -0800)]
Merge "Import translations for additional languages." into gingerbread

7 years agoMerge "Fix recycler NPE" into gingerbread
Tom Taylor [Thu, 6 Jan 2011 19:58:36 +0000 (11:58 -0800)]
Merge "Fix recycler NPE" into gingerbread

7 years agoMerge "Video rotation/thumbnail is not properly displayed in MMS" into gingerbread
Tom Taylor [Thu, 6 Jan 2011 19:08:57 +0000 (11:08 -0800)]
Merge "Video rotation/thumbnail is not properly displayed in MMS" into gingerbread

7 years agoImport translations for additional languages.
Eric Fischer [Thu, 6 Jan 2011 18:36:19 +0000 (10:36 -0800)]
Import translations for additional languages.

Change-Id: I4a2a69c58e561c87d0bb6fa3edcb863a8382e984

7 years agoFix recycler NPE
Tom Taylor [Thu, 6 Jan 2011 18:30:58 +0000 (10:30 -0800)]
Fix recycler NPE

It's caused by getting back a null cursor from a query. There are other
places in the code where we could get null cursors. Fixed 'em. Also,
the cursor wasn't getting closed. Fixed that too. Bug 3315962

Change-Id: Ifff2b35cf25627847376131a16686d3420a21946

7 years agoVideo rotation/thumbnail is not properly displayed in MMS
Tom Taylor [Thu, 6 Jan 2011 17:49:02 +0000 (09:49 -0800)]
Video rotation/thumbnail is not properly displayed in MMS

Bug 3185520

Change-Id: Ibd890a15a50bd8191ed95c3e1c36634246e975d5

7 years agoam 1f4171b8: Sms sent to wrong recipient
Tom Taylor [Wed, 5 Jan 2011 22:23:03 +0000 (14:23 -0800)]
am 1f4171b8: Sms sent to wrong recipient

* commit '1f4171b81be3d2aafcb5d330af5603925f0c02c9':
  Sms sent to wrong recipient

7 years agoSms sent to wrong recipient
Tom Taylor [Wed, 5 Jan 2011 22:06:31 +0000 (14:06 -0800)]
Sms sent to wrong recipient

Remove the empty conversation from the conversation cache.
Bug 3057952

Change-Id: I89d0a6445ae9126b51da3cc4bce929ba05e97853

7 years agoam 0978a0c9: Notification goes to conv list
Tom Taylor [Wed, 5 Jan 2011 22:02:31 +0000 (14:02 -0800)]
am 0978a0c9: Notification goes to conv list

* commit '0978a0c9c7baddc49dbe826c4c2a72c09d8d254a':
  Notification goes to conv list

7 years agoam 782942d0: (-s ours) bug #3319036: fix one of the (severe) SMS bugs where the wrong...
Tom Taylor [Wed, 5 Jan 2011 22:00:46 +0000 (14:00 -0800)]
am 782942d0: (-s ours) bug #3319036: fix one of the (severe) SMS bugs where the wrong conversation is opened.

* commit '782942d0e20878225da06466597760a3edc64056':
  bug #3319036: fix one of the (severe) SMS bugs where the wrong conversation is opened.

7 years agoNotification goes to conv list
Tom Taylor [Wed, 5 Jan 2011 21:48:12 +0000 (13:48 -0800)]
Notification goes to conv list

Selecting sms notification often goes to conversation list instead
of the individual conversation. Bug 3322081

Merged from gingerbread

Change-Id: I101e5bf6f539302970f93f190933672d06b42d37

7 years agobug #3319036: fix one of the (severe) SMS bugs where the wrong conversation is opened.
Tom Taylor [Wed, 5 Jan 2011 21:31:40 +0000 (13:31 -0800)]
bug #3319036: fix one of the (severe) SMS bugs where the wrong conversation is opened.

- the code in ConversationList.onListItemClicked() was extracting the conversation data
from the ConversationListItem view passed in. However, ListItem views can be recycled
when rebound, so the view we got could now be reassigned to a different list position
and contain different data.

Intead of depend on ConversationListItem to store the conversation data, always load
the cursor at the position clicked, and get the conversation data from the cursor.

Merge from gingerbread

Conflicts:

src/com/android/mms/ui/ConversationList.java

Change-Id: I276a2ffc48fb51a99c87584d7604f188aec1cb98

7 years agobug #3057952: remove and turn off verbose logging done for this bug.
Wei Huang [Wed, 5 Jan 2011 19:41:25 +0000 (11:41 -0800)]
bug #3057952: remove and turn off verbose logging done for this bug.

Change-Id: I85c14abfccb35d3d4f9c80cba14642f5cb2fb1fc

7 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Wed, 5 Jan 2011 15:34:01 +0000 (07:34 -0800)]
merge in gingerbread-release history after reset to gingerbread

7 years agoSms sent to wrong recipient
Tom Taylor [Wed, 5 Jan 2011 03:37:32 +0000 (19:37 -0800)]
Sms sent to wrong recipient

Remove the empty conversation from the conversation cache.
Bug 3057952

Change-Id: I5b208f5d071dac89af0ac9bd5af43b0286bbf60f

7 years agoNotification goes to conv list
Tom Taylor [Tue, 4 Jan 2011 22:22:22 +0000 (14:22 -0800)]
Notification goes to conv list

Selecting sms notification often goes to conversation list instead
of the individual conversation. Bug 3322081

Change-Id: I67382208daea657b46593d82b23c6d2461414331

7 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Tue, 4 Jan 2011 15:19:46 +0000 (07:19 -0800)]
merge in gingerbread-release history after reset to gingerbread

7 years agobug #3319036: fix one of the (severe) SMS bugs where the wrong conversation is opened.
Wei Huang [Tue, 4 Jan 2011 09:01:04 +0000 (01:01 -0800)]
bug #3319036: fix one of the (severe) SMS bugs where the wrong conversation is opened.

- the code in ConversationList.onListItemClicked() was extracting the conversation data
from the ConversationListItem view passed in. However, ListItem views can be recycled
when rebound, so the view we got could now be reassigned to a different list position
and contain different data.

Intead of depend on ConversationListItem to store the conversation data, always load
the cursor at the position clicked, and get the conversation data from the cursor.

Change-Id: I4ce80a323771a3f0f91f2f62da17af9cc02a5084

7 years agobug #3057952: add bunch more debugging info to catch this bug.
Wei Huang [Mon, 3 Jan 2011 05:36:36 +0000 (21:36 -0800)]
bug #3057952: add bunch more debugging info to catch this bug.

Change-Id: I3ea9bd19adcf177697536cc56ab079957f863463

7 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Wed, 22 Dec 2010 16:00:45 +0000 (08:00 -0800)]
merge in gingerbread-release history after reset to gingerbread

7 years agomerge in gingerbread-release history after reset to gingerbread
The Android Automerger [Tue, 21 Dec 2010 16:31:56 +0000 (08:31 -0800)]
merge in gingerbread-release history after reset to gingerbread

7 years agoMerge "Need to trim mmsc and apn url" into gingerbread
Tom Taylor [Sat, 11 Dec 2010 00:45:41 +0000 (16:45 -0800)]
Merge "Need to trim mmsc and apn url" into gingerbread

7 years agoNeed to trim mmsc and apn url
Tom Taylor [Sat, 11 Dec 2010 00:14:30 +0000 (16:14 -0800)]
Need to trim mmsc and apn url

Tested by duplicating the Italian situation by adding a leading
space to the APN used on my phone. Bug 3261633

Change-Id: Ia5a546a330bd055464b9100d04755d2729d9d3d5

7 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 30 Nov 2010 00:17:03 +0000 (16:17 -0800)]
Import revised translations.  DO NOT MERGE

Change-Id: I097d74d3c1300d8763bcfe26dd983f1a32644367

7 years agoChange maxMessageSize to 300 kB.
Fredrik Roubert [Fri, 19 Nov 2010 16:47:54 +0000 (17:47 +0100)]
Change maxMessageSize to 300 kB.

Change-Id: Id02f66cf1d2c4e9bfb5e2d07e9b7cba4d1c6b6e1

7 years agoMerge "Turn off messaging app's SEVERE_WARNING" into gingerbread beagle-gingerbread
Tom Taylor [Fri, 22 Oct 2010 23:31:48 +0000 (16:31 -0700)]
Merge "Turn off messaging app's SEVERE_WARNING" into gingerbread

7 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 22 Oct 2010 22:29:28 +0000 (15:29 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I5cdee6e9e71aecc70ddbe91168000e083f2d6a45

7 years agoTurn off messaging app's SEVERE_WARNING
Tom Taylor [Fri, 22 Oct 2010 22:28:14 +0000 (15:28 -0700)]
Turn off messaging app's SEVERE_WARNING

Bug 3062274

Change-Id: I100914f4f31bf74c2cc79e784f38cd0fc33143d1

7 years agoPrepare for turning off extensive logging
Tom Taylor [Mon, 18 Oct 2010 21:11:09 +0000 (14:11 -0700)]
Prepare for turning off extensive logging

Bug 3062274

Change-Id: I02dbc06b6502d8f50ba7bb2dca367623364adc40

7 years agoFix crash logging exception
Tom Taylor [Fri, 15 Oct 2010 14:01:43 +0000 (07:01 -0700)]
Fix crash logging exception

Bug 3099377. The rest of the code is full of lines like this:
  Log.e(TAG, e.getMessage(), e);
I tested code like that and when getMessage() is null it
will log (but not crash):
E/MessageListAdapter( 2210): null
E/MessageListAdapter( 2210): com.google.android.mms.MmsException
E/MessageListAdapter( 2210):  at com.android.mms.ui.MessageListAdapter.newView(MessageListAdapter.java:255)
E/MessageListAdapter( 2210):  at android.widget.CursorAdapter.getView(CursorAdapter.java:182)

Change-Id: I728e20cc5f0d8e986d67d2964d04682645a550d4

7 years agoImport revised translations
Kenny Root [Thu, 14 Oct 2010 16:44:28 +0000 (09:44 -0700)]
Import revised translations

Change-Id: Iec10782854c4ae81d4959100a7f06ed1a756274f

7 years agoRemove some PII.
Wink Saville [Tue, 12 Oct 2010 18:46:57 +0000 (11:46 -0700)]
Remove some PII.

Change-Id: I846866881d79b985ea0bc6fa647f8e7a38e63a9b

7 years agoTighten recipient check
Tom Taylor [Mon, 11 Oct 2010 18:49:11 +0000 (11:49 -0700)]
Tighten recipient check

When we send a message, the recips in the UI can be empty when the
user manually types in a number and hits send. prepareForSave() then
turns those working numbers into real recips. Add an extra test
for that situation before complaining of different recips.
Bug 3066322

Change-Id: I4aaa86138bc9aa817848b24cc5aac1c7718fe735

7 years agoMerge "Call dialog.dismiss()" into gingerbread
Tom Taylor [Sat, 9 Oct 2010 20:19:41 +0000 (13:19 -0700)]
Merge "Call dialog.dismiss()" into gingerbread

7 years agoFix too strict scary message
Tom Taylor [Sat, 9 Oct 2010 18:09:56 +0000 (11:09 -0700)]
Fix too strict scary message

Don't check threadIds in syncWorkingRecipients. Instead, check recipients
across a call to prepareForSave in send. Bug 3076599

Change-Id: I26f12370bfb7e42196194edd1374ca2b89997595

7 years agoCall dialog.dismiss()
Tom Taylor [Sat, 9 Oct 2010 17:45:06 +0000 (10:45 -0700)]
Call dialog.dismiss()

In many of the click handlers, we neglected to dismiss the dialog.
Bug 3072307

Change-Id: Ie461492394c9f29ce2a7bb6e7f00a93068ea2bf8

7 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 7 Oct 2010 00:13:18 +0000 (17:13 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: Id8c77e65f64624f49207ceae5460752527f54ce1

7 years agoNew downscaled menu assets
Gilles Debunne [Wed, 6 Oct 2010 16:57:59 +0000 (09:57 -0700)]
New downscaled menu assets

Change-Id: Ifd78299b85eb359e1d795c118069473c18cf3354

7 years agoLoosen recipients check
Tom Taylor [Wed, 6 Oct 2010 00:24:51 +0000 (17:24 -0700)]
Loosen recipients check

A valid sending scenario was found where we were complaining the
recipients didn't match. Bug 3066322

Change-Id: I53da6a9a9d063d09826ce7f955a2dfaaf0633b38

7 years agoMerge "Add debugging code" into gingerbread
Tom Taylor [Tue, 5 Oct 2010 01:18:34 +0000 (18:18 -0700)]
Merge "Add debugging code" into gingerbread

7 years agoAdd debugging code
Tom Taylor [Tue, 5 Oct 2010 01:12:40 +0000 (18:12 -0700)]
Add debugging code

Add a number of tests to try and track down the situation that causes
a message to be sent to the wrong recipient. Bug 3057952

Change-Id: I2da3e91dcb039e87c3222e48026b859d1644793e

7 years agoMerge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Thu, 30 Sep 2010 22:47:02 +0000 (15:47 -0700)]
Merge "Import revised translations.  DO NOT MERGE" into gingerbread

7 years agoFix proguard flag file dependency.
Ying Wang [Wed, 29 Sep 2010 22:24:57 +0000 (15:24 -0700)]
Fix proguard flag file dependency.

Change-Id: I38204e9946a468cf91c8e0966ed2bb3bbc0f3a1f

7 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 29 Sep 2010 21:35:04 +0000 (14:35 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I286c76c304fe117f8a83041396ac466c50699d5c

7 years agoGenericize strings that refer to the SD card.
Eric Fischer [Tue, 28 Sep 2010 23:35:04 +0000 (16:35 -0700)]
Genericize strings that refer to the SD card.

Change-Id: I0d467767507e88118de3737c13e3ddeb52472112

7 years agoTrim unwanted whitespace from translations. DO NOT MERGE
Eric Fischer [Mon, 27 Sep 2010 19:19:20 +0000 (12:19 -0700)]
Trim unwanted whitespace from translations.  DO NOT MERGE

Change-Id: I8703102b3e68e697746c140ad038a85dd949234d

7 years agodo not merge
Chet Haase [Sat, 18 Sep 2010 00:22:38 +0000 (17:22 -0700)]
do not merge

new assets

Change-Id: I983006630c15453c72c0a081545a17548c9a2aeb

7 years agoDismiss dialog
Tom Taylor [Thu, 16 Sep 2010 22:44:53 +0000 (15:44 -0700)]
Dismiss dialog

Dismiss the dialog and don't leak the window.
Bug 2675689

Change-Id: Iacaff5e6463c7cbef41ab09c80b6512d50aa5b35

7 years agoFix multi-image attachment
Tom Taylor [Thu, 16 Sep 2010 22:00:28 +0000 (15:00 -0700)]
Fix multi-image attachment

Handle the case where building a PDU part returns null. Tested by
forcing this code path to occur. The user sees a toast and the Mms message
is put into the error state (with visible error icon).
Bug 2938634

Change-Id: I8043fce21080f3b8073aed03b7f194406acf4768

7 years agoHandle OutOfMemory when decoding images
Tom Taylor [Thu, 16 Sep 2010 01:20:18 +0000 (18:20 -0700)]
Handle OutOfMemory when decoding images

Decoding images and videos in the messaging app appears to be a
vulnerable point for running out of memory. Catch those exceptions,
log an error, and continue on without loading the image. Most of these
"catches" are around situations where there's been a problem decoding
the original image in the first place, and now we're simply trying
to decode a small missing stand-in image. However, since BitmapFactory.decodeResource
seems to be in an inordinate number of bug reports, I want to log every
use in the code in case of failure.
Handles the 2nd part of bug 2994057.

Change-Id: Iaa8035f6ef28385b353d31507b9753934881d3e8

7 years agoDon't do disk writes on the UI thread when updating cache.
Brad Fitzpatrick [Tue, 14 Sep 2010 23:31:53 +0000 (16:31 -0700)]
Don't do disk writes on the UI thread when updating cache.

Fixes some of the more common StrictMode violations.

Change-Id: Ica4373ec20a6040642cee035f1e7eafdcdc2af67

7 years agoThread call start
Tom Taylor [Fri, 10 Sep 2010 21:36:27 +0000 (14:36 -0700)]
Thread call start

A thread was calling run() instead of start(). Add names to the
threads in this file. Gingerbread bug 2991885.

Change-Id: I20f144b53c96227f977340d4a69bc68311403ed5

7 years agoUse new apply() instead of commit().
Brad Fitzpatrick [Thu, 26 Aug 2010 22:47:43 +0000 (15:47 -0700)]
Use new apply() instead of commit().

apply() starts an async disk write and doesn't have a return
value but is otherwise identical in observable effects.

Change-Id: I126fa7cb5d02a2c30721eb702ecf5bd9d9376b17

7 years agomerge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Jean-Baptiste Queru [Tue, 24 Aug 2010 02:09:10 +0000 (19:09 -0700)]
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward

Change-Id: I551c090b9ebcb904da09faf3a99c2106c5973d95

7 years agoMove failed message to failed state
Tom Taylor [Tue, 3 Aug 2010 00:27:02 +0000 (17:27 -0700)]
Move failed message to failed state

When we try and send a message and the telephony layer throws an
exception, move that message to the failed state. Otherwise, it
perpetually remains in the outbox and shows as "Sending..." to the
user.

Change-Id: Iaa2a4ed05f67828e8f980228e01a5a34e4fc069e

7 years agoam 943dc156: (-s ours) Move failed message to failed state
Tom Taylor [Tue, 17 Aug 2010 22:16:44 +0000 (15:16 -0700)]
am 943dc156: (-s ours) Move failed message to failed state

Merge commit '943dc156a704156b0cb62c76f7a1a80c9768c3d0' into gingerbread

* commit '943dc156a704156b0cb62c76f7a1a80c9768c3d0':
  Move failed message to failed state

7 years agoMove failed message to failed state
Tom Taylor [Tue, 3 Aug 2010 00:27:02 +0000 (17:27 -0700)]
Move failed message to failed state

When we try and send a message and the telephony layer throws an
exception, move that message to the failed state. Otherwise, it
perpetually remains in the outbox and shows as "Sending..." to the
user.

Change-Id: Iaa2a4ed05f67828e8f980228e01a5a34e4fc069e

7 years agoMerge "Move failed message to failed state" into gingerbread
Tom Taylor [Tue, 10 Aug 2010 21:31:41 +0000 (14:31 -0700)]
Merge "Move failed message to failed state" into gingerbread