mirror of
https://github.com/oxen-io/session-android.git
synced 2024-11-28 20:45:17 +00: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.
60 lines
1.7 KiB
Java
60 lines
1.7 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.database;
|
|
|
|
import android.content.ContentValues;
|
|
|
|
import com.google.android.mms.pdu_alt.EncodedStringValue;
|
|
|
|
import org.thoughtcrime.securesms.util.Util;
|
|
|
|
public class ContentValuesBuilder {
|
|
|
|
private final ContentValues contentValues;
|
|
|
|
public ContentValuesBuilder(ContentValues contentValues) {
|
|
this.contentValues = contentValues;
|
|
}
|
|
|
|
public void add(String key, String charsetKey, EncodedStringValue value) {
|
|
if (value != null) {
|
|
contentValues.put(key, Util.toIsoString(value.getTextString()));
|
|
contentValues.put(charsetKey, value.getCharacterSet());
|
|
}
|
|
}
|
|
|
|
public void add(String contentKey, byte[] value) {
|
|
if (value != null) {
|
|
contentValues.put(contentKey, Util.toIsoString(value));
|
|
}
|
|
}
|
|
|
|
public void add(String contentKey, int b) {
|
|
if (b != 0)
|
|
contentValues.put(contentKey, b);
|
|
}
|
|
|
|
public void add(String contentKey, long value) {
|
|
if (value != -1L)
|
|
contentValues.put(contentKey, value);
|
|
}
|
|
|
|
public ContentValues getContentValues() {
|
|
return contentValues;
|
|
}
|
|
}
|