TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-21 13:48:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add correct contextual menu options on 'Send' button.

Browse Source 
[Send TextSecure message | Send unencrypted SMS | Send encrypted SMS]

// FREEBIE
This commit is contained in:
Moxie Marlinspike
2014-06-11 15:31:59 -07:00
parent 7c9282f306
commit 68747142d6
13 changed files with 107 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/org/thoughtcrime/securesms/sms/MessageSender.java
View File

@@ -32,14 +32,14 @@ import ws.com.google.android.mms.MmsException;
public class MessageSender {
public static long send(Context context, MasterSecret masterSecret,
OutgoingTextMessage message, long threadId)
OutgoingTextMessage message, long threadId,
boolean forceSms)
{
if (threadId == -1)
threadId = DatabaseFactory.getThreadDatabase(context).getThreadIdFor(message.getRecipients());
List<Long> messageIds = DatabaseFactory.getEncryptingSmsDatabase(context)
.insertMessageOutbox(masterSecret, threadId, message);
.insertMessageOutbox(masterSecret, threadId, message, forceSms);
for (long messageId : messageIds) {
Log.w("SMSSender", "Got message id for new message: " + messageId);
@@ -53,14 +53,16 @@ public class MessageSender {
return threadId;
}
public static long send(Context context, MasterSecret masterSecret, OutgoingMediaMessage message, long threadId)
public static long send(Context context, MasterSecret masterSecret,
OutgoingMediaMessage message,
long threadId, boolean forceSms)
throws MmsException
{
if (threadId == -1)
threadId = DatabaseFactory.getThreadDatabase(context).getThreadIdFor(message.getRecipients(), message.getDistributionType());
long messageId = DatabaseFactory.getMmsDatabase(context)
.insertMessageOutbox(masterSecret, message, threadId);
.insertMessageOutbox(masterSecret, message, threadId, forceSms);
Intent intent = new Intent(SendReceiveService.SEND_MMS_ACTION, null,
context, SendReceiveService.class);