From 2577842269f035856b877eb990567c7a32e81252 Mon Sep 17 00:00:00 2001 From: Ben Komalo Date: Fri, 8 Apr 2011 13:59:21 -0700 Subject: [PATCH] Misc fixes and dead code removal. Change-Id: I48b2fa5f7bf619197d882c71e8b174d31d130e26 --- .../com/android/emailcommon/mail/Address.java | 73 +------------------ src/com/android/email/AttachmentInfo.java | 1 - .../android/email/MessagingController.java | 9 +-- .../android/email/activity/MessageList.java | 4 +- .../email/activity/MessageListFragment.java | 10 +-- .../android/email/activity/MessageListXL.java | 2 +- .../email/activity/MessagesAdapter.java | 1 - .../emailcommon/mail/AddressUnitTests.java | 17 ++--- 8 files changed, 16 insertions(+), 101 deletions(-) diff --git a/emailcommon/src/com/android/emailcommon/mail/Address.java b/emailcommon/src/com/android/emailcommon/mail/Address.java index 76a3b7c6f..be03b39de 100644 --- a/emailcommon/src/com/android/emailcommon/mail/Address.java +++ b/emailcommon/src/com/android/emailcommon/mail/Address.java @@ -80,7 +80,7 @@ public class Address { } public void setAddress(String address) { - this.mAddress = REMOVE_OPTIONAL_BRACKET.matcher(address).replaceAll("$1");; + mAddress = REMOVE_OPTIONAL_BRACKET.matcher(address).replaceAll("$1");; } /** @@ -107,7 +107,7 @@ public class Address { personal = null; } } - this.mPersonal = personal; + mPersonal = personal; } /** @@ -447,73 +447,4 @@ public class Address { return address + LIST_DELIMITER_PERSONAL + personal; } } - - /** - * Legacy unpack() used for reading the old data (migration), - * as found in LocalStore (Donut; db version up to 24). - * @See unpack() - */ - public static Address[] legacyUnpack(String addressList) { - if (addressList == null || addressList.length() == 0) { - return new Address[] { }; - } - ArrayList
addresses = new ArrayList
(); - int length = addressList.length(); - int pairStartIndex = 0; - int pairEndIndex = 0; - int addressEndIndex = 0; - while (pairStartIndex < length) { - pairEndIndex = addressList.indexOf(',', pairStartIndex); - if (pairEndIndex == -1) { - pairEndIndex = length; - } - addressEndIndex = addressList.indexOf(';', pairStartIndex); - String address = null; - String personal = null; - if (addressEndIndex == -1 || addressEndIndex > pairEndIndex) { - address = - Utility.fastUrlDecode(addressList.substring(pairStartIndex, pairEndIndex)); - } - else { - address = - Utility.fastUrlDecode(addressList.substring(pairStartIndex, addressEndIndex)); - personal = - Utility.fastUrlDecode(addressList.substring(addressEndIndex + 1, pairEndIndex)); - } - addresses.add(new Address(address, personal)); - pairStartIndex = pairEndIndex + 1; - } - return addresses.toArray(new Address[] { }); - } - - /** - * Legacy pack() used for writing to old data (migration), - * as found in LocalStore (Donut; db version up to 24). - * @See unpack() - */ - public static String legacyPack(Address[] addresses) { - if (addresses == null) { - return null; - } else if (addresses.length == 0) { - return ""; - } - StringBuffer sb = new StringBuffer(); - for (int i = 0, count = addresses.length; i < count; i++) { - Address address = addresses[i]; - try { - sb.append(URLEncoder.encode(address.getAddress(), "UTF-8")); - if (address.getPersonal() != null) { - sb.append(';'); - sb.append(URLEncoder.encode(address.getPersonal(), "UTF-8")); - } - if (i < count - 1) { - sb.append(','); - } - } - catch (UnsupportedEncodingException uee) { - return null; - } - } - return sb.toString(); - } } diff --git a/src/com/android/email/AttachmentInfo.java b/src/com/android/email/AttachmentInfo.java index c8d3c307d..657f6aa34 100644 --- a/src/com/android/email/AttachmentInfo.java +++ b/src/com/android/email/AttachmentInfo.java @@ -27,7 +27,6 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.database.Cursor; import android.net.ConnectivityManager; -import android.net.NetworkInfo; import android.net.Uri; import android.provider.Settings; import android.text.TextUtils; diff --git a/src/com/android/email/MessagingController.java b/src/com/android/email/MessagingController.java index f97f36cb7..01a982dcd 100644 --- a/src/com/android/email/MessagingController.java +++ b/src/com/android/email/MessagingController.java @@ -105,12 +105,6 @@ public class MessagingController implements Runnable { */ private static final String LOCAL_SERVERID_PREFIX = "Local-"; - /** - * Projections & CVs used by pruneCachedAttachments - */ - private static final String[] PRUNE_ATTACHMENT_PROJECTION = new String[] { - AttachmentColumns.LOCATION - }; private static final ContentValues PRUNE_ATTACHMENT_CV = new ContentValues(); static { PRUNE_ATTACHMENT_CV.putNull(AttachmentColumns.CONTENT_URI); @@ -1401,7 +1395,8 @@ public class MessagingController implements Runnable { } if (deleteUpdate) { // Finally, delete the update (if any) - Uri uri = ContentUris.withAppendedId(EmailContent.Message.UPDATED_CONTENT_URI, messageId); + Uri uri = ContentUris.withAppendedId( + EmailContent.Message.UPDATED_CONTENT_URI, messageId); resolver.delete(uri, null, null); } } diff --git a/src/com/android/email/activity/MessageList.java b/src/com/android/email/activity/MessageList.java index 6d6cde3a0..276015f35 100644 --- a/src/com/android/email/activity/MessageList.java +++ b/src/com/android/email/activity/MessageList.java @@ -49,7 +49,6 @@ public class MessageList extends Activity implements MessageListFragment.Callbac private MessageListFragment mListFragment; private TextView mErrorBanner; - private Controller mController; private RefreshManager mRefreshManager; private final RefreshListener mRefreshListener = new RefreshListener(); @@ -108,7 +107,6 @@ public class MessageList extends Activity implements MessageListFragment.Callbac ActivityHelper.debugSetWindowFlags(this); setContentView(R.layout.message_list); - mController = Controller.getInstance(this); mRefreshManager = RefreshManager.getInstance(this); mRefreshManager.registerListener(mRefreshListener); mListFragment = (MessageListFragment) getFragmentManager() @@ -344,7 +342,7 @@ public class MessageList extends Activity implements MessageListFragment.Callbac // launch the security setup activity Intent i = AccountSecurity.actionUpdateSecurityIntent( MessageList.this, accountId, true); - MessageList.this.startActivityForResult(i, REQUEST_SECURITY); + startActivityForResult(i, REQUEST_SECURITY); } } } diff --git a/src/com/android/email/activity/MessageListFragment.java b/src/com/android/email/activity/MessageListFragment.java index f40306bb0..932491243 100644 --- a/src/com/android/email/activity/MessageListFragment.java +++ b/src/com/android/email/activity/MessageListFragment.java @@ -105,7 +105,7 @@ public class MessageListFragment extends ListFragment // Controller access private Controller mController; private RefreshManager mRefreshManager; - private RefreshListener mRefreshListener = new RefreshListener(); + private final RefreshListener mRefreshListener = new RefreshListener(); // UI Support private Activity mActivity; @@ -500,11 +500,11 @@ public class MessageListFragment extends ListFragment /** Height of the draggable view */ private final int mDragHeight; - private String mMessageText; - private PointF mMessagePoint; + private final String mMessageText; + private final PointF mMessagePoint; - private String mCountText; - private PointF mCountPoint; + private final String mCountText; + private final PointF mCountPoint; private int mOldOrientation = Configuration.ORIENTATION_UNDEFINED; /** Margin applied to the right of count text */ diff --git a/src/com/android/email/activity/MessageListXL.java b/src/com/android/email/activity/MessageListXL.java index 2bd5d5bb1..8d0946611 100644 --- a/src/com/android/email/activity/MessageListXL.java +++ b/src/com/android/email/activity/MessageListXL.java @@ -589,7 +589,7 @@ public class MessageListXL extends Activity implements MessageListXLFragmentMana // STOPSHIP Temporary mailbox settings UI @Override - protected Dialog onCreateDialog(int id) { + protected Dialog onCreateDialog(int id, Bundle args) { Mailbox mailbox = Mailbox.restoreMailboxWithId(this, mFragmentManager.getMailboxId()); if (mailbox == null) return null; switch (id) { diff --git a/src/com/android/email/activity/MessagesAdapter.java b/src/com/android/email/activity/MessagesAdapter.java index 9747fed03..f0026b44e 100644 --- a/src/com/android/email/activity/MessagesAdapter.java +++ b/src/com/android/email/activity/MessagesAdapter.java @@ -166,7 +166,6 @@ import java.util.Set; @Override public View newView(Context context, Cursor cursor, ViewGroup parent) { - //return mInflater.inflate(R.layout.message_list_item, parent, false); MessageListItem item = new MessageListItem(context); item.setVisibility(View.VISIBLE); return item; diff --git a/tests/src/com/android/emailcommon/mail/AddressUnitTests.java b/tests/src/com/android/emailcommon/mail/AddressUnitTests.java index 276c61823..f9b8c945c 100644 --- a/tests/src/com/android/emailcommon/mail/AddressUnitTests.java +++ b/tests/src/com/android/emailcommon/mail/AddressUnitTests.java @@ -16,14 +16,12 @@ package com.android.emailcommon.mail; -import com.android.emailcommon.mail.Address; - import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.SmallTest; import org.apache.james.mime4j.decoder.DecoderUtil; -import java.net.URLEncoder; import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; /** * This is a series of unit tests for the Address class. These tests must be locally @@ -48,7 +46,8 @@ public class AddressUnitTests extends AndroidTestCase { private static final Address PACK_ADDR_1 = new Address("john@gmail.com", "John Doe"); private static final Address PACK_ADDR_2 = new Address("foo@bar.com", null); - private static final Address PACK_ADDR_3 = new Address("mar.y+test@gmail.com", "Mar-y, B; B*arr"); + private static final Address PACK_ADDR_3 = new Address( + "mar.y+test@gmail.com", "Mar-y, B; B*arr"); private static final Address[][] PACK_CASES = { {PACK_ADDR_2}, {PACK_ADDR_1}, {PACK_ADDR_1, PACK_ADDR_2}, {PACK_ADDR_2, PACK_ADDR_1}, @@ -353,7 +352,8 @@ public class AddressUnitTests extends AndroidTestCase { assertEquals("no name 1", "noname1@dom1.com", addresses[0].toString()); assertEquals("no name 2", "noname2@dom2.com", addresses[1].toString()); assertEquals("simple name", "simple name ", addresses[2].toString()); - assertEquals("double quoted name", "\"name,4\" ", addresses[3].toString()); + assertEquals("double quoted name", + "\"name,4\" ", addresses[3].toString()); assertEquals("quoted name", "\"big \"G\"\" ", addresses[4].toString()); assertEquals("utf-16 name", "\u65E5\u672C\u8A9E ", addresses[5].toString()); @@ -619,13 +619,6 @@ public class AddressUnitTests extends AndroidTestCase { } } - public void testLegacyPackUnpack() { - for (Address[] list : PACK_CASES) { - String packed = legacyPack(list); - assertTrue(packed, addressArrayEquals(list, Address.legacyUnpack(packed))); - } - } - /** * Tests that unpackToString() returns the same result as toString(unpack()). */