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 19:22:04 +00:00
|
|
|
package org.thoughtcrime.securesms.transport;
|
|
|
|
|
|
|
|
|
|
import android.content.Context;
|
|
|
|
|
import android.util.Log;
|
|
|
|
|
|
|
|
|
|
import org.thoughtcrime.securesms.crypto.MasterSecret;
|
|
|
|
|
import org.thoughtcrime.securesms.database.model.SmsMessageRecord;
|
|
|
|
|
import org.thoughtcrime.securesms.directory.NumberFilter;
|
|
|
|
|
import org.thoughtcrime.securesms.recipients.Recipient;
|
|
|
|
|
import org.thoughtcrime.securesms.util.PhoneNumberFormatter;
|
|
|
|
|
|
|
|
|
|
import java.io.IOException;
|
|
|
|
|
|
|
|
|
|
public class UniversalTransport {
|
|
|
|
|
|
|
|
|
|
private final Context context;
|
|
|
|
|
private final GcmTransport gcmTransport;
|
|
|
|
|
private final SmsTransport smsTransport;
|
|
|
|
|
|
|
|
|
|
public UniversalTransport(Context context, MasterSecret masterSecret) {
|
|
|
|
|
this.context = context;
|
|
|
|
|
this.gcmTransport = new GcmTransport(context, masterSecret);
|
|
|
|
|
this.smsTransport = new SmsTransport(context, masterSecret);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void deliver(SmsMessageRecord message) throws UndeliverableMessageException {
|
2013-04-26 01:59:49 +00:00
|
|
|
Recipient recipient = message.getIndividualRecipient();
|
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 19:22:04 +00:00
|
|
|
String number = PhoneNumberFormatter.formatNumber(context, recipient.getNumber());
|
|
|
|
|
|
|
|
|
|
if (NumberFilter.getInstance(context).containsNumber(number)) {
|
|
|
|
|
try {
|
|
|
|
|
Log.w("UniversalTransport", "Delivering with GCM...");
|
|
|
|
|
gcmTransport.deliver(message);
|
|
|
|
|
} catch (IOException ioe) {
|
|
|
|
|
Log.w("UniversalTransport", ioe);
|
|
|
|
|
smsTransport.deliver(message);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
Log.w("UniversalTransport", "Delivering with SMS...");
|
|
|
|
|
smsTransport.deliver(message);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|