TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 17:27:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consolodate Base64 Classes

Browse Source 
both org.thoughtcrime.redphone.util and
org.thoughtcrime.securesms.util have a Base64 util class,
however, other than whitespace changes, and the securesms
one having a couple of extra methods, they are the same.

This commit removes org.thoughtcrime.redphone.util.Base64 and
anything referencing it now uses
org.thoughtcrime.securesms.util.Base64

Closes #4294
This commit is contained in:
Sam Lanning 2015-10-24 11:58:21 +01:00 committed by Moxie Marlinspike
parent 11a93fabe5
commit 79cb6166d5
6 changed files with 5 additions and 2058 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/thoughtcrime/redphone/RedPhoneService.java
View File

@ -45,13 +45,13 @@ import org.thoughtcrime.redphone.signaling.SessionDescriptor;
import org.thoughtcrime.redphone.signaling.SignalingException; import org.thoughtcrime.redphone.signaling.SignalingException;
import org.thoughtcrime.redphone.signaling.SignalingSocket; import org.thoughtcrime.redphone.signaling.SignalingSocket;
import org.thoughtcrime.redphone.ui.NotificationBarManager; import org.thoughtcrime.redphone.ui.NotificationBarManager;
import org.thoughtcrime.redphone.util.Base64;
import org.thoughtcrime.redphone.util.UncaughtExceptionHandlerManager; import org.thoughtcrime.redphone.util.UncaughtExceptionHandlerManager;
import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.notifications.MessageNotifier; import org.thoughtcrime.securesms.notifications.MessageNotifier;
import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientFactory; import org.thoughtcrime.securesms.recipients.RecipientFactory;
import org.thoughtcrime.securesms.service.KeyCachingService; import org.thoughtcrime.securesms.service.KeyCachingService;
import org.thoughtcrime.securesms.util.Base64;
import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.TextSecurePreferences;
import java.io.IOException; import java.io.IOException;

4
src/org/thoughtcrime/redphone/crypto/EncryptedSignalMessage.java
View File

@ -17,9 +17,7 @@
package org.thoughtcrime.redphone.crypto; package org.thoughtcrime.redphone.crypto;
import android.content.Context; import org.thoughtcrime.securesms.util.Base64;
import org.thoughtcrime.redphone.util.Base64;
import java.io.IOException; import java.io.IOException;
import java.security.InvalidAlgorithmParameterException; import java.security.InvalidAlgorithmParameterException;

2
src/org/thoughtcrime/redphone/crypto/Otp.java
View File

@ -17,7 +17,7 @@
package org.thoughtcrime.redphone.crypto; package org.thoughtcrime.redphone.crypto;
import org.thoughtcrime.redphone.util.Base64; import org.thoughtcrime.securesms.util.Base64;
import java.security.InvalidKeyException; import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;

2
src/org/thoughtcrime/redphone/signaling/signals/Signal.java
View File

@ -18,7 +18,7 @@
package org.thoughtcrime.redphone.signaling.signals; package org.thoughtcrime.redphone.signaling.signals;
import org.thoughtcrime.redphone.crypto.Otp; import org.thoughtcrime.redphone.crypto.Otp;
import org.thoughtcrime.redphone.util.Base64; import org.thoughtcrime.securesms.util.Base64;
/** /**
* Base class for constructing a signal. * Base class for constructing a signal.

2051
src/org/thoughtcrime/redphone/util/Base64.java
View File

File diff suppressed because it is too large Load Diff

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

@ -3,10 +3,10 @@ package org.thoughtcrime.securesms.mms;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import org.thoughtcrime.redphone.util.Base64;
import org.thoughtcrime.securesms.attachments.Attachment; import org.thoughtcrime.securesms.attachments.Attachment;
import org.thoughtcrime.securesms.database.ThreadDatabase; import org.thoughtcrime.securesms.database.ThreadDatabase;
import org.thoughtcrime.securesms.recipients.Recipients; import org.thoughtcrime.securesms.recipients.Recipients;
import org.thoughtcrime.securesms.util.Base64;
import org.whispersystems.textsecure.internal.push.TextSecureProtos.GroupContext; import org.whispersystems.textsecure.internal.push.TextSecureProtos.GroupContext;
import java.io.IOException; import java.io.IOException;