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

Reconnect Settings -> Accounts to Email account settings screen

Browse Source 
* This was broken during the AccountManager naming reversion

Change-Id: Ib2ccc9ca187ffdaf4a978c3c8111808be50d1583
This commit is contained in:
Marc Blank 2009-09-20 14:56:02 -07:00
parent a740e29357
commit 7041dc5d1b
1 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/email/activity/setup/AccountSettings.java
View File

@ -24,7 +24,6 @@ import com.android.email.mail.Store;
import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Account;
import com.android.email.provider.EmailContent.AccountColumns; import com.android.email.provider.EmailContent.AccountColumns;
import com.android.email.provider.EmailContent.HostAuth; import com.android.email.provider.EmailContent.HostAuth;
import com.android.email.provider.EmailContent.HostAuthColumns;
import com.android.exchange.Eas; import com.android.exchange.Eas;
import android.app.Activity; import android.app.Activity;
@ -265,29 +264,13 @@ public class AccountSettings extends PreferenceActivity {
android.accounts.Account acct = android.accounts.Account acct =
(android.accounts.Account)getIntent() (android.accounts.Account)getIntent()
.getParcelableExtra(ACCOUNT_MANAGER_EXTRA_ACCOUNT); .getParcelableExtra(ACCOUNT_MANAGER_EXTRA_ACCOUNT);
// Find a HostAuth using eas and whose login is the name of the AccountManager account // Find a HostAuth using eas and whose login is klthe name of the AccountManager account
Cursor c = getContentResolver().query(HostAuth.CONTENT_URI, Cursor c = getContentResolver().query(Account.CONTENT_URI,
new String[] {HostAuthColumns.ID}, HostAuth.LOGIN + "=? AND " new String[] {AccountColumns.ID}, AccountColumns.EMAIL_ADDRESS + "=?",
+ HostAuthColumns.PROTOCOL + "=?", new String[] {acct.name}, null);
new String[] {acct.name, "eas"}, null);
try { try {
if (c.moveToFirst()) { if (c.moveToFirst()) {
// This gives us the HostAuth's id mAccountId = c.getLong(0);
String hostAuthId = c.getString(0);
// Now, find the EmailProvider Account for this HostAuth
Cursor ac = getContentResolver().query(Account.CONTENT_URI,
new String[] {AccountColumns.ID},
AccountColumns.HOST_AUTH_KEY_RECV + "=? OR "
+ AccountColumns.HOST_AUTH_KEY_SEND + "=?",
new String[] {hostAuthId, hostAuthId}, null);
try {
// And if we find one, set mAccountId accordingly
if (ac.moveToFirst()) {
mAccountId = ac.getLong(0);
}
} finally {
ac.close();
}
} }
} finally { } finally {
c.close(); c.close();