From fa205c891523eacaaf1105e91ae1b4639249d62b Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Tue, 18 May 2021 09:29:10 +1000
Subject: [PATCH] Fix packages

---
 .../InvalidMetadataMessageException.java      | 13 -----------
 .../exceptions/InvalidVersionException.java   | 12 ----------
 .../exceptions/ProtocolException.java         | 22 -------------------
 .../ProtocolInvalidMessageException.java      |  8 -------
 .../streams/ContentLengthInputStream.java     |  1 -
 .../streams/DigestingOutputStream.java        |  1 -
 .../libsignal/utilities/HexEncoding.kt        |  2 +-
 .../utilities/PrettifiedDescription.kt        |  2 +-
 .../session/libsignal/utilities/Reflection.kt |  2 +-
 .../session/libsignal/utilities/Retrying.kt   |  2 +-
 .../session/libsignal/utilities/Trimming.kt   |  2 +-
 .../session/libsignal/utilities/Validation.kt |  2 +-
 12 files changed, 6 insertions(+), 63 deletions(-)
 delete mode 100644 libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMetadataMessageException.java
 delete mode 100644 libsignal/src/main/java/org/session/libsignal/exceptions/InvalidVersionException.java
 delete mode 100644 libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolException.java
 delete mode 100644 libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolInvalidMessageException.java

diff --git a/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMetadataMessageException.java b/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMetadataMessageException.java
deleted file mode 100644
index 90a6407bac..0000000000
--- a/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMetadataMessageException.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.session.libsignal.exceptions;
-
-
-public class InvalidMetadataMessageException extends Exception {
-  public InvalidMetadataMessageException(String s) {
-    super(s);
-  }
-
-  public InvalidMetadataMessageException(Exception s) {
-    super(s);
-  }
-
-}
diff --git a/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidVersionException.java b/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidVersionException.java
deleted file mode 100644
index d4ba2cffb7..0000000000
--- a/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidVersionException.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Copyright (C) 2014-2016 Open Whisper Systems
- *
- * Licensed according to the LICENSE file in this repository.
- */
-package org.session.libsignal.exceptions;
-
-public class InvalidVersionException extends Exception {
-  public InvalidVersionException(String detailMessage) {
-    super(detailMessage);
-  }
-}
diff --git a/libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolException.java b/libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolException.java
deleted file mode 100644
index def434ad0e..0000000000
--- a/libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolException.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.session.libsignal.exceptions;
-
-
-public abstract class ProtocolException extends Exception {
-
-  private final String sender;
-  private final int senderDevice;
-
-  public ProtocolException(Exception e, String sender, int senderDevice) {
-    super(e);
-    this.sender       = sender;
-    this.senderDevice = senderDevice;
-  }
-
-  public String getSender() {
-    return sender;
-  }
-
-  public int getSenderDevice() {
-    return senderDevice;
-  }
-}
diff --git a/libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolInvalidMessageException.java b/libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolInvalidMessageException.java
deleted file mode 100644
index 5371ac68ce..0000000000
--- a/libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolInvalidMessageException.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.session.libsignal.exceptions;
-
-
-public class ProtocolInvalidMessageException extends ProtocolException {
-  public ProtocolInvalidMessageException(InvalidMessageException e, String sender, int senderDevice) {
-    super(e, sender, senderDevice);
-  }
-}
diff --git a/libsignal/src/main/java/org/session/libsignal/streams/ContentLengthInputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/ContentLengthInputStream.java
index 8c7217cbb7..b1f5e2a081 100644
--- a/libsignal/src/main/java/org/session/libsignal/streams/ContentLengthInputStream.java
+++ b/libsignal/src/main/java/org/session/libsignal/streams/ContentLengthInputStream.java
@@ -1,6 +1,5 @@
 package org.session.libsignal.streams;
 
-
 import org.session.libsignal.service.internal.util.Util;
 
 import java.io.FilterInputStream;
diff --git a/libsignal/src/main/java/org/session/libsignal/streams/DigestingOutputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/DigestingOutputStream.java
index 331fa32c87..99f163199d 100644
--- a/libsignal/src/main/java/org/session/libsignal/streams/DigestingOutputStream.java
+++ b/libsignal/src/main/java/org/session/libsignal/streams/DigestingOutputStream.java
@@ -1,6 +1,5 @@
 package org.session.libsignal.streams;
 
-
 import java.io.FilterOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt b/libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt
index 70585af08b..07b6ccced7 100644
--- a/libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt
+++ b/libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt
@@ -1,4 +1,4 @@
-package org.session.libsignal.service.loki.utilities
+package org.session.libsignal.utilities
 
 import org.session.libsignal.crypto.IdentityKeyPair
 import org.session.libsignal.crypto.ecc.ECKeyPair
diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/PrettifiedDescription.kt b/libsignal/src/main/java/org/session/libsignal/utilities/PrettifiedDescription.kt
index 6f47f98f19..5f08f1b56e 100644
--- a/libsignal/src/main/java/org/session/libsignal/utilities/PrettifiedDescription.kt
+++ b/libsignal/src/main/java/org/session/libsignal/utilities/PrettifiedDescription.kt
@@ -1,4 +1,4 @@
-package org.session.libsignal.service.loki.utilities
+package org.session.libsignal.utilities
 
 fun Any.prettifiedDescription(): String {
     if (this is List<*>) { return prettifiedDescription() }
diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/Reflection.kt b/libsignal/src/main/java/org/session/libsignal/utilities/Reflection.kt
index 8554596ba1..11f5a28246 100644
--- a/libsignal/src/main/java/org/session/libsignal/utilities/Reflection.kt
+++ b/libsignal/src/main/java/org/session/libsignal/utilities/Reflection.kt
@@ -1,4 +1,4 @@
-package org.session.libsignal.service.loki.utilities
+package org.session.libsignal.utilities
 
 import kotlin.reflect.KProperty1
 import kotlin.reflect.full.memberProperties
diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/Retrying.kt b/libsignal/src/main/java/org/session/libsignal/utilities/Retrying.kt
index b84f4c9317..ab0b9d484e 100644
--- a/libsignal/src/main/java/org/session/libsignal/utilities/Retrying.kt
+++ b/libsignal/src/main/java/org/session/libsignal/utilities/Retrying.kt
@@ -1,4 +1,4 @@
-package org.session.libsignal.service.loki.utilities
+package org.session.libsignal.utilities
 
 import nl.komponents.kovenant.Promise
 import nl.komponents.kovenant.deferred
diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/Trimming.kt b/libsignal/src/main/java/org/session/libsignal/utilities/Trimming.kt
index 3a4115b04b..a5831800cc 100644
--- a/libsignal/src/main/java/org/session/libsignal/utilities/Trimming.kt
+++ b/libsignal/src/main/java/org/session/libsignal/utilities/Trimming.kt
@@ -1,4 +1,4 @@
-package org.session.libsignal.service.loki.utilities
+package org.session.libsignal.utilities
 
 import org.session.libsignal.utilities.Hex
 
diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/Validation.kt b/libsignal/src/main/java/org/session/libsignal/utilities/Validation.kt
index e8cd7e7b5f..d9b616d302 100644
--- a/libsignal/src/main/java/org/session/libsignal/utilities/Validation.kt
+++ b/libsignal/src/main/java/org/session/libsignal/utilities/Validation.kt
@@ -1,4 +1,4 @@
-package org.session.libsignal.service.loki.utilities
+package org.session.libsignal.utilities
 
 object PublicKeyValidation {