Ensure protocol version always set in sync services DO NOT MERGE
* A recent change caused an issue in which protocolVersion could
be null, resulting in an NPE
* Ensure that protocolVersion is always set to a valid version,
defaulting to 2.5
Change-Id: Ifba6c8089fdbd93dffe38ab9895cfd3e994e29d0
Bug: 2353859
diff --git a/src/com/android/exchange/EasSyncService.java b/src/com/android/exchange/EasSyncService.java
index 9ac3257..bba2ddf 100644
--- a/src/com/android/exchange/EasSyncService.java
+++ b/src/com/android/exchange/EasSyncService.java
@@ -91,6 +91,9 @@
static private final String PING_COMMAND = "Ping";
static private final int COMMAND_TIMEOUT = 20*SECONDS;
+ // Define our default protocol version as 2.5 (Exchange 2003)
+ static private final String DEFAULT_PROTOCOL_VERSION = "2.5";
+
/**
* We start with an 8 minute timeout, and increase/decrease by 3 minutes at a time. There's
* no point having a timeout shorter than 5 minutes, I think; at that point, we can just let
@@ -119,7 +122,7 @@
static private final int PING_FALLBACK_PIM = 25;
// Reasonable default
- String mProtocolVersion = "2.5";
+ public String mProtocolVersion = DEFAULT_PROTOCOL_VERSION;
public Double mProtocolVersionDouble;
protected String mDeviceId = null;
private String mDeviceType = "Android";
@@ -515,6 +518,8 @@
* @throws EasParserException
*/
public void runAccountMailbox() throws IOException, EasParserException {
+ // We'll reuse this ContentValues object
+ ContentValues cv = new ContentValues();
// Initialize exit status to success
mExitStatus = EmailServiceStatus.SUCCESS;
try {
@@ -528,7 +533,7 @@
if (mAccount.mSyncKey == null) {
mAccount.mSyncKey = "0";
userLog("Account syncKey INIT to 0");
- ContentValues cv = new ContentValues();
+ cv.clear();
cv.put(AccountColumns.SYNC_KEY, mAccount.mSyncKey);
mAccount.update(mContext, cv);
}
@@ -539,7 +544,7 @@
}
// When we first start up, change all mailboxes to push.
- ContentValues cv = new ContentValues();
+ cv.clear();
cv.put(Mailbox.SYNC_INTERVAL, Mailbox.CHECK_INTERVAL_PUSH);
if (mContentResolver.update(Mailbox.CONTENT_URI, cv,
WHERE_ACCOUNT_AND_SYNC_INTERVAL_PING,
@@ -547,7 +552,7 @@
SyncManager.kick("change ping boxes to push");
}
- // Determine our protocol version, if we haven't already
+ // Determine our protocol version, if we haven't already and save it in the Account
if (mAccount.mProtocolVersion == null) {
userLog("Determine EAS protocol version");
HttpResponse resp = sendHttpClientOptions();
@@ -564,6 +569,10 @@
}
mProtocolVersionDouble = Double.parseDouble(mProtocolVersion);
mAccount.mProtocolVersion = mProtocolVersion;
+ // Save the protocol version
+ cv.clear();
+ cv.put(Account.PROTOCOL_VERSION, mProtocolVersion);
+ mAccount.update(mContext, cv);
userLog(versions);
userLog("Using version ", mProtocolVersion);
} else {
@@ -578,7 +587,7 @@
// Change all pushable boxes to push when we start the account mailbox
if (mAccount.mSyncInterval == Account.CHECK_INTERVAL_PUSH) {
- cv = new ContentValues();
+ cv.clear();
cv.put(Mailbox.SYNC_INTERVAL, Mailbox.CHECK_INTERVAL_PUSH);
if (mContentResolver.update(Mailbox.CONTENT_URI, cv,
SyncManager.WHERE_IN_ACCOUNT_AND_PUSHABLE,
@@ -613,7 +622,7 @@
}
// Change all push/hold boxes to push
- cv = new ContentValues();
+ cv.clear();
cv.put(Mailbox.SYNC_INTERVAL, Account.CHECK_INTERVAL_PUSH);
if (mContentResolver.update(Mailbox.CONTENT_URI, cv,
WHERE_PUSH_HOLD_NOT_ACCOUNT_MAILBOX,
@@ -1090,11 +1099,13 @@
mUserName = ha.mLogin;
mPassword = ha.mPassword;
- // Set up our protocol version
+ // Set up our protocol version from the Account
mProtocolVersion = mAccount.mProtocolVersion;
- if (mProtocolVersion != null) {
- mProtocolVersionDouble = Double.parseDouble(mProtocolVersion);
+ // If it hasn't been set up, start with default version
+ if (mProtocolVersion == null) {
+ mProtocolVersion = DEFAULT_PROTOCOL_VERSION;
}
+ mProtocolVersionDouble = Double.parseDouble(mProtocolVersion);
return true;
}
