2012-10-01 04:56:29 +02:00
|
|
|
/**
|
2011-12-20 19:20:44 +01:00
|
|
|
* Copyright (C) 2011 Whisper Systems
|
2012-10-01 04:56:29 +02:00
|
|
|
*
|
2011-12-20 19:20:44 +01:00
|
|
|
* This program is free software: you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
2012-10-01 04:56:29 +02:00
|
|
|
*
|
2011-12-20 19:20:44 +01:00
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
*/
|
|
|
|
|
package org.thoughtcrime.securesms.database;
|
|
|
|
|
|
|
|
|
|
import android.content.Context;
|
|
|
|
|
import android.database.Cursor;
|
|
|
|
|
import android.database.sqlite.SQLiteDatabase;
|
|
|
|
|
import android.database.sqlite.SQLiteOpenHelper;
|
|
|
|
|
import android.database.sqlite.SQLiteQueryBuilder;
|
|
|
|
|
import android.util.Log;
|
|
|
|
|
|
Major storage layer refactoring to set the stage for clean GCM.
1) We now try to hand out cursors at a minimum. There has always been
a fairly clean insertion layer that handles encrypting message bodies,
but the process of decrypting message bodies has always been less than
ideal. Here we introduce a "Reader" interface that will decrypt message
bodies when appropriate and return objects that encapsulate record state.
No more MessageDisplayHelper. The MmsSmsDatabase interface is also more
sane.
2) We finally rid ourselves of the technical debt associated with TextSecure's
initial usage of the default SMS DB. In that world, we weren't able to use
anything other than the default "Inbox, Outbox, Sent" types to describe a
message, and had to overload the message content itself with a set of
local "prefixes" to describe what it was (encrypted, asymetric encrypted,
remote encrypted, a key exchange, procssed key exchange), and so on.
This includes a major schema update that transforms the "type" field into
a bitmask that describes everything that used to be encoded in a prefix,
and prefixes have been completely eliminated from the system.
No more Prefix.java
3) Refactoring of the MultipartMessageHandler code. It's less of a mess, and
hopefully more clear as to what's going on.
The next step is to remove what we can from SmsTransportDetails and genericize
that interface for a GCM equivalent.
2013-04-20 21:22:04 +02:00
|
|
|
import org.thoughtcrime.securesms.crypto.MasterSecret;
|
|
|
|
|
import org.thoughtcrime.securesms.database.model.MessageRecord;
|
|
|
|
|
|
2012-10-01 04:56:29 +02:00
|
|
|
import java.util.HashSet;
|
|
|
|
|
import java.util.Set;
|
|
|
|
|
|
2011-12-20 19:20:44 +01:00
|
|
|
public class MmsSmsDatabase extends Database {
|
2012-10-01 04:56:29 +02:00
|
|
|
|
2012-10-30 00:51:42 +01:00
|
|
|
public static final String TRANSPORT = "transport_type";
|
|
|
|
|
public static final String GROUP_SIZE = "group_size";
|
|
|
|
|
public static final String SMS_GROUP_SENT_COUNT = "sms_group_sent_count";
|
|
|
|
|
public static final String SMS_GROUP_SEND_FAILED_COUNT = "sms_group_sent_failed_count";
|
|
|
|
|
public static final String MMS_GROUP_SENT_COUNT = "mms_group_sent_count";
|
|
|
|
|
public static final String MMS_GROUP_SEND_FAILED_COUNT = "mms_group_sent_failed_count";
|
2011-12-20 19:20:44 +01:00
|
|
|
|
Major storage layer refactoring to set the stage for clean GCM.
1) We now try to hand out cursors at a minimum. There has always been
a fairly clean insertion layer that handles encrypting message bodies,
but the process of decrypting message bodies has always been less than
ideal. Here we introduce a "Reader" interface that will decrypt message
bodies when appropriate and return objects that encapsulate record state.
No more MessageDisplayHelper. The MmsSmsDatabase interface is also more
sane.
2) We finally rid ourselves of the technical debt associated with TextSecure's
initial usage of the default SMS DB. In that world, we weren't able to use
anything other than the default "Inbox, Outbox, Sent" types to describe a
message, and had to overload the message content itself with a set of
local "prefixes" to describe what it was (encrypted, asymetric encrypted,
remote encrypted, a key exchange, procssed key exchange), and so on.
This includes a major schema update that transforms the "type" field into
a bitmask that describes everything that used to be encoded in a prefix,
and prefixes have been completely eliminated from the system.
No more Prefix.java
3) Refactoring of the MultipartMessageHandler code. It's less of a mess, and
hopefully more clear as to what's going on.
The next step is to remove what we can from SmsTransportDetails and genericize
that interface for a GCM equivalent.
2013-04-20 21:22:04 +02:00
|
|
|
public static final String MMS_TRANSPORT = "mms";
|
|
|
|
|
public static final String SMS_TRANSPORT = "sms";
|
2013-01-06 22:13:14 +01:00
|
|
|
|
2011-12-20 19:20:44 +01:00
|
|
|
public MmsSmsDatabase(Context context, SQLiteOpenHelper databaseHelper) {
|
|
|
|
|
super(context, databaseHelper);
|
|
|
|
|
}
|
2012-10-01 04:56:29 +02:00
|
|
|
|
2012-10-30 00:51:42 +01:00
|
|
|
public Cursor getCollatedGroupConversation(long threadId) {
|
Major storage layer refactoring to set the stage for clean GCM.
1) We now try to hand out cursors at a minimum. There has always been
a fairly clean insertion layer that handles encrypting message bodies,
but the process of decrypting message bodies has always been less than
ideal. Here we introduce a "Reader" interface that will decrypt message
bodies when appropriate and return objects that encapsulate record state.
No more MessageDisplayHelper. The MmsSmsDatabase interface is also more
sane.
2) We finally rid ourselves of the technical debt associated with TextSecure's
initial usage of the default SMS DB. In that world, we weren't able to use
anything other than the default "Inbox, Outbox, Sent" types to describe a
message, and had to overload the message content itself with a set of
local "prefixes" to describe what it was (encrypted, asymetric encrypted,
remote encrypted, a key exchange, procssed key exchange), and so on.
This includes a major schema update that transforms the "type" field into
a bitmask that describes everything that used to be encoded in a prefix,
and prefixes have been completely eliminated from the system.
No more Prefix.java
3) Refactoring of the MultipartMessageHandler code. It's less of a mess, and
hopefully more clear as to what's going on.
The next step is to remove what we can from SmsTransportDetails and genericize
that interface for a GCM equivalent.
2013-04-20 21:22:04 +02:00
|
|
|
String smsCaseSecurity = "CASE " + SmsDatabase.TYPE + " & " + SmsDatabase.Types.SECURE_MESSAGE_BIT + " " +
|
|
|
|
|
"WHEN " + SmsDatabase.Types.SECURE_MESSAGE_BIT + " THEN 1 " +
|
2012-10-30 00:51:42 +01:00
|
|
|
"ELSE 0 END";
|
|
|
|
|
|
Major storage layer refactoring to set the stage for clean GCM.
1) We now try to hand out cursors at a minimum. There has always been
a fairly clean insertion layer that handles encrypting message bodies,
but the process of decrypting message bodies has always been less than
ideal. Here we introduce a "Reader" interface that will decrypt message
bodies when appropriate and return objects that encapsulate record state.
No more MessageDisplayHelper. The MmsSmsDatabase interface is also more
sane.
2) We finally rid ourselves of the technical debt associated with TextSecure's
initial usage of the default SMS DB. In that world, we weren't able to use
anything other than the default "Inbox, Outbox, Sent" types to describe a
message, and had to overload the message content itself with a set of
local "prefixes" to describe what it was (encrypted, asymetric encrypted,
remote encrypted, a key exchange, procssed key exchange), and so on.
This includes a major schema update that transforms the "type" field into
a bitmask that describes everything that used to be encoded in a prefix,
and prefixes have been completely eliminated from the system.
No more Prefix.java
3) Refactoring of the MultipartMessageHandler code. It's less of a mess, and
hopefully more clear as to what's going on.
The next step is to remove what we can from SmsTransportDetails and genericize
that interface for a GCM equivalent.
2013-04-20 21:22:04 +02:00
|
|
|
String mmsCaseSecurity = "CASE " + MmsDatabase.MESSAGE_BOX + " & " + SmsDatabase.Types.SECURE_MESSAGE_BIT + " " +
|
|
|
|
|
"WHEN " + MmsDatabase.Types.SECURE_MESSAGE_BIT + " THEN 'secure' " +
|
|
|
|
|
"ELSE 'insecure' END";
|
2012-10-30 00:51:42 +01:00
|
|
|
|
Major storage layer refactoring to set the stage for clean GCM.
1) We now try to hand out cursors at a minimum. There has always been
a fairly clean insertion layer that handles encrypting message bodies,
but the process of decrypting message bodies has always been less than
ideal. Here we introduce a "Reader" interface that will decrypt message
bodies when appropriate and return objects that encapsulate record state.
No more MessageDisplayHelper. The MmsSmsDatabase interface is also more
sane.
2) We finally rid ourselves of the technical debt associated with TextSecure's
initial usage of the default SMS DB. In that world, we weren't able to use
anything other than the default "Inbox, Outbox, Sent" types to describe a
message, and had to overload the message content itself with a set of
local "prefixes" to describe what it was (encrypted, asymetric encrypted,
remote encrypted, a key exchange, procssed key exchange), and so on.
This includes a major schema update that transforms the "type" field into
a bitmask that describes everything that used to be encoded in a prefix,
and prefixes have been completely eliminated from the system.
No more Prefix.java
3) Refactoring of the MultipartMessageHandler code. It's less of a mess, and
hopefully more clear as to what's going on.
The next step is to remove what we can from SmsTransportDetails and genericize
that interface for a GCM equivalent.
2013-04-20 21:22:04 +02:00
|
|
|
String mmsGroupSentCount = "SUM(CASE " + MmsDatabase.MESSAGE_BOX + " & " + MmsDatabase.Types.BASE_TYPE_MASK + " " +
|
|
|
|
|
"WHEN " + MmsDatabase.Types.BASE_SENT_TYPE + " THEN 1 " +
|
2012-10-30 00:51:42 +01:00
|
|
|
"ELSE 0 END)";
|
|
|
|
|
|
Major storage layer refactoring to set the stage for clean GCM.
1) We now try to hand out cursors at a minimum. There has always been
a fairly clean insertion layer that handles encrypting message bodies,
but the process of decrypting message bodies has always been less than
ideal. Here we introduce a "Reader" interface that will decrypt message
bodies when appropriate and return objects that encapsulate record state.
No more MessageDisplayHelper. The MmsSmsDatabase interface is also more
sane.
2) We finally rid ourselves of the technical debt associated with TextSecure's
initial usage of the default SMS DB. In that world, we weren't able to use
anything other than the default "Inbox, Outbox, Sent" types to describe a
message, and had to overload the message content itself with a set of
local "prefixes" to describe what it was (encrypted, asymetric encrypted,
remote encrypted, a key exchange, procssed key exchange), and so on.
This includes a major schema update that transforms the "type" field into
a bitmask that describes everything that used to be encoded in a prefix,
and prefixes have been completely eliminated from the system.
No more Prefix.java
3) Refactoring of the MultipartMessageHandler code. It's less of a mess, and
hopefully more clear as to what's going on.
The next step is to remove what we can from SmsTransportDetails and genericize
that interface for a GCM equivalent.
2013-04-20 21:22:04 +02:00
|
|
|
|
|
|
|
|
String smsGroupSentCount = "SUM(CASE " + SmsDatabase.TYPE + " & " + SmsDatabase.Types.BASE_TYPE_MASK + " " +
|
|
|
|
|
"WHEN " + SmsDatabase.Types.BASE_SENT_TYPE + " THEN 1 " +
|
2012-10-30 00:51:42 +01:00
|
|
|
"ELSE 0 END)";
|
|
|
|
|
|
Major storage layer refactoring to set the stage for clean GCM.
1) We now try to hand out cursors at a minimum. There has always been
a fairly clean insertion layer that handles encrypting message bodies,
but the process of decrypting message bodies has always been less than
ideal. Here we introduce a "Reader" interface that will decrypt message
bodies when appropriate and return objects that encapsulate record state.
No more MessageDisplayHelper. The MmsSmsDatabase interface is also more
sane.
2) We finally rid ourselves of the technical debt associated with TextSecure's
initial usage of the default SMS DB. In that world, we weren't able to use
anything other than the default "Inbox, Outbox, Sent" types to describe a
message, and had to overload the message content itself with a set of
local "prefixes" to describe what it was (encrypted, asymetric encrypted,
remote encrypted, a key exchange, procssed key exchange), and so on.
This includes a major schema update that transforms the "type" field into
a bitmask that describes everything that used to be encoded in a prefix,
and prefixes have been completely eliminated from the system.
No more Prefix.java
3) Refactoring of the MultipartMessageHandler code. It's less of a mess, and
hopefully more clear as to what's going on.
The next step is to remove what we can from SmsTransportDetails and genericize
that interface for a GCM equivalent.
2013-04-20 21:22:04 +02:00
|
|
|
String mmsGroupSentFailedCount = "SUM(CASE " + MmsDatabase.MESSAGE_BOX + " & " + MmsDatabase.Types.BASE_TYPE_MASK + " " +
|
|
|
|
|
"WHEN " + MmsDatabase.Types.BASE_SENT_FAILED_TYPE + " THEN 1 " +
|
2012-10-30 00:51:42 +01:00
|
|
|
"ELSE 0 END)";
|
|
|
|
|
|
Major storage layer refactoring to set the stage for clean GCM.
1) We now try to hand out cursors at a minimum. There has always been
a fairly clean insertion layer that handles encrypting message bodies,
but the process of decrypting message bodies has always been less than
ideal. Here we introduce a "Reader" interface that will decrypt message
bodies when appropriate and return objects that encapsulate record state.
No more MessageDisplayHelper. The MmsSmsDatabase interface is also more
sane.
2) We finally rid ourselves of the technical debt associated with TextSecure's
initial usage of the default SMS DB. In that world, we weren't able to use
anything other than the default "Inbox, Outbox, Sent" types to describe a
message, and had to overload the message content itself with a set of
local "prefixes" to describe what it was (encrypted, asymetric encrypted,
remote encrypted, a key exchange, procssed key exchange), and so on.
This includes a major schema update that transforms the "type" field into
a bitmask that describes everything that used to be encoded in a prefix,
and prefixes have been completely eliminated from the system.
No more Prefix.java
3) Refactoring of the MultipartMessageHandler code. It's less of a mess, and
hopefully more clear as to what's going on.
The next step is to remove what we can from SmsTransportDetails and genericize
that interface for a GCM equivalent.
2013-04-20 21:22:04 +02:00
|
|
|
String smsGroupSentFailedCount = "SUM(CASE " + SmsDatabase.TYPE + " & " + SmsDatabase.Types.BASE_TYPE_MASK + " " +
|
|
|
|
|
"WHEN " + SmsDatabase.Types.BASE_SENT_FAILED_TYPE + " THEN 1 " +
|
2012-10-30 00:51:42 +01:00
|
|
|
"ELSE 0 END)";
|
|
|
|
|
|
Major storage layer refactoring to set the stage for clean GCM.
1) We now try to hand out cursors at a minimum. There has always been
a fairly clean insertion layer that handles encrypting message bodies,
but the process of decrypting message bodies has always been less than
ideal. Here we introduce a "Reader" interface that will decrypt message
bodies when appropriate and return objects that encapsulate record state.
No more MessageDisplayHelper. The MmsSmsDatabase interface is also more
sane.
2) We finally rid ourselves of the technical debt associated with TextSecure's
initial usage of the default SMS DB. In that world, we weren't able to use
anything other than the default "Inbox, Outbox, Sent" types to describe a
message, and had to overload the message content itself with a set of
local "prefixes" to describe what it was (encrypted, asymetric encrypted,
remote encrypted, a key exchange, procssed key exchange), and so on.
This includes a major schema update that transforms the "type" field into
a bitmask that describes everything that used to be encoded in a prefix,
and prefixes have been completely eliminated from the system.
No more Prefix.java
3) Refactoring of the MultipartMessageHandler code. It's less of a mess, and
hopefully more clear as to what's going on.
The next step is to remove what we can from SmsTransportDetails and genericize
that interface for a GCM equivalent.
2013-04-20 21:22:04 +02:00
|
|
|
String[] projection = {MmsSmsColumns.ID, SmsDatabase.BODY, SmsDatabase.TYPE,
|
|
|
|
|
MmsSmsColumns.THREAD_ID,
|
|
|
|
|
SmsDatabase.ADDRESS, SmsDatabase.SUBJECT, SmsDatabase.STATUS,
|
|
|
|
|
MmsSmsColumns.NORMALIZED_DATE_SENT, MmsSmsColumns.NORMALIZED_DATE_RECEIVED,
|
|
|
|
|
MmsDatabase.MESSAGE_TYPE, MmsDatabase.MESSAGE_BOX, TRANSPORT,
|
|
|
|
|
"COUNT(" + MmsSmsColumns.ID + ") AS " + GROUP_SIZE,
|
|
|
|
|
mmsGroupSentCount + " AS " + MMS_GROUP_SENT_COUNT,
|
|
|
|
|
mmsGroupSentFailedCount + " AS " + MMS_GROUP_SEND_FAILED_COUNT,
|
|
|
|
|
smsGroupSentCount + " AS " + SMS_GROUP_SENT_COUNT,
|
|
|
|
|
smsGroupSentFailedCount + " AS " + SMS_GROUP_SEND_FAILED_COUNT,
|
|
|
|
|
smsCaseSecurity + " AS sms_collate", mmsCaseSecurity + " AS mms_collate"};
|
|
|
|
|
|
|
|
|
|
String order = MmsSmsColumns.NORMALIZED_DATE_RECEIVED + " ASC";
|
|
|
|
|
String selection = MmsSmsColumns.THREAD_ID + " = " + threadId;
|
|
|
|
|
String groupBy = MmsSmsColumns.NORMALIZED_DATE_SENT + " / 1000, sms_collate, mms_collate";
|
2012-10-30 00:51:42 +01:00
|
|
|
|
|
|
|
|
Cursor cursor = queryTables(projection, selection, order, groupBy, null);
|
|
|
|
|
setNotifyConverationListeners(cursor, threadId);
|
|
|
|
|
|
|
|
|
|
return cursor;
|
|
|
|
|
}
|
|
|
|
|
|
2011-12-20 19:20:44 +01:00
|
|
|
public Cursor getConversation(long threadId) {
|
Major storage layer refactoring to set the stage for clean GCM.
1) We now try to hand out cursors at a minimum. There has always been
a fairly clean insertion layer that handles encrypting message bodies,
but the process of decrypting message bodies has always been less than
ideal. Here we introduce a "Reader" interface that will decrypt message
bodies when appropriate and return objects that encapsulate record state.
No more MessageDisplayHelper. The MmsSmsDatabase interface is also more
sane.
2) We finally rid ourselves of the technical debt associated with TextSecure's
initial usage of the default SMS DB. In that world, we weren't able to use
anything other than the default "Inbox, Outbox, Sent" types to describe a
message, and had to overload the message content itself with a set of
local "prefixes" to describe what it was (encrypted, asymetric encrypted,
remote encrypted, a key exchange, procssed key exchange), and so on.
This includes a major schema update that transforms the "type" field into
a bitmask that describes everything that used to be encoded in a prefix,
and prefixes have been completely eliminated from the system.
No more Prefix.java
3) Refactoring of the MultipartMessageHandler code. It's less of a mess, and
hopefully more clear as to what's going on.
The next step is to remove what we can from SmsTransportDetails and genericize
that interface for a GCM equivalent.
2013-04-20 21:22:04 +02:00
|
|
|
String[] projection = {MmsSmsColumns.ID, SmsDatabase.BODY, SmsDatabase.TYPE,
|
|
|
|
|
MmsSmsColumns.THREAD_ID,
|
|
|
|
|
SmsDatabase.ADDRESS, SmsDatabase.SUBJECT,
|
|
|
|
|
MmsSmsColumns.NORMALIZED_DATE_SENT,
|
|
|
|
|
MmsSmsColumns.NORMALIZED_DATE_RECEIVED,
|
|
|
|
|
MmsDatabase.MESSAGE_TYPE, MmsDatabase.MESSAGE_BOX,
|
|
|
|
|
SmsDatabase.STATUS, TRANSPORT};
|
|
|
|
|
|
|
|
|
|
String order = MmsSmsColumns.NORMALIZED_DATE_RECEIVED + " ASC";
|
|
|
|
|
|
|
|
|
|
String selection = MmsSmsColumns.THREAD_ID + " = " + threadId;
|
2012-10-01 04:56:29 +02:00
|
|
|
|
2012-10-30 00:51:42 +01:00
|
|
|
Cursor cursor = queryTables(projection, selection, order, null, null);
|
2011-12-20 19:20:44 +01:00
|
|
|
setNotifyConverationListeners(cursor, threadId);
|
|
|
|
|
|
|
|
|
|
return cursor;
|
|
|
|
|
}
|
2012-10-01 04:56:29 +02:00
|
|
|
|
2011-12-20 19:20:44 +01:00
|
|
|
public Cursor getConversationSnippet(long threadId) {
|
Major storage layer refactoring to set the stage for clean GCM.
1) We now try to hand out cursors at a minimum. There has always been
a fairly clean insertion layer that handles encrypting message bodies,
but the process of decrypting message bodies has always been less than
ideal. Here we introduce a "Reader" interface that will decrypt message
bodies when appropriate and return objects that encapsulate record state.
No more MessageDisplayHelper. The MmsSmsDatabase interface is also more
sane.
2) We finally rid ourselves of the technical debt associated with TextSecure's
initial usage of the default SMS DB. In that world, we weren't able to use
anything other than the default "Inbox, Outbox, Sent" types to describe a
message, and had to overload the message content itself with a set of
local "prefixes" to describe what it was (encrypted, asymetric encrypted,
remote encrypted, a key exchange, procssed key exchange), and so on.
This includes a major schema update that transforms the "type" field into
a bitmask that describes everything that used to be encoded in a prefix,
and prefixes have been completely eliminated from the system.
No more Prefix.java
3) Refactoring of the MultipartMessageHandler code. It's less of a mess, and
hopefully more clear as to what's going on.
The next step is to remove what we can from SmsTransportDetails and genericize
that interface for a GCM equivalent.
2013-04-20 21:22:04 +02:00
|
|
|
String[] projection = {MmsSmsColumns.ID, SmsDatabase.BODY, SmsDatabase.TYPE,
|
|
|
|
|
SmsDatabase.ADDRESS, SmsDatabase.SUBJECT,
|
|
|
|
|
MmsSmsColumns.NORMALIZED_DATE_SENT,
|
|
|
|
|
MmsSmsColumns.NORMALIZED_DATE_RECEIVED,
|
|
|
|
|
MmsDatabase.MESSAGE_TYPE, MmsDatabase.MESSAGE_BOX,
|
|
|
|
|
TRANSPORT};
|
|
|
|
|
String order = MmsSmsColumns.NORMALIZED_DATE_RECEIVED + " DESC";
|
|
|
|
|
String selection = MmsSmsColumns.THREAD_ID + " = " + threadId;
|
|
|
|
|
|
|
|
|
|
return queryTables(projection, selection, order, null, "1");
|
2011-12-20 19:20:44 +01:00
|
|
|
}
|
2012-10-01 04:56:29 +02:00
|
|
|
|
2011-12-20 19:20:44 +01:00
|
|
|
public Cursor getUnread() {
|
Major storage layer refactoring to set the stage for clean GCM.
1) We now try to hand out cursors at a minimum. There has always been
a fairly clean insertion layer that handles encrypting message bodies,
but the process of decrypting message bodies has always been less than
ideal. Here we introduce a "Reader" interface that will decrypt message
bodies when appropriate and return objects that encapsulate record state.
No more MessageDisplayHelper. The MmsSmsDatabase interface is also more
sane.
2) We finally rid ourselves of the technical debt associated with TextSecure's
initial usage of the default SMS DB. In that world, we weren't able to use
anything other than the default "Inbox, Outbox, Sent" types to describe a
message, and had to overload the message content itself with a set of
local "prefixes" to describe what it was (encrypted, asymetric encrypted,
remote encrypted, a key exchange, procssed key exchange), and so on.
This includes a major schema update that transforms the "type" field into
a bitmask that describes everything that used to be encoded in a prefix,
and prefixes have been completely eliminated from the system.
No more Prefix.java
3) Refactoring of the MultipartMessageHandler code. It's less of a mess, and
hopefully more clear as to what's going on.
The next step is to remove what we can from SmsTransportDetails and genericize
that interface for a GCM equivalent.
2013-04-20 21:22:04 +02:00
|
|
|
String[] projection = {MmsSmsColumns.ID, SmsDatabase.BODY, SmsDatabase.READ, SmsDatabase.TYPE,
|
|
|
|
|
SmsDatabase.ADDRESS, SmsDatabase.SUBJECT, MmsSmsColumns.THREAD_ID,
|
|
|
|
|
SmsDatabase.STATUS,
|
|
|
|
|
MmsSmsColumns.NORMALIZED_DATE_SENT,
|
|
|
|
|
MmsSmsColumns.NORMALIZED_DATE_RECEIVED,
|
|
|
|
|
MmsDatabase.MESSAGE_TYPE, MmsDatabase.MESSAGE_BOX,
|
|
|
|
|
TRANSPORT};
|
|
|
|
|
String order = MmsSmsColumns.NORMALIZED_DATE_RECEIVED + " ASC";
|
|
|
|
|
String selection = MmsSmsColumns.READ + " = 0";
|
|
|
|
|
|
|
|
|
|
return queryTables(projection, selection, order, null, null);
|
2011-12-20 19:20:44 +01:00
|
|
|
}
|
2012-10-01 04:56:29 +02:00
|
|
|
|
2011-12-20 19:20:44 +01:00
|
|
|
public int getConversationCount(long threadId) {
|
|
|
|
|
int count = DatabaseFactory.getSmsDatabase(context).getMessageCountForThread(threadId);
|
|
|
|
|
count += DatabaseFactory.getMmsDatabase(context).getMessageCountForThread(threadId);
|
2012-10-01 04:56:29 +02:00
|
|
|
|
2011-12-20 19:20:44 +01:00
|
|
|
return count;
|
|
|
|
|
}
|
|
|
|
|
|
2012-10-30 00:51:42 +01:00
|
|
|
private Cursor queryTables(String[] projection, String selection, String order, String groupBy, String limit) {
|
Major storage layer refactoring to set the stage for clean GCM.
1) We now try to hand out cursors at a minimum. There has always been
a fairly clean insertion layer that handles encrypting message bodies,
but the process of decrypting message bodies has always been less than
ideal. Here we introduce a "Reader" interface that will decrypt message
bodies when appropriate and return objects that encapsulate record state.
No more MessageDisplayHelper. The MmsSmsDatabase interface is also more
sane.
2) We finally rid ourselves of the technical debt associated with TextSecure's
initial usage of the default SMS DB. In that world, we weren't able to use
anything other than the default "Inbox, Outbox, Sent" types to describe a
message, and had to overload the message content itself with a set of
local "prefixes" to describe what it was (encrypted, asymetric encrypted,
remote encrypted, a key exchange, procssed key exchange), and so on.
This includes a major schema update that transforms the "type" field into
a bitmask that describes everything that used to be encoded in a prefix,
and prefixes have been completely eliminated from the system.
No more Prefix.java
3) Refactoring of the MultipartMessageHandler code. It's less of a mess, and
hopefully more clear as to what's going on.
The next step is to remove what we can from SmsTransportDetails and genericize
that interface for a GCM equivalent.
2013-04-20 21:22:04 +02:00
|
|
|
String[] mmsProjection = {MmsDatabase.DATE_SENT + " * 1000 AS " + MmsSmsColumns.NORMALIZED_DATE_SENT,
|
|
|
|
|
MmsDatabase.DATE_RECEIVED + " * 1000 AS " + MmsSmsColumns.NORMALIZED_DATE_RECEIVED,
|
|
|
|
|
MmsSmsColumns.ID, SmsDatabase.BODY, MmsSmsColumns.READ, MmsSmsColumns.THREAD_ID,
|
|
|
|
|
SmsDatabase.TYPE, SmsDatabase.ADDRESS, SmsDatabase.SUBJECT, MmsDatabase.MESSAGE_TYPE,
|
|
|
|
|
MmsDatabase.MESSAGE_BOX, SmsDatabase.STATUS, TRANSPORT};
|
|
|
|
|
|
|
|
|
|
String[] smsProjection = {SmsDatabase.DATE_SENT + " * 1 AS " + MmsSmsColumns.NORMALIZED_DATE_SENT,
|
|
|
|
|
SmsDatabase.DATE_RECEIVED + " * 1 AS " + MmsSmsColumns.NORMALIZED_DATE_RECEIVED,
|
|
|
|
|
MmsSmsColumns.ID, SmsDatabase.BODY, MmsSmsColumns.READ, MmsSmsColumns.THREAD_ID,
|
|
|
|
|
SmsDatabase.TYPE, SmsDatabase.ADDRESS, SmsDatabase.SUBJECT, MmsDatabase.MESSAGE_TYPE,
|
|
|
|
|
MmsDatabase.MESSAGE_BOX, SmsDatabase.STATUS, TRANSPORT};
|
|
|
|
|
|
2012-10-01 04:56:29 +02:00
|
|
|
|
2011-12-20 19:20:44 +01:00
|
|
|
SQLiteQueryBuilder mmsQueryBuilder = new SQLiteQueryBuilder();
|
|
|
|
|
SQLiteQueryBuilder smsQueryBuilder = new SQLiteQueryBuilder();
|
|
|
|
|
|
|
|
|
|
mmsQueryBuilder.setDistinct(true);
|
|
|
|
|
smsQueryBuilder.setDistinct(true);
|
|
|
|
|
|
|
|
|
|
mmsQueryBuilder.setTables(MmsDatabase.TABLE_NAME);
|
|
|
|
|
smsQueryBuilder.setTables(SmsDatabase.TABLE_NAME);
|
2012-10-01 04:56:29 +02:00
|
|
|
|
2011-12-20 19:20:44 +01:00
|
|
|
Set<String> mmsColumnsPresent = new HashSet<String>();
|
Major storage layer refactoring to set the stage for clean GCM.
1) We now try to hand out cursors at a minimum. There has always been
a fairly clean insertion layer that handles encrypting message bodies,
but the process of decrypting message bodies has always been less than
ideal. Here we introduce a "Reader" interface that will decrypt message
bodies when appropriate and return objects that encapsulate record state.
No more MessageDisplayHelper. The MmsSmsDatabase interface is also more
sane.
2) We finally rid ourselves of the technical debt associated with TextSecure's
initial usage of the default SMS DB. In that world, we weren't able to use
anything other than the default "Inbox, Outbox, Sent" types to describe a
message, and had to overload the message content itself with a set of
local "prefixes" to describe what it was (encrypted, asymetric encrypted,
remote encrypted, a key exchange, procssed key exchange), and so on.
This includes a major schema update that transforms the "type" field into
a bitmask that describes everything that used to be encoded in a prefix,
and prefixes have been completely eliminated from the system.
No more Prefix.java
3) Refactoring of the MultipartMessageHandler code. It's less of a mess, and
hopefully more clear as to what's going on.
The next step is to remove what we can from SmsTransportDetails and genericize
that interface for a GCM equivalent.
2013-04-20 21:22:04 +02:00
|
|
|
mmsColumnsPresent.add(MmsSmsColumns.ID);
|
|
|
|
|
mmsColumnsPresent.add(MmsDatabase.MESSAGE_TYPE);
|
|
|
|
|
mmsColumnsPresent.add(MmsDatabase.MESSAGE_BOX);
|
|
|
|
|
mmsColumnsPresent.add(MmsDatabase.DATE_SENT);
|
|
|
|
|
mmsColumnsPresent.add(MmsDatabase.DATE_RECEIVED);
|
|
|
|
|
mmsColumnsPresent.add(MmsSmsColumns.READ);
|
|
|
|
|
mmsColumnsPresent.add(MmsSmsColumns.THREAD_ID);
|
2012-10-01 04:56:29 +02:00
|
|
|
|
2011-12-20 19:20:44 +01:00
|
|
|
Set<String> smsColumnsPresent = new HashSet<String>();
|
Major storage layer refactoring to set the stage for clean GCM.
1) We now try to hand out cursors at a minimum. There has always been
a fairly clean insertion layer that handles encrypting message bodies,
but the process of decrypting message bodies has always been less than
ideal. Here we introduce a "Reader" interface that will decrypt message
bodies when appropriate and return objects that encapsulate record state.
No more MessageDisplayHelper. The MmsSmsDatabase interface is also more
sane.
2) We finally rid ourselves of the technical debt associated with TextSecure's
initial usage of the default SMS DB. In that world, we weren't able to use
anything other than the default "Inbox, Outbox, Sent" types to describe a
message, and had to overload the message content itself with a set of
local "prefixes" to describe what it was (encrypted, asymetric encrypted,
remote encrypted, a key exchange, procssed key exchange), and so on.
This includes a major schema update that transforms the "type" field into
a bitmask that describes everything that used to be encoded in a prefix,
and prefixes have been completely eliminated from the system.
No more Prefix.java
3) Refactoring of the MultipartMessageHandler code. It's less of a mess, and
hopefully more clear as to what's going on.
The next step is to remove what we can from SmsTransportDetails and genericize
that interface for a GCM equivalent.
2013-04-20 21:22:04 +02:00
|
|
|
smsColumnsPresent.add(MmsSmsColumns.ID);
|
|
|
|
|
smsColumnsPresent.add(SmsDatabase.BODY);
|
|
|
|
|
smsColumnsPresent.add(SmsDatabase.TYPE);
|
|
|
|
|
smsColumnsPresent.add(SmsDatabase.ADDRESS);
|
|
|
|
|
smsColumnsPresent.add(SmsDatabase.SUBJECT);
|
|
|
|
|
smsColumnsPresent.add(SmsDatabase.DATE_SENT);
|
|
|
|
|
smsColumnsPresent.add(SmsDatabase.DATE_RECEIVED);
|
|
|
|
|
smsColumnsPresent.add(MmsSmsColumns.READ);
|
|
|
|
|
smsColumnsPresent.add(MmsSmsColumns.THREAD_ID);
|
|
|
|
|
smsColumnsPresent.add(SmsDatabase.STATUS);
|
|
|
|
|
|
|
|
|
|
String mmsSubQuery = mmsQueryBuilder.buildUnionSubQuery(TRANSPORT, mmsProjection, mmsColumnsPresent, 2, MMS_TRANSPORT, selection, null, null, null);
|
|
|
|
|
String smsSubQuery = smsQueryBuilder.buildUnionSubQuery(TRANSPORT, smsProjection, smsColumnsPresent, 2, SMS_TRANSPORT, selection, null, null, null);
|
2011-12-20 19:20:44 +01:00
|
|
|
|
2012-10-01 04:56:29 +02:00
|
|
|
SQLiteQueryBuilder unionQueryBuilder = new SQLiteQueryBuilder();
|
2011-12-20 19:20:44 +01:00
|
|
|
String unionQuery = unionQueryBuilder.buildUnionQuery(new String[] {smsSubQuery, mmsSubQuery}, order, null);
|
|
|
|
|
|
|
|
|
|
SQLiteQueryBuilder outerQueryBuilder = new SQLiteQueryBuilder();
|
|
|
|
|
outerQueryBuilder.setTables("(" + unionQuery + ")");
|
2012-10-01 04:56:29 +02:00
|
|
|
|
2012-10-30 00:51:42 +01:00
|
|
|
String query = outerQueryBuilder.buildQuery(projection, null, null, groupBy, null, null, limit);
|
2012-10-01 04:56:29 +02:00
|
|
|
|
2011-12-20 19:20:44 +01:00
|
|
|
Log.w("MmsSmsDatabase", "Executing query: " + query);
|
|
|
|
|
SQLiteDatabase db = databaseHelper.getReadableDatabase();
|
Major storage layer refactoring to set the stage for clean GCM.
1) We now try to hand out cursors at a minimum. There has always been
a fairly clean insertion layer that handles encrypting message bodies,
but the process of decrypting message bodies has always been less than
ideal. Here we introduce a "Reader" interface that will decrypt message
bodies when appropriate and return objects that encapsulate record state.
No more MessageDisplayHelper. The MmsSmsDatabase interface is also more
sane.
2) We finally rid ourselves of the technical debt associated with TextSecure's
initial usage of the default SMS DB. In that world, we weren't able to use
anything other than the default "Inbox, Outbox, Sent" types to describe a
message, and had to overload the message content itself with a set of
local "prefixes" to describe what it was (encrypted, asymetric encrypted,
remote encrypted, a key exchange, procssed key exchange), and so on.
This includes a major schema update that transforms the "type" field into
a bitmask that describes everything that used to be encoded in a prefix,
and prefixes have been completely eliminated from the system.
No more Prefix.java
3) Refactoring of the MultipartMessageHandler code. It's less of a mess, and
hopefully more clear as to what's going on.
The next step is to remove what we can from SmsTransportDetails and genericize
that interface for a GCM equivalent.
2013-04-20 21:22:04 +02:00
|
|
|
return db.rawQuery(query, null);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public Reader readerFor(Cursor cursor, MasterSecret masterSecret) {
|
|
|
|
|
return new Reader(cursor, masterSecret);
|
|
|
|
|
}
|
2012-10-01 04:56:29 +02:00
|
|
|
|
Major storage layer refactoring to set the stage for clean GCM.
1) We now try to hand out cursors at a minimum. There has always been
a fairly clean insertion layer that handles encrypting message bodies,
but the process of decrypting message bodies has always been less than
ideal. Here we introduce a "Reader" interface that will decrypt message
bodies when appropriate and return objects that encapsulate record state.
No more MessageDisplayHelper. The MmsSmsDatabase interface is also more
sane.
2) We finally rid ourselves of the technical debt associated with TextSecure's
initial usage of the default SMS DB. In that world, we weren't able to use
anything other than the default "Inbox, Outbox, Sent" types to describe a
message, and had to overload the message content itself with a set of
local "prefixes" to describe what it was (encrypted, asymetric encrypted,
remote encrypted, a key exchange, procssed key exchange), and so on.
This includes a major schema update that transforms the "type" field into
a bitmask that describes everything that used to be encoded in a prefix,
and prefixes have been completely eliminated from the system.
No more Prefix.java
3) Refactoring of the MultipartMessageHandler code. It's less of a mess, and
hopefully more clear as to what's going on.
The next step is to remove what we can from SmsTransportDetails and genericize
that interface for a GCM equivalent.
2013-04-20 21:22:04 +02:00
|
|
|
public Reader readerFor(Cursor cursor) {
|
|
|
|
|
return new Reader(cursor);
|
2011-12-20 19:20:44 +01:00
|
|
|
}
|
2012-10-01 04:56:29 +02:00
|
|
|
|
Major storage layer refactoring to set the stage for clean GCM.
1) We now try to hand out cursors at a minimum. There has always been
a fairly clean insertion layer that handles encrypting message bodies,
but the process of decrypting message bodies has always been less than
ideal. Here we introduce a "Reader" interface that will decrypt message
bodies when appropriate and return objects that encapsulate record state.
No more MessageDisplayHelper. The MmsSmsDatabase interface is also more
sane.
2) We finally rid ourselves of the technical debt associated with TextSecure's
initial usage of the default SMS DB. In that world, we weren't able to use
anything other than the default "Inbox, Outbox, Sent" types to describe a
message, and had to overload the message content itself with a set of
local "prefixes" to describe what it was (encrypted, asymetric encrypted,
remote encrypted, a key exchange, procssed key exchange), and so on.
This includes a major schema update that transforms the "type" field into
a bitmask that describes everything that used to be encoded in a prefix,
and prefixes have been completely eliminated from the system.
No more Prefix.java
3) Refactoring of the MultipartMessageHandler code. It's less of a mess, and
hopefully more clear as to what's going on.
The next step is to remove what we can from SmsTransportDetails and genericize
that interface for a GCM equivalent.
2013-04-20 21:22:04 +02:00
|
|
|
public class Reader {
|
|
|
|
|
|
|
|
|
|
private final Cursor cursor;
|
|
|
|
|
private final EncryptingSmsDatabase.Reader smsReader;
|
|
|
|
|
private final MmsDatabase.Reader mmsReader;
|
|
|
|
|
|
|
|
|
|
public Reader(Cursor cursor, MasterSecret masterSecret) {
|
|
|
|
|
this.cursor = cursor;
|
|
|
|
|
this.smsReader = DatabaseFactory.getEncryptingSmsDatabase(context).readerFor(masterSecret, cursor);
|
|
|
|
|
this.mmsReader = DatabaseFactory.getMmsDatabase(context).readerFor(masterSecret, cursor);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public Reader(Cursor cursor) {
|
|
|
|
|
this.cursor = cursor;
|
|
|
|
|
this.smsReader = DatabaseFactory.getSmsDatabase(context).readerFor(cursor);
|
|
|
|
|
this.mmsReader = DatabaseFactory.getMmsDatabase(context).readerFor(null, cursor);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public MessageRecord getNext() {
|
|
|
|
|
if (cursor == null || !cursor.moveToNext())
|
|
|
|
|
return null;
|
|
|
|
|
|
|
|
|
|
return getCurrent();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public MessageRecord getCurrent() {
|
|
|
|
|
String type = cursor.getString(cursor.getColumnIndexOrThrow(TRANSPORT));
|
|
|
|
|
|
|
|
|
|
if (type.equals(MmsSmsDatabase.MMS_TRANSPORT)) {
|
|
|
|
|
return mmsReader.getCurrent();
|
|
|
|
|
} else {
|
|
|
|
|
return smsReader.getCurrent();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2011-12-20 19:20:44 +01:00
|
|
|
}
|