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

Move most of Util into library

Browse Source
This commit is contained in:
Moxie Marlinspike
2013-07-09 19:48:33 -07:00
parent 21eee19380
commit a200d29514
31 changed files with 92 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/thoughtcrime/securesms/database/DatabaseFactory.java
View File

@@ -31,9 +31,9 @@ import org.thoughtcrime.securesms.crypto.MasterCipher;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.database.keys.SessionRecord;
import org.thoughtcrime.securesms.notifications.MessageNotifier;
import org.thoughtcrime.securesms.util.Base64;
import org.whispersystems.textsecure.util.Base64;
import org.thoughtcrime.securesms.util.InvalidMessageException;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.textsecure.util.Util;
import java.io.File;
import java.io.FileInputStream;

2
src/org/thoughtcrime/securesms/database/IdentityDatabase.java
View File

@@ -31,7 +31,7 @@ import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientFactory;
import org.thoughtcrime.securesms.recipients.Recipients;
import org.thoughtcrime.securesms.util.Base64;
import org.whispersystems.textsecure.util.Base64;
import java.io.IOException;

10
src/org/thoughtcrime/securesms/database/MmsDatabase.java
View File

@@ -44,7 +44,7 @@ import org.thoughtcrime.securesms.util.InvalidMessageException;
import org.thoughtcrime.securesms.util.LRUCache;
import org.thoughtcrime.securesms.util.ListenableFutureTask;
import org.thoughtcrime.securesms.util.Trimmer;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.textsecure.util.Util;
import java.io.UnsupportedEncodingException;
import java.lang.ref.SoftReference;
@@ -133,7 +133,7 @@ public class MmsDatabase extends Database implements MmsSmsColumns {
DELIVERY_TIME, DELIVERY_REPORT, BODY, PART_COUNT, ADDRESS
};
public static final ExecutorService slideResolver = Util.newSingleThreadedLifoExecutor();
public static final ExecutorService slideResolver = org.thoughtcrime.securesms.util.Util.newSingleThreadedLifoExecutor();
private static final Map<Long, SoftReference<SlideDeck>> slideCache =
Collections.synchronizedMap(new LRUCache<Long, SoftReference<SlideDeck>>(20));
@@ -362,7 +362,7 @@ public class MmsDatabase extends Database implements MmsSmsColumns {
ContentValues contentValues = getContentValuesFromHeader(headers);
boolean unread = Util.isDefaultSmsProvider(context) || ((mailbox & Types.SECURE_MESSAGE_BIT) != 0);
if (!Util.isEmpty(retrieved.getCc())) {
if (!org.thoughtcrime.securesms.util.Util.isEmpty(retrieved.getCc())) {
try {
threadId = getThreadIdFor(retrieved);
} catch (RecipientFormattingException e) {
@@ -773,10 +773,10 @@ public class MmsDatabase extends Database implements MmsSmsColumns {
byte[]transactionIdBytes = null;
if (!Util.isEmpty(contentLocation))
contentLocationBytes = Util.toIsoBytes(contentLocation);
contentLocationBytes = org.thoughtcrime.securesms.util.Util.toIsoBytes(contentLocation);
if (!Util.isEmpty(transactionId))
transactionIdBytes = Util.toIsoBytes(transactionId);
transactionIdBytes = org.thoughtcrime.securesms.util.Util.toIsoBytes(transactionId);
return new NotificationMmsMessageRecord(context, id, recipients, recipients.getPrimaryRecipient(),

2
src/org/thoughtcrime/securesms/database/SmsDatabase.java
View File

@@ -37,7 +37,7 @@ import org.thoughtcrime.securesms.sms.IncomingKeyExchangeMessage;
import org.thoughtcrime.securesms.sms.IncomingTextMessage;
import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
import org.thoughtcrime.securesms.util.Trimmer;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.textsecure.util.Util;
import java.util.LinkedList;
import java.util.List;

2
src/org/thoughtcrime/securesms/database/ThreadDatabase.java
View File

@@ -32,7 +32,7 @@ import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientFactory;
import org.thoughtcrime.securesms.recipients.Recipients;
import org.thoughtcrime.securesms.util.InvalidMessageException;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.textsecure.util.Util;
import java.util.Arrays;
import java.util.HashSet;

2
src/org/thoughtcrime/securesms/database/model/ThreadRecord.java
View File

@@ -24,7 +24,7 @@ import android.text.style.StyleSpan;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.database.SmsDatabase;
import org.thoughtcrime.securesms.recipients.Recipients;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.textsecure.util.Util;
/**
* The message record model which represents thread heading messages.