Merge change 23579 into eclair
* changes:
Bulk change of columns, LAST TIME.
diff --git a/src/com/android/exchange/EmailSyncAlarmReceiver.java b/src/com/android/exchange/EmailSyncAlarmReceiver.java
index b199e21..5addf3f 100644
--- a/src/com/android/exchange/EmailSyncAlarmReceiver.java
+++ b/src/com/android/exchange/EmailSyncAlarmReceiver.java
@@ -19,7 +19,6 @@
import com.android.email.provider.EmailContent.Message;
import com.android.email.provider.EmailContent.MessageColumns;
-import com.android.email.provider.EmailContent.SyncColumns;
import android.content.BroadcastReceiver;
import android.content.ContentResolver;
@@ -47,7 +46,7 @@
*
*/
public class EmailSyncAlarmReceiver extends BroadcastReceiver {
- final String[] MAILBOX_DATA_PROJECTION = {MessageColumns.MAILBOX_KEY, SyncColumns.DATA};
+ final String[] MAILBOX_DATA_PROJECTION = {MessageColumns.MAILBOX_KEY};
private static String TAG = "EmailSyncAlarm";
@Override
diff --git a/src/com/android/exchange/SyncManager.java b/src/com/android/exchange/SyncManager.java
index fe47912..b7c9594 100644
--- a/src/com/android/exchange/SyncManager.java
+++ b/src/com/android/exchange/SyncManager.java
@@ -496,13 +496,10 @@
}
class SyncedMessageObserver extends ContentObserver {
- long maxChangedId = 0;
- long maxDeletedId = 0;
Intent syncAlarmIntent = new Intent(INSTANCE, EmailSyncAlarmReceiver.class);
PendingIntent syncAlarmPendingIntent =
PendingIntent.getBroadcast(INSTANCE, 0, syncAlarmIntent, 0);
AlarmManager alarmManager = (AlarmManager)INSTANCE.getSystemService(Context.ALARM_SERVICE);
- final String[] MAILBOX_DATA_PROJECTION = {MessageColumns.MAILBOX_KEY, SyncColumns.DATA};
public SyncedMessageObserver(Handler handler) {
super(handler);
diff --git a/src/com/android/exchange/adapter/EmailSyncAdapter.java b/src/com/android/exchange/adapter/EmailSyncAdapter.java
index 18324ff..9b32248 100644
--- a/src/com/android/exchange/adapter/EmailSyncAdapter.java
+++ b/src/com/android/exchange/adapter/EmailSyncAdapter.java
@@ -161,7 +161,6 @@
case Tags.EMAIL_BODY:
String text = getValue();
msg.mText = text;
- msg.mTextInfo = "X;X;8;" + text.length(); // location;encoding;charset;size
break;
default:
skipTag();
@@ -191,9 +190,6 @@
skipTag();
}
}
-
- // Tell the provider that this is synced back
- msg.mServerVersion = mMailbox.mSyncKey;
emails.add(msg);
}
@@ -228,12 +224,9 @@
}
}
// We always ask for TEXT or HTML; there's no third option
- String info = "X;X;8;" + body.length();
if (bodyType.equals(Eas.BODY_PREFERENCE_HTML)) {
- msg.mHtmlInfo = info;
msg.mHtml = body;
} else {
- msg.mTextInfo = info;
msg.mText = body;
}
}
@@ -419,11 +412,11 @@
}
@Override
- public void responsesParser() throws IOException {
+ public void responsesParser() {
}
@Override
- public void commit() throws IOException {
+ public void commit() {
int notifyCount = 0;
// Use a batch operation to handle the changes
diff --git a/tests/src/com/android/exchange/TagsTests.java b/tests/src/com/android/exchange/TagsTests.java
index acfee2a..1a87c5c 100644
--- a/tests/src/com/android/exchange/TagsTests.java
+++ b/tests/src/com/android/exchange/TagsTests.java
@@ -25,12 +25,13 @@
public class TagsTests extends AndroidTestCase {
// Make sure there are no duplicates in the tags table
- public void testNoDuplicates() {
+ // This test is no longer required - tags can be duplicated
+ public void disable_testNoDuplicates() {
String[][] allTags = Tags.pages;
HashMap<String, Boolean> map = new HashMap<String, Boolean>();
for (String[] page: allTags) {
for (String tag: page) {
- assertTrue(!map.containsKey(tag));
+ assertTrue(tag, !map.containsKey(tag));
map.put(tag, true);
}
}
