Notify by mailbox, rather than account

* Update EmailProvider, removing two no-longer-used columns in Account and
  Mailbox

Change-Id: Ie0f10eb0ca315d73e82be968f7760a51a239ba3f

3 files changed, 26 insertions, 29 deletions

diff --git a/tests/src/com/android/email/NotificationControllerTest.java b/tests/src/com/android/email/NotificationControllerTest.java
index ea5169fe3..0936eac38 100644
--- a/tests/src/com/android/email/NotificationControllerTest.java
+++ b/tests/src/com/android/email/NotificationControllerTest.java
@@ -213,7 +213,7 @@ public class NotificationControllerTest extends AndroidTestCase {
         Mailbox b1 = ProviderTestUtils.setupMailbox("inbox", a1.mId, true, c, Mailbox.TYPE_INBOX);
         Message m1 = ProviderTestUtils.setupMessage("message", a1.mId, b1.mId, true, true, c);
 
-        n = mTarget.createNewMessageNotification(a1.mId, b1.mId, m1.mId, 1, 1);
+        n = mTarget.createNewMessageNotification(b1.mId, m1.mId, 1, 1);
 
         assertEquals(R.drawable.stat_notify_email_generic, n.icon);
         assertEquals(mMockClock.mTime, n.when);
@@ -223,7 +223,7 @@ public class NotificationControllerTest extends AndroidTestCase {
         // TODO Check content -- how?
 
         // Case 2: 1 account, 2 unseen message
-        n = mTarget.createNewMessageNotification(a1.mId, b1.mId, m1.mId, 2, 2);
+        n = mTarget.createNewMessageNotification(b1.mId, m1.mId, 2, 2);
 
         assertEquals(R.drawable.stat_notify_email_generic, n.icon);
         assertEquals(mMockClock.mTime, n.when);
@@ -247,7 +247,7 @@ public class NotificationControllerTest extends AndroidTestCase {
         m1.save(c);
 
         // This shouldn't crash.
-        n = mTarget.createNewMessageNotification(a1.mId, b1.mId, m1.mId, 1, 1);
+        n = mTarget.createNewMessageNotification(b1.mId, m1.mId, 1, 1);
 
         // Minimum test for the result
         assertEquals(R.drawable.stat_notify_email_generic, n.icon);
diff --git a/tests/src/com/android/emailcommon/provider/MailboxTests.java b/tests/src/com/android/emailcommon/provider/MailboxTests.java
index 9d9825c0e..8ab2a3392 100644
--- a/tests/src/com/android/emailcommon/provider/MailboxTests.java
+++ b/tests/src/com/android/emailcommon/provider/MailboxTests.java
@@ -16,14 +16,6 @@
 
 package com.android.emailcommon.provider;
 
-import com.android.email.provider.ContentCache;
-import com.android.email.provider.EmailProvider;
-import com.android.email.provider.ProviderTestUtils;
-import com.android.emailcommon.provider.EmailContent.MailboxColumns;
-import com.android.emailcommon.provider.EmailContent.Message;
-import com.android.emailcommon.provider.EmailContent.MessageColumns;
-import com.android.emailcommon.utility.Utility;
-
 import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Context;
@@ -33,6 +25,14 @@ import android.test.MoreAsserts;
 import android.test.ProviderTestCase2;
 import android.test.suitebuilder.annotation.SmallTest;
 
+import com.android.email.provider.ContentCache;
+import com.android.email.provider.EmailProvider;
+import com.android.email.provider.ProviderTestUtils;
+import com.android.emailcommon.provider.EmailContent.MailboxColumns;
+import com.android.emailcommon.provider.EmailContent.Message;
+import com.android.emailcommon.provider.EmailContent.MessageColumns;
+import com.android.emailcommon.utility.Utility;
+
 import java.util.Arrays;
 
 /**
@@ -520,7 +520,6 @@ public class MailboxTests extends ProviderTestCase2<EmailProvider> {
         testMailbox.mSyncTime = 6L;
         testMailbox.mType = 7;
         testMailbox.mVisibleLimit = 8;
-        testMailbox.mLastSeenMessageKey = 9L;
         testMailbox.mLastTouchedTime = 10L;
 
         return testMailbox;
diff --git a/tests/src/com/android/emailcommon/utility/UtilityUnitTests.java b/tests/src/com/android/emailcommon/utility/UtilityUnitTests.java
index 171ace1a9..a7c60ddf5 100644
--- a/tests/src/com/android/emailcommon/utility/UtilityUnitTests.java
+++ b/tests/src/com/android/emailcommon/utility/UtilityUnitTests.java
@@ -16,22 +16,10 @@
 
 package com.android.emailcommon.utility;
 
-import com.android.email.DBTestHelper;
-import com.android.email.R;
-import com.android.email.TestUtils;
-import com.android.email.provider.ProviderTestUtils;
-import com.android.emailcommon.provider.Account;
-import com.android.emailcommon.provider.EmailContent.Attachment;
-import com.android.emailcommon.provider.EmailContent.MailboxColumns;
-import com.android.emailcommon.provider.EmailContent.Message;
-import com.android.emailcommon.provider.Mailbox;
-import com.android.emailcommon.utility.Utility.NewFileCreator;
-
 import android.content.Context;
 import android.database.Cursor;
 import android.database.CursorWrapper;
 import android.database.MatrixCursor;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Environment;
 import android.test.AndroidTestCase;
@@ -41,6 +29,16 @@ import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.widget.TextView;
 
+import com.android.email.DBTestHelper;
+import com.android.email.TestUtils;
+import com.android.email.provider.ProviderTestUtils;
+import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.EmailContent.Attachment;
+import com.android.emailcommon.provider.EmailContent.MailboxColumns;
+import com.android.emailcommon.provider.EmailContent.Message;
+import com.android.emailcommon.provider.Mailbox;
+import com.android.emailcommon.utility.Utility.NewFileCreator;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -310,7 +308,7 @@ public class UtilityUnitTests extends AndroidTestCase {
 
     private long getLastUpdateKey(Context mockContext, long mailboxId) {
         return Utility.getFirstRowLong(mockContext, Mailbox.CONTENT_URI,
-                new String[] { MailboxColumns.LAST_SEEN_MESSAGE_KEY }, MailboxColumns.ID + "=?",
+                new String[] { MailboxColumns.LAST_NOTIFIED_MESSAGE_KEY }, MailboxColumns.ID + "=?",
                 new String[] { Long.toString(mailboxId) }, null, 0, -1L);
     }
 
@@ -381,7 +379,7 @@ public class UtilityUnitTests extends AndroidTestCase {
         assertEquals(0L, getLastUpdateKey(mockContext, mailbox4_1.mId));
 
         // Test account; only INBOX is modified
-        Utility.updateLastSeenMessageKey(mockContext, account1.mId).get();
+        Utility.updateLastNotifiedMessageKey(mockContext, account1.mId).get();
         assertEquals(message1_1_3.mId, getLastUpdateKey(mockContext, mailbox1_1.mId));
         assertEquals(0L, getLastUpdateKey(mockContext, mailbox1_2.mId));
         assertEquals(0L, getLastUpdateKey(mockContext, mailbox1_3.mId));
@@ -393,7 +391,7 @@ public class UtilityUnitTests extends AndroidTestCase {
         assertEquals(0L, getLastUpdateKey(mockContext, mailbox4_1.mId));
 
         // Missing INBOX
-        Utility.updateLastSeenMessageKey(mockContext, account2.mId).get();
+        Utility.updateLastNotifiedMessageKey(mockContext, account2.mId).get();
         assertEquals(message1_1_3.mId, getLastUpdateKey(mockContext, mailbox1_1.mId));
         assertEquals(0L, getLastUpdateKey(mockContext, mailbox1_2.mId));
         assertEquals(0L, getLastUpdateKey(mockContext, mailbox1_3.mId));
@@ -405,7 +403,7 @@ public class UtilityUnitTests extends AndroidTestCase {
         assertEquals(0L, getLastUpdateKey(mockContext, mailbox4_1.mId));
 
         // No messages in mailbox
-        Utility.updateLastSeenMessageKey(mockContext, account3.mId).get();
+        Utility.updateLastNotifiedMessageKey(mockContext, account3.mId).get();
         assertEquals(message1_1_3.mId, getLastUpdateKey(mockContext, mailbox1_1.mId));
         assertEquals(0L, getLastUpdateKey(mockContext, mailbox1_2.mId));
         assertEquals(0L, getLastUpdateKey(mockContext, mailbox1_3.mId));
@@ -417,7 +415,7 @@ public class UtilityUnitTests extends AndroidTestCase {
         assertEquals(0L, getLastUpdateKey(mockContext, mailbox4_1.mId));
 
         // Test combined accounts
-        Utility.updateLastSeenMessageKey(mockContext, 0x1000000000000000L).get();
+        Utility.updateLastNotifiedMessageKey(mockContext, 0x1000000000000000L).get();
         assertEquals(message1_1_3.mId, getLastUpdateKey(mockContext, mailbox1_1.mId));
         assertEquals(0L, getLastUpdateKey(mockContext, mailbox1_2.mId));
         assertEquals(0L, getLastUpdateKey(mockContext, mailbox1_3.mId));