Move files

libsignal/src/main/java/org/session/libsignal/crypto/IdentityKey.java

@@ -3,11 +3,11 @@
  *
  * Licensed according to the LICENSE file in this repository.
  */
-package org.session.libsignal.libsignal;
-
+package org.session.libsignal.crypto;
 
 import org.session.libsignal.crypto.ecc.Curve;
 import org.session.libsignal.crypto.ecc.ECPublicKey;
+import org.session.libsignal.exceptions.InvalidKeyException;
 import org.session.libsignal.utilities.Hex;
 
 /**

libsignal/src/main/java/org/session/libsignal/crypto/IdentityKeyPair.java

@@ -3,7 +3,7 @@
  *
  * Licensed according to the LICENSE file in this repository.
  */
-package org.session.libsignal.libsignal;
+package org.session.libsignal.crypto;
 
 import org.session.libsignal.crypto.ecc.ECPrivateKey;
 

libsignal/src/main/java/org/session/libsignal/crypto/ecc/Curve.java

@@ -7,7 +7,7 @@ package org.session.libsignal.crypto.ecc;
 
 import org.whispersystems.curve25519.Curve25519;
 import org.whispersystems.curve25519.Curve25519KeyPair;
-import org.session.libsignal.libsignal.InvalidKeyException;
+import org.session.libsignal.exceptions.InvalidKeyException;
 import static org.whispersystems.curve25519.Curve25519.BEST;
 
 public class Curve {

libsignal/src/main/java/org/session/libsignal/crypto/ecc/DjbECPublicKey.java

@@ -6,7 +6,7 @@
 
 package org.session.libsignal.crypto.ecc;
 
-import org.session.libsignal.libsignal.util.ByteUtil;
+import org.session.libsignal.utilities.ByteUtil;
 import java.math.BigInteger;
 import java.util.Arrays;
 

libsignal/src/main/java/org/session/libsignal/exceptions/InvalidKeyException.java

@@ -3,7 +3,7 @@
  *
  * Licensed according to the LICENSE file in this repository.
  */
-package org.session.libsignal.libsignal;
+package org.session.libsignal.exceptions;
 
 public class InvalidKeyException extends Exception {
 

libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMacException.java

@@ -3,7 +3,7 @@
  *
  * Licensed according to the LICENSE file in this repository.
  */
-package org.session.libsignal.libsignal;
+package org.session.libsignal.exceptions;
 
 public class InvalidMacException extends Exception {
 

libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMessageException.java

@@ -3,7 +3,7 @@
  *
  * Licensed according to the LICENSE file in this repository.
  */
-package org.session.libsignal.libsignal;
+package org.session.libsignal.exceptions;
 
 public class InvalidMessageException extends Exception {
 

libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMetadataMessageException.java

@@ -1,4 +1,4 @@
-package org.session.libsignal.metadata;
+package org.session.libsignal.exceptions;
 
 
 public class InvalidMetadataMessageException extends Exception {

libsignal/src/main/java/org/session/libsignal/exceptions/InvalidVersionException.java

@@ -3,7 +3,7 @@
  *
  * Licensed according to the LICENSE file in this repository.
  */
-package org.session.libsignal.libsignal;
+package org.session.libsignal.exceptions;
 
 public class InvalidVersionException extends Exception {
   public InvalidVersionException(String detailMessage) {

libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolException.java

@@ -1,4 +1,4 @@
-package org.session.libsignal.metadata;
+package org.session.libsignal.exceptions;
 
 
 public abstract class ProtocolException extends Exception {

libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolInvalidMessageException.java

@@ -1,8 +1,6 @@
-package org.session.libsignal.metadata;
+package org.session.libsignal.exceptions;
 
 
-import org.session.libsignal.libsignal.InvalidMessageException;
-
 public class ProtocolInvalidMessageException extends ProtocolException {
   public ProtocolInvalidMessageException(InvalidMessageException e, String sender, int senderDevice) {
     super(e, sender, senderDevice);

libsignal/src/main/java/org/session/libsignal/libsignal/state/IdentityKeyStore.java

@@ -1,23 +0,0 @@
-/**
- * Copyright (C) 2014-2016 Open Whisper Systems
- *
- * Licensed according to the LICENSE file in this repository.
- */
-package org.session.libsignal.libsignal.state;
-
-import org.session.libsignal.libsignal.IdentityKeyPair;
-
-/**
- * Provides an interface to identity information.
- *
- * @author Moxie Marlinspike
- */
-public interface IdentityKeyStore {
-  /**
-   * Get the local client's identity key pair.
-   *
-   * @return The local client's persistent identity key pair.
-   */
-  public IdentityKeyPair getIdentityKeyPair();
-
-}

libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java

@@ -6,7 +6,7 @@
 
 package org.session.libsignal.service.api;
 
-import org.session.libsignal.libsignal.InvalidMessageException;
+import org.session.libsignal.exceptions.InvalidMessageException;
 import org.session.libsignal.service.api.messages.SignalServiceAttachment.ProgressListener;
 import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer;
 import org.session.libsignal.service.api.messages.SignalServiceDataMessage;

libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachment.java

@@ -6,9 +6,7 @@
 
 package org.session.libsignal.service.api.messages;
 
-import org.session.libsignal.libsignal.util.guava.Optional;
-import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer;
-import org.session.libsignal.service.api.messages.SignalServiceAttachmentStream;
+import org.session.libsignal.utilities.guava.Optional;
 
 import java.io.InputStream;
 

libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentPointer.java

@@ -6,7 +6,7 @@
 
 package org.session.libsignal.service.api.messages;
 
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 import org.session.libsignal.service.api.SignalServiceMessageReceiver;
 
 /**

libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentStream.java

@@ -6,7 +6,7 @@
 
 package org.session.libsignal.service.api.messages;
 
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import java.io.InputStream;
 

libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceContent.java

@@ -6,7 +6,7 @@
 
 package org.session.libsignal.service.api.messages;
 
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 import org.session.libsignal.service.internal.push.SignalServiceProtos;
 
 public class SignalServiceContent {

libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceDataMessage.java

@@ -6,7 +6,7 @@
 
 package org.session.libsignal.service.api.messages;
 
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 import org.session.libsignal.service.api.messages.shared.SharedContact;
 import org.session.libsignal.service.api.push.SignalServiceAddress;
 import org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage;

libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceGroup.java

@@ -6,8 +6,7 @@
 
 package org.session.libsignal.service.api.messages;
 
-import org.session.libsignal.libsignal.util.guava.Optional;
-import org.session.libsignal.service.api.messages.SignalServiceAttachment;
+import org.session.libsignal.utilities.guava.Optional;
 
 import java.util.List;
 

libsignal/src/main/java/org/session/libsignal/service/api/messages/shared/SharedContact.java

@@ -1,6 +1,6 @@
 package org.session.libsignal.service.api.messages.shared;
 
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 import org.session.libsignal.service.api.messages.SignalServiceAttachment;
 
 import java.util.LinkedList;

libsignal/src/main/java/org/session/libsignal/service/api/push/SignalServiceAddress.java

@@ -6,7 +6,7 @@
 
 package org.session.libsignal.service.api.push;
 
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 /**
  * A class representing a message destination or origin.

libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherInputStream.java

@@ -6,8 +6,8 @@
 
 package org.session.libsignal.streams;
 
-import org.session.libsignal.libsignal.InvalidMacException;
-import org.session.libsignal.libsignal.InvalidMessageException;
+import org.session.libsignal.exceptions.InvalidMacException;
+import org.session.libsignal.exceptions.InvalidMessageException;
 import org.session.libsignal.service.internal.util.Util;
 
 import java.io.File;

libsignal/src/main/java/org/session/libsignal/utilities/ByteUtil.java

@@ -3,7 +3,7 @@
  *
  * Licensed according to the LICENSE file in this repository.
  */
-package org.session.libsignal.libsignal.util;
+package org.session.libsignal.utilities;
 
 import org.session.libsignal.utilities.Hex;
 

libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt

@@ -1,6 +1,6 @@
 package org.session.libsignal.service.loki.utilities
 
-import org.session.libsignal.libsignal.IdentityKeyPair
+import org.session.libsignal.crypto.IdentityKeyPair
 import org.session.libsignal.crypto.ecc.ECKeyPair
 
 fun ByteArray.toHexString(): String {

libsignal/src/main/java/org/session/libsignal/utilities/KeyHelper.java

@@ -3,7 +3,7 @@
  *
  * Licensed according to the LICENSE file in this repository.
  */
-package org.session.libsignal.libsignal.util;
+package org.session.libsignal.utilities;
 
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;

libsignal/src/main/java/org/session/libsignal/utilities/Pair.java

@@ -3,7 +3,7 @@
  *
  * Licensed according to the LICENSE file in this repository.
  */
-package org.session.libsignal.libsignal.util;
+package org.session.libsignal.utilities;
 
 public class Pair<T1, T2> {
   private final T1 v1;

libsignal/src/main/java/org/session/libsignal/utilities/guava/Absent.java

@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package org.session.libsignal.libsignal.util.guava;
+package org.session.libsignal.utilities.guava;
 
-import static org.session.libsignal.libsignal.util.guava.Preconditions.checkNotNull;
+import static org.session.libsignal.utilities.guava.Preconditions.checkNotNull;
 
 import java.util.Collections;
 import java.util.Set;
 
-
 /**
  * Implementation of an {@link Optional} not containing a reference.
  */

libsignal/src/main/java/org/session/libsignal/utilities/guava/Function.java

@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-package org.session.libsignal.libsignal.util.guava;
-
-
+package org.session.libsignal.utilities.guava;
 
 /**
  * Determines an output value based on an input value.

libsignal/src/main/java/org/session/libsignal/utilities/guava/Optional.java

@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package org.session.libsignal.libsignal.util.guava;
+package org.session.libsignal.utilities.guava;
 
-import static org.session.libsignal.libsignal.util.guava.Preconditions.checkNotNull;
+import static org.session.libsignal.utilities.guava.Preconditions.checkNotNull;
 
 import java.io.Serializable;
 import java.util.Set;
 
-
 /**
  * An immutable object that may contain a non-null reference to another object. Each
  * instance of this type either contains a non-null reference, or contains nothing (in

libsignal/src/main/java/org/session/libsignal/utilities/guava/Preconditions.java

@@ -14,13 +14,10 @@
  * limitations under the License.
  */
 
-package org.session.libsignal.libsignal.util.guava;
-
+package org.session.libsignal.utilities.guava;
 
 import java.util.NoSuchElementException;
 
-
-
 /**
  * Simple static methods to be called at the start of your own methods to verify
  * correct arguments and state. This allows constructs such as

libsignal/src/main/java/org/session/libsignal/utilities/guava/Present.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.session.libsignal.libsignal.util.guava;
+package org.session.libsignal.utilities.guava;
 
-import static org.session.libsignal.libsignal.util.guava.Preconditions.checkNotNull;
+import static org.session.libsignal.utilities.guava.Preconditions.checkNotNull;
 
 import java.util.Collections;
 import java.util.Set;

libsignal/src/main/java/org/session/libsignal/utilities/guava/Supplier.java

@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-package org.session.libsignal.libsignal.util.guava;
-
+package org.session.libsignal.utilities.guava;
 
 /**
  * A class that can supply objects of a single type.  Semantically, this could