mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-07-06 22:15:43 +01:00
Consistently use core-util Hex utility class.
This commit is contained in:
committed by
Greyson Parrelli
parent
a8969b34a4
commit
9c2825f202
+1
-1
@@ -50,8 +50,8 @@ import org.signal.core.ui.compose.ComposeFragment
|
||||
import org.signal.core.ui.compose.DayNightPreviews
|
||||
import org.signal.core.ui.compose.Previews
|
||||
import org.signal.core.ui.compose.SignalIcons
|
||||
import org.signal.core.util.Hex
|
||||
import org.signal.core.util.Util
|
||||
import org.signal.libsignal.protocol.util.Hex
|
||||
import org.thoughtcrime.securesms.components.settings.app.internal.sqlite.InternalSqlitePlaygroundViewModel.QueryResult
|
||||
|
||||
class InternalSqlitePlaygroundFragment : ComposeFragment() {
|
||||
|
||||
@@ -6,8 +6,6 @@ import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.core.util.Consumer;
|
||||
|
||||
import com.mobilecoin.lib.util.Hex;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
@@ -22,6 +20,8 @@ import okio.Okio;
|
||||
import okio.Sink;
|
||||
import okio.Source;
|
||||
|
||||
import org.signal.core.util.Hex;
|
||||
|
||||
/**
|
||||
* Helper for downloading Emoji files via {@link EmojiRemote}.
|
||||
*/
|
||||
@@ -93,7 +93,7 @@ public class EmojiDownloader {
|
||||
savedMd5 = EmojiFiles.getMd5(context, version, name.getUuid());
|
||||
}
|
||||
|
||||
if (!Arrays.equals(savedMd5, Hex.toByteArray(responseMD5))) {
|
||||
if (!Arrays.equals(savedMd5, Hex.fromStringCondensed(responseMD5))) {
|
||||
EmojiFiles.delete(context, version, name.getUuid());
|
||||
throw new IOException("MD5 Mismatch.");
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package org.thoughtcrime.securesms.payments
|
||||
|
||||
import com.mobilecoin.lib.util.Hex
|
||||
import org.signal.core.util.Hex
|
||||
|
||||
/**
|
||||
* Represents the service configuration values for a given MobileCoin config, used to build
|
||||
@@ -13,8 +13,8 @@ class ServiceConfig(
|
||||
view: String,
|
||||
val hardeningAdvisories: Array<String>
|
||||
) {
|
||||
val consensus: ByteArray = Hex.toByteArray(consensus)
|
||||
val report: ByteArray = Hex.toByteArray(report)
|
||||
val ledger: ByteArray = Hex.toByteArray(ledger)
|
||||
val view: ByteArray = Hex.toByteArray(view)
|
||||
val consensus: ByteArray = Hex.fromStringCondensed(consensus)
|
||||
val report: ByteArray = Hex.fromStringCondensed(report)
|
||||
val ledger: ByteArray = Hex.fromStringCondensed(ledger)
|
||||
val view: ByteArray = Hex.fromStringCondensed(view)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user