ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 34aae3cb: Merge "Fix getAllAmAccounts() returning duplicated accounts" into ub-gmail-ur14-dev

Browse Source 
* commit '34aae3cbc41deadd927b5d6cdbff33bfd0c22758':
  Fix `getAllAmAccounts()` returning duplicated accounts
This commit is contained in:
Régis Décamps 2014-08-07 08:53:14 +00:00 committed by Android Git Automerger
commit 191937b69d
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/com/android/email/provider/AccountReconciler.java
View File

@ -31,13 +31,9 @@ import android.text.TextUtils;
import com.android.email.NotificationController; import com.android.email.NotificationController;
import com.android.email.R; import com.android.email.R;
import com.android.email.activity.ComposeActivityEmail;
import com.android.email.service.EasAuthenticatorService;
import com.android.email.service.EasAuthenticatorServiceAlternate;
import com.android.email.service.EmailServiceUtils; import com.android.email.service.EmailServiceUtils;
import com.android.email.service.EmailServiceUtils.EmailServiceInfo; import com.android.email.service.EmailServiceUtils.EmailServiceInfo;
import com.android.emailcommon.Logging; import com.android.emailcommon.Logging;
import com.android.emailcommon.VendorPolicyLoader;
import com.android.emailcommon.provider.Account; import com.android.emailcommon.provider.Account;
import com.android.emailcommon.provider.HostAuth; import com.android.emailcommon.provider.HostAuth;
import com.android.mail.utils.LogUtils; import com.android.mail.utils.LogUtils;
@ -46,6 +42,7 @@ import com.google.common.collect.ImmutableList;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
public class AccountReconciler { public class AccountReconciler {
@ -56,14 +53,19 @@ public class AccountReconciler {
*/ */
private static List<android.accounts.Account> getAllAmAccounts(final Context context) { private static List<android.accounts.Account> getAllAmAccounts(final Context context) {
final AccountManager am = AccountManager.get(context); final AccountManager am = AccountManager.get(context);
final ImmutableList.Builder<android.accounts.Account> builder = ImmutableList.builder();
// TODO: Consider getting the types programmatically, in case we add more types. // TODO: Consider getting the types programmatically, in case we add more types.
builder.addAll(Arrays.asList(am.getAccountsByType( // Some Accounts types can be identical, the set de-duplicates.
context.getString(R.string.account_manager_type_legacy_imap)))); final LinkedHashSet<String> accountTypes = new LinkedHashSet<String>();
builder.addAll(Arrays.asList(am.getAccountsByType( accountTypes.add(context.getString(R.string.account_manager_type_legacy_imap));
context.getString(R.string.account_manager_type_pop3)))); accountTypes.add(context.getString(R.string.account_manager_type_pop3));
builder.addAll(Arrays.asList(am.getAccountsByType( accountTypes.add(context.getString(R.string.account_manager_type_exchange));
context.getString(R.string.account_manager_type_exchange))));
final ImmutableList.Builder<android.accounts.Account> builder = ImmutableList.builder();
for (final String type : accountTypes) {
final android.accounts.Account[] accounts = am.getAccountsByType(type);
builder.add(accounts);
}
return builder.build(); return builder.build();
} }