Use Base64 from libsignal

src/main/java/org/asamk/signal/GroupNotFoundException.java

@@ -1,7 +1,7 @@
 package org.asamk.signal;
 
-import org.asamk.signal.util.Base64;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
+import org.whispersystems.signalservice.internal.util.Base64;
 
 public class GroupNotFoundException extends DBusExecutionException {
 

src/main/java/org/asamk/signal/Main.java

@@ -24,7 +24,6 @@ import org.asamk.Signal;
 import org.asamk.signal.storage.contacts.ContactInfo;
 import org.asamk.signal.storage.groups.GroupInfo;
 import org.asamk.signal.storage.protocol.JsonIdentityKeyStore;
-import org.asamk.signal.util.Base64;
 import org.asamk.signal.util.Hex;
 import org.freedesktop.dbus.DBusConnection;
 import org.freedesktop.dbus.DBusSigHandler;
@@ -39,6 +38,7 @@ import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptio
 import org.whispersystems.signalservice.api.push.exceptions.NetworkFailureException;
 import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
+import org.whispersystems.signalservice.internal.util.Base64;
 
 import java.io.File;
 import java.io.IOException;

src/main/java/org/asamk/signal/Manager.java

@@ -35,7 +35,6 @@ import org.asamk.signal.storage.protocol.JsonIdentityKeyStore;
 import org.asamk.signal.storage.protocol.JsonSignalProtocolStore;
 import org.asamk.signal.storage.threads.JsonThreadStore;
 import org.asamk.signal.storage.threads.ThreadInfo;
-import org.asamk.signal.util.Base64;
 import org.asamk.signal.util.Util;
 import org.whispersystems.libsignal.*;
 import org.whispersystems.libsignal.ecc.Curve;
@@ -64,6 +63,7 @@ import org.whispersystems.signalservice.api.util.InvalidNumberException;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
 import org.whispersystems.signalservice.internal.push.SignalServiceUrl;
+import org.whispersystems.signalservice.internal.util.Base64;
 
 import java.io.*;
 import java.net.URI;

src/main/java/org/asamk/signal/NotAGroupMemberException.java

@@ -1,7 +1,7 @@
 package org.asamk.signal;
 
-import org.asamk.signal.util.Base64;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
+import org.whispersystems.signalservice.internal.util.Base64;
 
 public class NotAGroupMemberException extends DBusExecutionException {
 

src/main/java/org/asamk/signal/storage/groups/JsonGroupStore.java

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import org.asamk.signal.util.Base64;
+import org.whispersystems.signalservice.internal.util.Base64;
 
 import java.io.IOException;
 import java.util.ArrayList;

src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java

@@ -5,12 +5,12 @@ import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.*;
 import org.asamk.signal.TrustLevel;
-import org.asamk.signal.util.Base64;
 import org.whispersystems.libsignal.IdentityKey;
 import org.whispersystems.libsignal.IdentityKeyPair;
 import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.libsignal.SignalProtocolAddress;
 import org.whispersystems.libsignal.state.IdentityKeyStore;
+import org.whispersystems.signalservice.internal.util.Base64;
 
 import java.io.IOException;
 import java.util.*;

src/main/java/org/asamk/signal/storage/protocol/JsonPreKeyStore.java

@@ -4,10 +4,10 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.*;
-import org.asamk.signal.util.Base64;
 import org.whispersystems.libsignal.InvalidKeyIdException;
 import org.whispersystems.libsignal.state.PreKeyRecord;
 import org.whispersystems.libsignal.state.PreKeyStore;
+import org.whispersystems.signalservice.internal.util.Base64;
 
 import java.io.IOException;
 import java.util.HashMap;

src/main/java/org/asamk/signal/storage/protocol/JsonSessionStore.java

@@ -4,10 +4,10 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.*;
-import org.asamk.signal.util.Base64;
 import org.whispersystems.libsignal.SignalProtocolAddress;
 import org.whispersystems.libsignal.state.SessionRecord;
 import org.whispersystems.libsignal.state.SessionStore;
+import org.whispersystems.signalservice.internal.util.Base64;
 
 import java.io.IOException;
 import java.util.*;

src/main/java/org/asamk/signal/storage/protocol/JsonSignedPreKeyStore.java

@@ -4,10 +4,10 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.*;
-import org.asamk.signal.util.Base64;
 import org.whispersystems.libsignal.InvalidKeyIdException;
 import org.whispersystems.libsignal.state.SignedPreKeyRecord;
 import org.whispersystems.libsignal.state.SignedPreKeyStore;
+import org.whispersystems.signalservice.internal.util.Base64;
 
 import java.io.IOException;
 import java.util.HashMap;

src/main/java/org/asamk/signal/util/Util.java

@@ -1,5 +1,7 @@
 package org.asamk.signal.util;
 
+import org.whispersystems.signalservice.internal.util.Base64;
+
 import java.io.File;
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;