mirror of
https://github.com/oxen-io/session-android.git
synced 2023-12-14 02:53:01 +01:00
51d6144591
1) Remove all our PDU code and switch to the PDU code from the klinker library 2) Switch to using the system Lollipop MMS library by default, and falling back to our own custom library if that fails. 3) Format SMIL differently, using code from klinker instead of what we've pieced together. 4) Pull per-carrier MMS media constraints from the XML config files in the klinker library, instead of hardcoding it at 280kb. Hopefully this is an improvement, but given that MMS is involved, it will probably make things worse instead.
115 lines
4.1 KiB
Java
115 lines
4.1 KiB
Java
/**
|
|
* Copyright (C) 2015 Open 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.mms;
|
|
|
|
import android.annotation.TargetApi;
|
|
import android.content.Context;
|
|
import android.content.Intent;
|
|
import android.os.Build.VERSION;
|
|
import android.os.Build.VERSION_CODES;
|
|
import android.os.Bundle;
|
|
import android.support.annotation.NonNull;
|
|
import android.support.annotation.Nullable;
|
|
import android.telephony.SmsManager;
|
|
import android.util.Log;
|
|
|
|
import com.android.mms.service_alt.MmsConfig;
|
|
import com.google.android.mms.pdu_alt.PduParser;
|
|
import com.google.android.mms.pdu_alt.SendConf;
|
|
|
|
import org.thoughtcrime.securesms.providers.MmsBodyProvider;
|
|
import org.thoughtcrime.securesms.transport.UndeliverableMessageException;
|
|
import org.thoughtcrime.securesms.util.Util;
|
|
|
|
import java.io.ByteArrayInputStream;
|
|
import java.io.IOException;
|
|
import java.util.concurrent.TimeoutException;
|
|
|
|
public class OutgoingLollipopMmsConnection extends LollipopMmsConnection implements OutgoingMmsConnection {
|
|
private static final String TAG = OutgoingLollipopMmsConnection.class.getSimpleName();
|
|
private static final String ACTION = OutgoingLollipopMmsConnection.class.getCanonicalName() + "MMS_SENT_ACTION";
|
|
|
|
private byte[] response;
|
|
|
|
public OutgoingLollipopMmsConnection(Context context) {
|
|
super(context, ACTION);
|
|
}
|
|
|
|
@TargetApi(VERSION_CODES.LOLLIPOP_MR1)
|
|
@Override
|
|
public synchronized void onResult(Context context, Intent intent) {
|
|
if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP_MR1) {
|
|
Log.w(TAG, "HTTP status: " + intent.getIntExtra(SmsManager.EXTRA_MMS_HTTP_STATUS, -1));
|
|
}
|
|
|
|
response = intent.getByteArrayExtra(SmsManager.EXTRA_MMS_DATA);
|
|
}
|
|
|
|
@Override
|
|
@TargetApi(VERSION_CODES.LOLLIPOP)
|
|
public @Nullable synchronized SendConf send(@NonNull byte[] pduBytes, int subscriptionId)
|
|
throws UndeliverableMessageException
|
|
{
|
|
beginTransaction();
|
|
try {
|
|
MmsBodyProvider.Pointer pointer = MmsBodyProvider.makeTemporaryPointer(getContext());
|
|
Util.copy(new ByteArrayInputStream(pduBytes), pointer.getOutputStream());
|
|
|
|
SmsManager smsManager;
|
|
|
|
if (VERSION.SDK_INT >= 22 && subscriptionId != -1) {
|
|
smsManager = SmsManager.getSmsManagerForSubscriptionId(subscriptionId);
|
|
} else {
|
|
smsManager = SmsManager.getDefault();
|
|
}
|
|
|
|
Bundle configOverrides = new Bundle();
|
|
configOverrides.putBoolean(SmsManager.MMS_CONFIG_GROUP_MMS_ENABLED, true);
|
|
|
|
MmsConfig mmsConfig = MmsConfigManager.getMmsConfig(getContext(), subscriptionId);
|
|
|
|
if (mmsConfig != null) {
|
|
MmsConfig.Overridden overridden = new MmsConfig.Overridden(mmsConfig, new Bundle());
|
|
configOverrides.putString(SmsManager.MMS_CONFIG_HTTP_PARAMS, overridden.getHttpParams());
|
|
configOverrides.putInt(SmsManager.MMS_CONFIG_MAX_MESSAGE_SIZE, overridden.getMaxMessageSize());
|
|
}
|
|
|
|
smsManager.sendMultimediaMessage(getContext(),
|
|
pointer.getUri(),
|
|
null,
|
|
configOverrides,
|
|
getPendingIntent());
|
|
|
|
waitForResult();
|
|
|
|
Log.w(TAG, "MMS broadcast received and processed.");
|
|
pointer.close();
|
|
|
|
if (response == null) {
|
|
throw new UndeliverableMessageException("Null response.");
|
|
}
|
|
|
|
return (SendConf) new PduParser(response).parse();
|
|
} catch (IOException | TimeoutException e) {
|
|
throw new UndeliverableMessageException(e);
|
|
} finally {
|
|
endTransaction();
|
|
}
|
|
}
|
|
}
|
|
|