commit 57dbf94828d896e09acc0adf4929cc657159975f
author Vikram Aggarwal <viki@google.com> Wed Feb 22 09:10:30 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 22 09:10:30 2012 -0800
tree df6de14fc0ccddeb5d1688e44fc64bd960910c73
parent 679a8cc895ec75d3b578dbc77db1e9c04dd7f8b0
parent cfb012533e9554eda2c0566e9bfba233283f63e2

Merge "Remove unused AccountRecentLabelSpinner"

src/com/android/mail/compose/ComposeActivity.java

diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index 290fd63..aad3903 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -578,10 +578,10 @@
     }
 
     private void setupRecipients(RecipientEditTextView view) {
-        String accountName = mAccount.name;
-        view.setAdapter(new RecipientAdapter(this, accountName));
+        view.setAdapter(new RecipientAdapter(this, mAccount));
         view.setTokenizer(new Rfc822Tokenizer());
         if (mValidator == null) {
+            final String accountName = mAccount.name;
             int offset = accountName.indexOf("@") + 1;
             String account = accountName;
             if (offset > -1) {

src/com/android/mail/compose/RecipientAdapter.java

diff --git a/src/com/android/mail/compose/RecipientAdapter.java b/src/com/android/mail/compose/RecipientAdapter.java
index 0d323d0..8413a3c 100644
--- a/src/com/android/mail/compose/RecipientAdapter.java
+++ b/src/com/android/mail/compose/RecipientAdapter.java
@@ -21,8 +21,8 @@
 import android.content.Context;
 
 public class RecipientAdapter extends BaseRecipientAdapter {
-    public RecipientAdapter(Context context, String account) {
+    public RecipientAdapter(Context context, Account account) {
         super(context);
-        setAccount(new Account(account, "unknown"));
+        setAccount(account);
     }
 }

src/com/android/mail/providers/Account.java

diff --git a/src/com/android/mail/providers/Account.java b/src/com/android/mail/providers/Account.java
index 71c95e4..04f4f70 100644
--- a/src/com/android/mail/providers/Account.java
+++ b/src/com/android/mail/providers/Account.java
@@ -109,26 +109,6 @@
         syncStatus = in.readInt();
     }
 
-    // TODO(pwestbro): remove this constructor.
-    // This constructor should't be necessary.  Any usage of an Account object constructed
-    // this way may have unexpected results.
-    @Deprecated
-    public Account(String address, String type) {
-        super(address, type);
-        providerVersion = -1;
-        accountUri = null;
-        capabilities = 0;
-        folderListUri = null;
-        searchUri = null;
-        accountFromAddressesUri = null;
-        saveDraftUri = null;
-        sendMessageUri = null;
-        expungeMessageUri = null;
-        undoUri = null;
-        settingIntentUri = null;
-        syncStatus = 0;
-    }
-
     public Account(Cursor cursor) {
         super(cursor.getString(UIProvider.ACCOUNT_NAME_COLUMN), "unknown");
         accountFromAddressesUri = cursor.getString(UIProvider.ACCOUNT_FROM_ADDRESSES_URI_COLUMN);