commit 9c66b0f10a4a21faf73fa9d3696f527c7bbff0f2
author Makoto Onuki <omakoto@google.com> Thu Feb 04 14:42:17 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 04 14:42:17 2010 -0800
tree 5952ebe0a02a55d20adc802194ba8f460f780261
parent 704cb199ced39727d84103c7170fc888a54f6c97
parent a6a18dde1af5d121c13df8ed18c5f0d2f95ef998

Merge "Remove exchange readme and update script"

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 154deee..3a50a47 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -545,7 +545,13 @@
     <!-- On settings screen, sync contacts check box label -->
     <string name="account_settings_sync_contacts_enable">Sync contacts</string>
     <!-- On settings screen, sync contacts summary text -->
-    <string name="account_settings_sync_contacts_summary">Also sync contacts from this account</string>
+    <string name="account_settings_sync_contacts_summary">Also sync contacts from this account
+        </string>
+    <!-- On settings screen, sync calendar check box label -->
+        <string name="account_settings_sync_calendar_enable">Sync calendar</string>
+    <!-- On settings screen, sync calendar summary text -->
+    <string name="account_settings_sync_calendar_summary">Also sync calendar from this account
+        </string>
 
     <!-- On Settings screen, setting check box label -->
     <string name="account_settings_vibrate_enable">Vibrate</string>

src/com/android/exchange/EasSyncService.java

diff --git a/src/com/android/exchange/EasSyncService.java b/src/com/android/exchange/EasSyncService.java
index 544a82f..b9241b9 100644
--- a/src/com/android/exchange/EasSyncService.java
+++ b/src/com/android/exchange/EasSyncService.java
@@ -234,7 +234,9 @@
             svc.mPassword = password;
             svc.mSsl = ssl;
             svc.mTrustSsl = trustCertificates;
-            svc.mDeviceId = SyncManager.getDeviceId();
+            // We mustn't use the "real" device id or we'll screw up current accounts
+            // Any string will do, but we'll go for "validate"
+            svc.mDeviceId = "validate";
             HttpResponse resp = svc.sendHttpClientOptions();
             int code = resp.getStatusLine().getStatusCode();
             userLog("Validation (OPTIONS) response: " + code);

src/com/android/exchange/SyncManager.java

diff --git a/src/com/android/exchange/SyncManager.java b/src/com/android/exchange/SyncManager.java
index 58f976d..2a1e10b 100644
--- a/src/com/android/exchange/SyncManager.java
+++ b/src/com/android/exchange/SyncManager.java
@@ -768,7 +768,7 @@
                 return id;
             } else if (f.createNewFile()) {
                 BufferedWriter w = new BufferedWriter(new FileWriter(f), 128);
-                id = "droid" + System.currentTimeMillis();
+                id = "android" + System.currentTimeMillis();
                 w.write(id);
                 w.close();
                 sDeviceId = id;