Subtle rebase conflicts...

This commit is contained in:
Moxie Marlinspike
2013-11-18 15:29:19 -08:00
parent f10d6a7b0b
commit fde8d32848
7 changed files with 23 additions and 62 deletions

View File

@@ -237,11 +237,6 @@ public class MmsDatabase extends Database implements MmsSmsColumns {
notifyConversationListeners(getThreadIdForMessage(messageId));
}
public void markAsSending(long messageId) {
updateMailboxBitmask(messageId, Types.BASE_TYPE_MASK, Types.BASE_SENDING_TYPE);
notifyConversationListeners(getThreadIdForMessage(messageId));
}
public void markAsSent(long messageId, byte[] mmsId, long status) {
SQLiteDatabase database = databaseHelper.getWritableDatabase();
ContentValues contentValues = new ContentValues();