From 0530449e7e9eab33e42f1c3fbb48fe0389fd334f Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Tue, 19 Dec 2017 14:07:54 +0100
Subject: [PATCH] Fix rebase errors

---
 .../smackx/omemo/signal/SignalOmemoKeyUtil.java    | 14 --------------
 .../smackx/omemo/trust/OmemoFingerprint.java       |  2 +-
 .../jivesoftware/smack/omemo/OmemoKeyUtilTest.java |  5 +++--
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoKeyUtil.java b/smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoKeyUtil.java
index ff53d3963..53663e68d 100644
--- a/smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoKeyUtil.java
+++ b/smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoKeyUtil.java
@@ -30,8 +30,6 @@ import org.jivesoftware.smackx.omemo.internal.OmemoDevice;
 import org.jivesoftware.smackx.omemo.trust.OmemoFingerprint;
 import org.jivesoftware.smackx.omemo.util.OmemoKeyUtil;
 
-import org.jxmpp.jid.impl.JidCreate;
-import org.jxmpp.stringprep.XmppStringprepException;
 import org.whispersystems.libsignal.IdentityKey;
 import org.whispersystems.libsignal.IdentityKeyPair;
 import org.whispersystems.libsignal.InvalidKeyException;
@@ -221,16 +219,4 @@ public class SignalOmemoKeyUtil extends OmemoKeyUtil<IdentityKeyPair, IdentityKe
         }
         return getFingerprintOfIdentityKey(identityKeyPair.getPublicKey());
     }
-
-    @Override
-    public SignalProtocolAddress omemoDeviceAsAddress(OmemoDevice contact) {
-        return new SignalProtocolAddress(contact.getJid().asBareJid().toString(), contact.getDeviceId());
-    }
-
-    @Override
-    public OmemoDevice addressAsOmemoDevice(SignalProtocolAddress address)
-            throws XmppStringprepException
-    {
-        return new OmemoDevice(JidCreate.bareFrom(address.getName()), address.getDeviceId());
-    }
 }
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/trust/OmemoFingerprint.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/trust/OmemoFingerprint.java
index e3834643a..14ffeb777 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/trust/OmemoFingerprint.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/trust/OmemoFingerprint.java
@@ -61,7 +61,7 @@ public class OmemoFingerprint implements CharSequence {
     public String blocksOf8Chars() {
         StringBuilder pretty = new StringBuilder();
         for (int i = 0; i < 8; i++) {
-            if (i != 0) pretty.append(" ");
+            if (i != 0) pretty.append(' ');
             pretty.append(this.fingerprintString.substring(8 * i, 8 * (i + 1)));
         }
         return pretty.toString();
diff --git a/smack-omemo/src/test/java/org/jivesoftware/smack/omemo/OmemoKeyUtilTest.java b/smack-omemo/src/test/java/org/jivesoftware/smack/omemo/OmemoKeyUtilTest.java
index cc3ec3494..47df23f45 100644
--- a/smack-omemo/src/test/java/org/jivesoftware/smack/omemo/OmemoKeyUtilTest.java
+++ b/smack-omemo/src/test/java/org/jivesoftware/smack/omemo/OmemoKeyUtilTest.java
@@ -31,6 +31,7 @@ import org.jivesoftware.smackx.omemo.element.OmemoBundleVAxolotlElement;
 import org.jivesoftware.smackx.omemo.exceptions.CorruptedOmemoKeyException;
 import org.jivesoftware.smackx.omemo.internal.OmemoDevice;
 import org.jivesoftware.smackx.omemo.provider.OmemoBundleVAxolotlProvider;
+import org.jivesoftware.smackx.omemo.trust.OmemoFingerprint;
 import org.jivesoftware.smackx.omemo.util.OmemoKeyUtil;
 
 import org.junit.Test;
@@ -127,8 +128,8 @@ extends SmackTestSuite {
 
     @Test
     public void testPrettyFingerprint() {
-        String ugly = "FFFFFFFFEEEEEEEEDDDDDDDDCCCCCCCCBBBBBBBBAAAAAAAA9999999988888888";
-        String pretty = OmemoKeyUtil.prettyFingerprint(ugly);
+        OmemoFingerprint fingerprint = new OmemoFingerprint("FFFFFFFFEEEEEEEEDDDDDDDDCCCCCCCCBBBBBBBBAAAAAAAA9999999988888888");
+        String pretty = fingerprint.blocksOf8Chars();
         assertEquals(pretty, "FFFFFFFF EEEEEEEE DDDDDDDD CCCCCCCC BBBBBBBB AAAAAAAA 99999999 88888888");
     }
 }