diff --git a/res/values/strings.xml b/res/values/strings.xml index 9ae261708..52f46f5f5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -19,6 +19,8 @@ + + @@ -628,10 +630,6 @@ Microsoft Exchange ActiveSync - - Invitation: %s diff --git a/src/com/android/exchange/utility/CalendarUtilities.java b/src/com/android/exchange/utility/CalendarUtilities.java index feec1a9fe..a458b24d8 100644 --- a/src/com/android/exchange/utility/CalendarUtilities.java +++ b/src/com/android/exchange/utility/CalendarUtilities.java @@ -1322,12 +1322,11 @@ public class CalendarUtilities { sequence = "0"; } + // We'll use 0 to mean a meeting invitation int titleId = 0; switch (messageFlag) { case Message.FLAG_OUTGOING_MEETING_INVITE: - if (sequence.equals("0")) { - titleId = R.string.meeting_invitation; - } else { + if (!sequence.equals("0")) { titleId = R.string.meeting_updated; } break; @@ -1350,7 +1349,11 @@ public class CalendarUtilities { title = ""; } ics.writeTag("SUMMARY", title); - if (titleId != 0) { + // For meeting invitations just use the title + if (titleId == 0) { + msg.mSubject = title; + } else { + // Otherwise, use the additional text msg.mSubject = resources.getString(titleId, title); } diff --git a/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java b/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java index 0a8396450..67172f351 100644 --- a/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java +++ b/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java @@ -287,8 +287,7 @@ public class CalendarUtilitiesTests extends AndroidTestCase { // Now check some of the fields of the message assertEquals(Address.pack(new Address[] {new Address(ATTENDEE)}), msg.mTo); - String accept = getContext().getResources().getString(R.string.meeting_invitation, title); - assertEquals(accept, msg.mSubject); + assertEquals(title, msg.mSubject); // And make sure we have an attachment assertNotNull(msg.mAttachments); @@ -350,8 +349,7 @@ public class CalendarUtilitiesTests extends AndroidTestCase { // Now check some of the fields of the message assertEquals(Address.pack(new Address[] {new Address(ATTENDEE)}), msg.mTo); - String accept = getContext().getResources().getString(R.string.meeting_invitation, title); - assertEquals(accept, msg.mSubject); + assertEquals(title, msg.mSubject); // And make sure we have an attachment assertNotNull(msg.mAttachments);