From cd9b20dc9d5f71eb8d9946d72a2dc26f0571479b Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Wed, 12 Nov 2014 09:14:59 -0800
Subject: [PATCH] Move dependency up to parent.

---
 .../thoughtcrime/securesms/crypto/AsymmetricMasterCipher.java | 2 +-
 src/org/thoughtcrime/securesms/crypto/PublicKey.java          | 2 +-
 .../securesms/crypto/storage/TextSecurePreKeyStore.java       | 2 +-
 .../securesms/crypto/storage/TextSecureSessionStore.java      | 2 +-
 src/org/thoughtcrime/securesms/mms/MmsConnection.java         | 2 +-
 .../securesms/sms/MultipartSmsTransportMessage.java           | 3 +--
 .../org/thoughtcrime/securesms}/util/Conversions.java         | 4 ++--
 7 files changed, 8 insertions(+), 9 deletions(-)
 rename {libtextsecure/src/main/java/org/whispersystems/textsecure => src/org/thoughtcrime/securesms}/util/Conversions.java (98%)

diff --git a/src/org/thoughtcrime/securesms/crypto/AsymmetricMasterCipher.java b/src/org/thoughtcrime/securesms/crypto/AsymmetricMasterCipher.java
index e7f1bcd8e5..b8ee87d576 100644
--- a/src/org/thoughtcrime/securesms/crypto/AsymmetricMasterCipher.java
+++ b/src/org/thoughtcrime/securesms/crypto/AsymmetricMasterCipher.java
@@ -24,7 +24,7 @@ import org.whispersystems.libaxolotl.ecc.ECKeyPair;
 import org.whispersystems.libaxolotl.ecc.ECPrivateKey;
 import org.whispersystems.libaxolotl.ecc.ECPublicKey;
 import org.whispersystems.textsecure.util.Base64;
-import org.whispersystems.textsecure.util.Conversions;
+import org.thoughtcrime.securesms.util.Conversions;
 import org.whispersystems.textsecure.util.Util;
 
 import java.io.IOException;
diff --git a/src/org/thoughtcrime/securesms/crypto/PublicKey.java b/src/org/thoughtcrime/securesms/crypto/PublicKey.java
index 4f563debea..6d63966f5a 100644
--- a/src/org/thoughtcrime/securesms/crypto/PublicKey.java
+++ b/src/org/thoughtcrime/securesms/crypto/PublicKey.java
@@ -22,7 +22,7 @@ import android.util.Log;
 import org.whispersystems.libaxolotl.InvalidKeyException;
 import org.whispersystems.libaxolotl.ecc.Curve;
 import org.whispersystems.libaxolotl.ecc.ECPublicKey;
-import org.whispersystems.textsecure.util.Conversions;
+import org.thoughtcrime.securesms.util.Conversions;
 import org.whispersystems.textsecure.util.Hex;
 import org.whispersystems.textsecure.util.Util;
 
diff --git a/src/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java b/src/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java
index 94b1e403de..effc2c893a 100644
--- a/src/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java
+++ b/src/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java
@@ -11,7 +11,7 @@ import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
 import org.whispersystems.libaxolotl.state.SignedPreKeyStore;
 import org.whispersystems.libaxolotl.state.PreKeyRecord;
 import org.whispersystems.libaxolotl.state.PreKeyStore;
-import org.whispersystems.textsecure.util.Conversions;
+import org.thoughtcrime.securesms.util.Conversions;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java b/src/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java
index 45e65fe0d8..74987a95e5 100644
--- a/src/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java
+++ b/src/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java
@@ -10,7 +10,7 @@ import org.whispersystems.libaxolotl.state.SessionRecord;
 import org.whispersystems.libaxolotl.state.SessionState;
 import org.whispersystems.libaxolotl.state.SessionStore;
 import org.whispersystems.textsecure.push.PushAddress;
-import org.whispersystems.textsecure.util.Conversions;
+import org.thoughtcrime.securesms.util.Conversions;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/org/thoughtcrime/securesms/mms/MmsConnection.java b/src/org/thoughtcrime/securesms/mms/MmsConnection.java
index 632f24a7ec..1585883b7c 100644
--- a/src/org/thoughtcrime/securesms/mms/MmsConnection.java
+++ b/src/org/thoughtcrime/securesms/mms/MmsConnection.java
@@ -31,7 +31,7 @@ import org.apache.http.impl.client.LaxRedirectStrategy;
 import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
 import org.thoughtcrime.securesms.database.ApnDatabase;
 import org.thoughtcrime.securesms.util.TelephonyUtil;
-import org.whispersystems.textsecure.util.Conversions;
+import org.thoughtcrime.securesms.util.Conversions;
 import org.whispersystems.textsecure.util.Util;
 
 import java.io.BufferedInputStream;
diff --git a/src/org/thoughtcrime/securesms/sms/MultipartSmsTransportMessage.java b/src/org/thoughtcrime/securesms/sms/MultipartSmsTransportMessage.java
index 440445d843..b63a5bbb5d 100644
--- a/src/org/thoughtcrime/securesms/sms/MultipartSmsTransportMessage.java
+++ b/src/org/thoughtcrime/securesms/sms/MultipartSmsTransportMessage.java
@@ -8,8 +8,7 @@ import org.thoughtcrime.securesms.protocol.PrekeyBundleWirePrefix;
 import org.thoughtcrime.securesms.protocol.SecureMessageWirePrefix;
 import org.thoughtcrime.securesms.protocol.WirePrefix;
 import org.whispersystems.textsecure.util.Base64;
-import org.whispersystems.textsecure.util.Conversions;
-import org.whispersystems.textsecure.util.Hex;
+import org.thoughtcrime.securesms.util.Conversions;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/util/Conversions.java b/src/org/thoughtcrime/securesms/util/Conversions.java
similarity index 98%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/util/Conversions.java
rename to src/org/thoughtcrime/securesms/util/Conversions.java
index b7630b1ad1..30c5007b44 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/util/Conversions.java
+++ b/src/org/thoughtcrime/securesms/util/Conversions.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2011 Whisper Systems
+ * Copyright (C) 2014 Open 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
@@ -14,7 +14,7 @@
  * 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.whispersystems.textsecure.util;
+package org.thoughtcrime.securesms.util;
 
 public class Conversions {