mirror of
https://github.com/oxen-io/session-android.git
synced 2024-11-24 18:45:19 +00:00
83e260436b
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.
147 lines
5.5 KiB
Java
147 lines
5.5 KiB
Java
/**
|
|
* Copyright (C) 2011 Whisper Systems
|
|
*
|
|
* 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.
|
|
*
|
|
* 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.service;
|
|
|
|
import android.app.Activity;
|
|
import android.content.Context;
|
|
import android.content.Intent;
|
|
import android.content.IntentFilter;
|
|
import android.telephony.SmsManager;
|
|
import android.telephony.SmsMessage;
|
|
import android.util.Log;
|
|
|
|
import org.thoughtcrime.securesms.R;
|
|
import org.thoughtcrime.securesms.crypto.MasterSecret;
|
|
import org.thoughtcrime.securesms.database.DatabaseFactory;
|
|
import org.thoughtcrime.securesms.database.EncryptingSmsDatabase;
|
|
import org.thoughtcrime.securesms.database.model.SmsMessageRecord;
|
|
import org.thoughtcrime.securesms.notifications.MessageNotifier;
|
|
import org.thoughtcrime.securesms.recipients.Recipients;
|
|
import org.thoughtcrime.securesms.service.SendReceiveService.ToastHandler;
|
|
import org.thoughtcrime.securesms.transport.UndeliverableMessageException;
|
|
import org.thoughtcrime.securesms.transport.UniversalTransport;
|
|
|
|
import java.util.HashSet;
|
|
import java.util.Set;
|
|
|
|
public class SmsSender {
|
|
|
|
private final Set<Long> pendingMessages = new HashSet<Long>();
|
|
|
|
private final Context context;
|
|
private final ToastHandler toastHandler;
|
|
|
|
public SmsSender(Context context, ToastHandler toastHandler) {
|
|
this.context = context;
|
|
this.toastHandler = toastHandler;
|
|
}
|
|
|
|
public void process(MasterSecret masterSecret, Intent intent) {
|
|
if (intent.getAction().equals(SendReceiveService.SEND_SMS_ACTION)) {
|
|
handleSendMessage(masterSecret, intent);
|
|
} else if (intent.getAction().equals(SendReceiveService.SENT_SMS_ACTION)) {
|
|
handleSentMessage(intent);
|
|
} else if (intent.getAction().equals(SendReceiveService.DELIVERED_SMS_ACTION)) {
|
|
handleDeliveredMessage(intent);
|
|
}
|
|
}
|
|
|
|
private void handleSendMessage(MasterSecret masterSecret, Intent intent) {
|
|
long messageId = intent.getLongExtra("message_id", -1);
|
|
UniversalTransport transport = new UniversalTransport(context, masterSecret);
|
|
EncryptingSmsDatabase database = DatabaseFactory.getEncryptingSmsDatabase(context);
|
|
|
|
EncryptingSmsDatabase.Reader reader = null;
|
|
SmsMessageRecord record;
|
|
|
|
Log.w("SmsSender", "Sending message: " + messageId);
|
|
|
|
try {
|
|
if (messageId != -1) reader = database.getMessage(masterSecret, messageId);
|
|
else reader = database.getOutgoingMessages(masterSecret);
|
|
|
|
while (reader != null && (record = reader.getNext()) != null) {
|
|
if (!pendingMessages.contains(record.getId())) {
|
|
pendingMessages.add(record.getId());
|
|
transport.deliver(record);
|
|
}
|
|
}
|
|
} catch (UndeliverableMessageException ude) {
|
|
Log.w("SmsSender", ude);
|
|
DatabaseFactory.getSmsDatabase(context).markAsSentFailed(messageId);
|
|
} finally {
|
|
if (reader != null)
|
|
reader.close();
|
|
}
|
|
}
|
|
|
|
private void handleSentMessage(Intent intent) {
|
|
long messageId = intent.getLongExtra("message_id", -1);
|
|
int result = intent.getIntExtra("ResultCode", -31337);
|
|
|
|
Log.w("SMSReceiverService", "Intent resultcode: " + result);
|
|
Log.w("SMSReceiverService", "Running sent callback: " + messageId);
|
|
|
|
if (result == Activity.RESULT_OK) {
|
|
DatabaseFactory.getSmsDatabase(context).markAsSent(messageId);
|
|
unregisterForRadioChanges();
|
|
} else if (result == SmsManager.RESULT_ERROR_NO_SERVICE || result == SmsManager.RESULT_ERROR_RADIO_OFF) {
|
|
toastHandler
|
|
.obtainMessage(0, context.getString(R.string.SmsReceiver_currently_unable_to_send_your_sms_message))
|
|
.sendToTarget();
|
|
registerForRadioChanges();
|
|
} else {
|
|
long threadId = DatabaseFactory.getSmsDatabase(context).getThreadIdForMessage(messageId);
|
|
Recipients recipients = DatabaseFactory.getThreadDatabase(context).getRecipientsForThreadId(context, threadId);
|
|
|
|
DatabaseFactory.getSmsDatabase(context).markAsSentFailed(messageId);
|
|
MessageNotifier.notifyMessageDeliveryFailed(context, recipients, threadId);
|
|
unregisterForRadioChanges();
|
|
}
|
|
|
|
pendingMessages.remove(messageId);
|
|
}
|
|
|
|
private void handleDeliveredMessage(Intent intent) {
|
|
long messageId = intent.getLongExtra("message_id", -1);
|
|
byte[] pdu = intent.getByteArrayExtra("pdu");
|
|
SmsMessage message = SmsMessage.createFromPdu(pdu);
|
|
|
|
if (message == null) {
|
|
return;
|
|
}
|
|
|
|
DatabaseFactory.getSmsDatabase(context).markStatus(messageId, message.getStatus());
|
|
}
|
|
|
|
private void registerForRadioChanges() {
|
|
unregisterForRadioChanges();
|
|
|
|
IntentFilter intentFilter = new IntentFilter();
|
|
intentFilter.addAction(SystemStateListener.ACTION_SERVICE_STATE);
|
|
context.registerReceiver(SystemStateListener.getInstance(), intentFilter);
|
|
}
|
|
|
|
private void unregisterForRadioChanges() {
|
|
try {
|
|
context.unregisterReceiver(SystemStateListener.getInstance());
|
|
} catch (IllegalArgumentException iae) {
|
|
Log.w("SmsSender", iae);
|
|
}
|
|
}
|
|
}
|