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

Split out Util functions.

Browse Source
This commit is contained in:
Moxie Marlinspike
2014-11-12 11:15:05 -08:00
parent 0d102f76cc
commit 08ed90c5ec
86 changed files with 2777 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/thoughtcrime/securesms/mms/IncomingMediaMessage.java
View File

@@ -1,13 +1,15 @@
package org.thoughtcrime.securesms.mms;
import android.text.TextUtils;
import org.thoughtcrime.securesms.crypto.MasterCipher;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.util.Base64;
import org.thoughtcrime.securesms.util.GroupUtil;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.libaxolotl.util.guava.Optional;
import org.whispersystems.textsecure.api.messages.TextSecureAttachment;
import org.whispersystems.textsecure.api.messages.TextSecureGroup;
import org.whispersystems.textsecure.util.Base64;
import java.util.List;
@@ -56,7 +58,7 @@ public class IncomingMediaMessage {
this.headers.setLongInteger(sentTimeMillis / 1000, PduHeaders.DATE);
if (body.isPresent() && !org.whispersystems.textsecure.util.Util.isEmpty(body.get())) {
if (body.isPresent() && !TextUtils.isEmpty(body.get())) {
PduPart text = new PduPart();
text.setData(Util.toUtf8Bytes(body.get()));
text.setContentType(Util.toIsoBytes("text/plain"));

2
src/org/thoughtcrime/securesms/mms/MmsConnection.java
View File

@@ -32,7 +32,7 @@ import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
import org.thoughtcrime.securesms.database.ApnDatabase;
import org.thoughtcrime.securesms.util.TelephonyUtil;
import org.thoughtcrime.securesms.util.Conversions;
import org.whispersystems.textsecure.util.Util;
import org.thoughtcrime.securesms.util.Util;
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;

2
src/org/thoughtcrime/securesms/mms/OutgoingGroupMediaMessage.java
View File

@@ -4,7 +4,7 @@ import android.content.Context;
import org.thoughtcrime.securesms.database.ThreadDatabase;
import org.thoughtcrime.securesms.recipients.Recipients;
import org.whispersystems.textsecure.util.Base64;
import org.thoughtcrime.securesms.util.Base64;
import ws.com.google.android.mms.ContentType;
import ws.com.google.android.mms.pdu.PduBody;

4
src/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java
View File

@@ -1,9 +1,9 @@
package org.thoughtcrime.securesms.mms;
import android.content.Context;
import android.text.TextUtils;
import org.thoughtcrime.securesms.recipients.Recipients;
import org.whispersystems.textsecure.util.Util;
import ws.com.google.android.mms.pdu.PduBody;
@@ -20,7 +20,7 @@ public class OutgoingMediaMessage {
this.body = body;
this.distributionType = distributionType;
if (!Util.isEmpty(message)) {
if (!TextUtils.isEmpty(message)) {
this.body.addPart(new TextSlide(context, message).getPart());
}
}

3
src/org/thoughtcrime/securesms/mms/TextTransport.java
View File

@@ -17,9 +17,10 @@
*/
package org.thoughtcrime.securesms.mms;
import org.thoughtcrime.securesms.util.Base64;
import java.io.IOException;
import org.whispersystems.textsecure.util.Base64;
public class TextTransport {