Optimize imports

31 files changed, 109 insertions, 97 deletions

diff --git a/src/androidTest/java/se/lublin/humla/test/EncoderTest.java b/src/androidTest/java/se/lublin/humla/test/EncoderTest.java
index 179da98..3b0e47c 100644
--- a/src/androidTest/java/se/lublin/humla/test/EncoderTest.java
+++ b/src/androidTest/java/se/lublin/humla/test/EncoderTest.java
@@ -20,6 +20,7 @@ package se.lublin.humla.test;
 import android.test.AndroidTestCase;
 
 import com.googlecode.javacpp.Loader;
+
 import se.lublin.humla.audio.encoder.CELT7Encoder;
 import se.lublin.humla.audio.encoder.IEncoder;
 import se.lublin.humla.audio.encoder.OpusEncoder;
diff --git a/src/androidTest/java/se/lublin/humla/test/HumlaServiceTest.java b/src/androidTest/java/se/lublin/humla/test/HumlaServiceTest.java
index 055438f..df2e04c 100644
--- a/src/androidTest/java/se/lublin/humla/test/HumlaServiceTest.java
+++ b/src/androidTest/java/se/lublin/humla/test/HumlaServiceTest.java
@@ -21,8 +21,8 @@ import android.content.Intent;
 import android.os.RemoteException;
 import android.test.ServiceTestCase;
 
-import se.lublin.humla.IHumlaService;
 import se.lublin.humla.HumlaService;
+import se.lublin.humla.IHumlaService;
 import se.lublin.humla.model.Server;
 
 /**
diff --git a/src/androidTest/java/se/lublin/humla/test/MixerTest.java b/src/androidTest/java/se/lublin/humla/test/MixerTest.java
index 1de0b72..43c880b 100644
--- a/src/androidTest/java/se/lublin/humla/test/MixerTest.java
+++ b/src/androidTest/java/se/lublin/humla/test/MixerTest.java
@@ -1,14 +1,14 @@
 package se.lublin.humla.test;
 
-import se.lublin.humla.audio.BasicClippingShortMixer;
-import se.lublin.humla.audio.IAudioMixer;
-import se.lublin.humla.audio.IAudioMixerSource;
-
 import junit.framework.TestCase;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import se.lublin.humla.audio.BasicClippingShortMixer;
+import se.lublin.humla.audio.IAudioMixer;
+import se.lublin.humla.audio.IAudioMixerSource;
+
 /**
  * Created by andrew on 16/07/15.
  */
diff --git a/src/androidTest/java/se/lublin/humla/test/ModelTest.java b/src/androidTest/java/se/lublin/humla/test/ModelTest.java
index 8e3aeaa..09d69a7 100644
--- a/src/androidTest/java/se/lublin/humla/test/ModelTest.java
+++ b/src/androidTest/java/se/lublin/humla/test/ModelTest.java
@@ -17,11 +17,11 @@
 
 package se.lublin.humla.test;
 
+import junit.framework.TestCase;
+
 import se.lublin.humla.model.Channel;
 import se.lublin.humla.model.User;
 
-import junit.framework.TestCase;
-
 /**
  * Tests the Channel-User tree model.
  * Created by andrew on 24/10/15.
diff --git a/src/androidTest/java/se/lublin/humla/test/URLParserTest.java b/src/androidTest/java/se/lublin/humla/test/URLParserTest.java
index 51d7931..851f0ac 100644
--- a/src/androidTest/java/se/lublin/humla/test/URLParserTest.java
+++ b/src/androidTest/java/se/lublin/humla/test/URLParserTest.java
@@ -17,14 +17,14 @@
 
 package se.lublin.humla.test;
 
-import se.lublin.humla.Constants;
-import se.lublin.humla.model.Server;
-import se.lublin.humla.util.MumbleURLParser;
-
 import junit.framework.TestCase;
 
 import java.net.MalformedURLException;
 
+import se.lublin.humla.Constants;
+import se.lublin.humla.model.Server;
+import se.lublin.humla.util.MumbleURLParser;
+
 /**
  * Tests the Mumble URL parser.
  * Created by andrew on 03/03/14.
diff --git a/src/main/java/se/lublin/humla/HumlaService.java b/src/main/java/se/lublin/humla/HumlaService.java
index 07bf287..624bda4 100644
--- a/src/main/java/se/lublin/humla/HumlaService.java
+++ b/src/main/java/se/lublin/humla/HumlaService.java
@@ -33,6 +33,11 @@ import android.os.IBinder;
 import android.os.PowerManager;
 import android.util.Log;
 
+import java.security.Security;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.List;
+
 import se.lublin.humla.audio.AudioOutput;
 import se.lublin.humla.audio.BluetoothScoReceiver;
 import se.lublin.humla.audio.inputmode.ActivityInputMode;
@@ -58,18 +63,13 @@ import se.lublin.humla.net.HumlaUDPMessageType;
 import se.lublin.humla.protobuf.Mumble;
 import se.lublin.humla.protocol.AudioHandler;
 import se.lublin.humla.protocol.ModelHandler;
-import se.lublin.humla.util.IHumlaObserver;
 import se.lublin.humla.util.HumlaCallbacks;
 import se.lublin.humla.util.HumlaDisconnectedException;
 import se.lublin.humla.util.HumlaException;
 import se.lublin.humla.util.HumlaLogger;
+import se.lublin.humla.util.IHumlaObserver;
 import se.lublin.humla.util.VoiceTargetMode;
 
-import java.security.Security;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.List;
-
 public class HumlaService extends Service implements IHumlaService, IHumlaSession, HumlaConnection.HumlaConnectionListener, HumlaLogger, BluetoothScoReceiver.Listener {
 
     static {
diff --git a/src/main/java/se/lublin/humla/IHumlaService.java b/src/main/java/se/lublin/humla/IHumlaService.java
index 8903fae..41df4e1 100644
--- a/src/main/java/se/lublin/humla/IHumlaService.java
+++ b/src/main/java/se/lublin/humla/IHumlaService.java
@@ -18,9 +18,9 @@
 package se.lublin.humla;
 
 import se.lublin.humla.model.Server;
-import se.lublin.humla.util.IHumlaObserver;
 import se.lublin.humla.util.HumlaDisconnectedException;
 import se.lublin.humla.util.HumlaException;
+import se.lublin.humla.util.IHumlaObserver;
 
 /**
  * A public interface for clients to communicate with a {@link HumlaService}.
diff --git a/src/main/java/se/lublin/humla/IHumlaSession.java b/src/main/java/se/lublin/humla/IHumlaSession.java
index 4e69be9..2162a0f 100644
--- a/src/main/java/se/lublin/humla/IHumlaSession.java
+++ b/src/main/java/se/lublin/humla/IHumlaSession.java
@@ -1,5 +1,7 @@
 package se.lublin.humla;
 
+import java.util.List;
+
 import se.lublin.humla.model.IChannel;
 import se.lublin.humla.model.IUser;
 import se.lublin.humla.model.Message;
@@ -7,8 +9,6 @@ import se.lublin.humla.model.WhisperTarget;
 import se.lublin.humla.net.HumlaUDPMessageType;
 import se.lublin.humla.util.VoiceTargetMode;
 
-import java.util.List;
-
 /**
  * An interface representing a live connection to the server.
  * Created by andrew on 28/02/17.
diff --git a/src/main/java/se/lublin/humla/audio/AudioOutput.java b/src/main/java/se/lublin/humla/audio/AudioOutput.java
index 3248912..30fc4f3 100644
--- a/src/main/java/se/lublin/humla/audio/AudioOutput.java
+++ b/src/main/java/se/lublin/humla/audio/AudioOutput.java
@@ -24,15 +24,6 @@ import android.os.Looper;
 import android.os.Process;
 import android.util.Log;
 
-import se.lublin.humla.Constants;
-import se.lublin.humla.exception.AudioInitializationException;
-import se.lublin.humla.exception.NativeAudioException;
-import se.lublin.humla.model.TalkState;
-import se.lublin.humla.model.User;
-import se.lublin.humla.net.HumlaUDPMessageType;
-import se.lublin.humla.net.PacketBuffer;
-import se.lublin.humla.protocol.AudioHandler;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -45,6 +36,15 @@ import java.util.concurrent.Future;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
+import se.lublin.humla.Constants;
+import se.lublin.humla.exception.AudioInitializationException;
+import se.lublin.humla.exception.NativeAudioException;
+import se.lublin.humla.model.TalkState;
+import se.lublin.humla.model.User;
+import se.lublin.humla.net.HumlaUDPMessageType;
+import se.lublin.humla.net.PacketBuffer;
+import se.lublin.humla.protocol.AudioHandler;
+
 /**
  * Created by andrew on 16/07/13.
  */
diff --git a/src/main/java/se/lublin/humla/audio/AudioOutputSpeech.java b/src/main/java/se/lublin/humla/audio/AudioOutputSpeech.java
index 0982f06..cdfd131 100644
--- a/src/main/java/se/lublin/humla/audio/AudioOutputSpeech.java
+++ b/src/main/java/se/lublin/humla/audio/AudioOutputSpeech.java
@@ -18,6 +18,15 @@
 package se.lublin.humla.audio;
 
 import com.googlecode.javacpp.IntPointer;
+
+import java.nio.BufferOverflowException;
+import java.nio.BufferUnderflowException;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.Queue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
 import se.lublin.humla.audio.javacpp.CELT11;
 import se.lublin.humla.audio.javacpp.CELT7;
 import se.lublin.humla.audio.javacpp.Opus;
@@ -29,14 +38,6 @@ import se.lublin.humla.net.HumlaUDPMessageType;
 import se.lublin.humla.net.PacketBuffer;
 import se.lublin.humla.protocol.AudioHandler;
 
-import java.nio.BufferOverflowException;
-import java.nio.BufferUnderflowException;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Queue;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
 /**
  * Created by andrew on 16/07/13.
  */
diff --git a/src/main/java/se/lublin/humla/audio/IDecoder.java b/src/main/java/se/lublin/humla/audio/IDecoder.java
index 65ee159..1344365 100644
--- a/src/main/java/se/lublin/humla/audio/IDecoder.java
+++ b/src/main/java/se/lublin/humla/audio/IDecoder.java
@@ -17,10 +17,10 @@
 
 package se.lublin.humla.audio;
 
-import se.lublin.humla.exception.NativeAudioException;
-
 import java.nio.ByteBuffer;
 
+import se.lublin.humla.exception.NativeAudioException;
+
 /**
  * Created by andrew on 07/03/14.
  */
diff --git a/src/main/java/se/lublin/humla/audio/encoder/CELT11Encoder.java b/src/main/java/se/lublin/humla/audio/encoder/CELT11Encoder.java
index 9dcb7a8..13ec14d 100644
--- a/src/main/java/se/lublin/humla/audio/encoder/CELT11Encoder.java
+++ b/src/main/java/se/lublin/humla/audio/encoder/CELT11Encoder.java
@@ -19,13 +19,14 @@ package se.lublin.humla.audio.encoder;
 
 import com.googlecode.javacpp.IntPointer;
 import com.googlecode.javacpp.Pointer;
-import se.lublin.humla.audio.javacpp.CELT11;
-import se.lublin.humla.exception.NativeAudioException;
-import se.lublin.humla.net.PacketBuffer;
 
 import java.nio.BufferOverflowException;
 import java.nio.BufferUnderflowException;
 
+import se.lublin.humla.audio.javacpp.CELT11;
+import se.lublin.humla.exception.NativeAudioException;
+import se.lublin.humla.net.PacketBuffer;
+
 /**
 * Created by andrew on 08/12/14.
 */
diff --git a/src/main/java/se/lublin/humla/audio/encoder/CELT7Encoder.java b/src/main/java/se/lublin/humla/audio/encoder/CELT7Encoder.java
index 5905eac..4e4c60a 100644
--- a/src/main/java/se/lublin/humla/audio/encoder/CELT7Encoder.java
+++ b/src/main/java/se/lublin/humla/audio/encoder/CELT7Encoder.java
@@ -19,13 +19,14 @@ package se.lublin.humla.audio.encoder;
 
 import com.googlecode.javacpp.IntPointer;
 import com.googlecode.javacpp.Pointer;
-import se.lublin.humla.audio.javacpp.CELT7;
-import se.lublin.humla.exception.NativeAudioException;
-import se.lublin.humla.net.PacketBuffer;
 
 import java.nio.BufferOverflowException;
 import java.nio.BufferUnderflowException;
 
+import se.lublin.humla.audio.javacpp.CELT7;
+import se.lublin.humla.exception.NativeAudioException;
+import se.lublin.humla.net.PacketBuffer;
+
 /**
 * Created by andrew on 08/12/14.
 */
diff --git a/src/main/java/se/lublin/humla/audio/encoder/IEncoder.java b/src/main/java/se/lublin/humla/audio/encoder/IEncoder.java
index 5c3b659..6b31d34 100644
--- a/src/main/java/se/lublin/humla/audio/encoder/IEncoder.java
+++ b/src/main/java/se/lublin/humla/audio/encoder/IEncoder.java
@@ -17,11 +17,11 @@
 
 package se.lublin.humla.audio.encoder;
 
+import java.nio.BufferUnderflowException;
+
 import se.lublin.humla.exception.NativeAudioException;
 import se.lublin.humla.net.PacketBuffer;
 
-import java.nio.BufferUnderflowException;
-
 /**
  * IEncoder provides an interface for native audio encoders to buffer and serve encoded audio
  * data.
diff --git a/src/main/java/se/lublin/humla/audio/encoder/OpusEncoder.java b/src/main/java/se/lublin/humla/audio/encoder/OpusEncoder.java
index a2b4f2c..f46b8c4 100644
--- a/src/main/java/se/lublin/humla/audio/encoder/OpusEncoder.java
+++ b/src/main/java/se/lublin/humla/audio/encoder/OpusEncoder.java
@@ -19,14 +19,15 @@ package se.lublin.humla.audio.encoder;
 
 import com.googlecode.javacpp.IntPointer;
 import com.googlecode.javacpp.Pointer;
-import se.lublin.humla.audio.javacpp.Opus;
-import se.lublin.humla.exception.NativeAudioException;
-import se.lublin.humla.net.PacketBuffer;
 
 import java.nio.BufferOverflowException;
 import java.nio.BufferUnderflowException;
 import java.util.Arrays;
 
+import se.lublin.humla.audio.javacpp.Opus;
+import se.lublin.humla.exception.NativeAudioException;
+import se.lublin.humla.net.PacketBuffer;
+
 /**
 * Created by andrew on 08/12/14.
 */
diff --git a/src/main/java/se/lublin/humla/audio/encoder/PreprocessingEncoder.java b/src/main/java/se/lublin/humla/audio/encoder/PreprocessingEncoder.java
index e914105..9dfea32 100644
--- a/src/main/java/se/lublin/humla/audio/encoder/PreprocessingEncoder.java
+++ b/src/main/java/se/lublin/humla/audio/encoder/PreprocessingEncoder.java
@@ -18,12 +18,13 @@
 package se.lublin.humla.audio.encoder;
 
 import com.googlecode.javacpp.IntPointer;
+
+import java.nio.BufferUnderflowException;
+
 import se.lublin.humla.audio.javacpp.Speex;
 import se.lublin.humla.exception.NativeAudioException;
 import se.lublin.humla.net.PacketBuffer;
 
-import java.nio.BufferUnderflowException;
-
 /**
  * Wrapper performing preprocessing options on the nested encoder.
  * Uses Speex preprocessor.
diff --git a/src/main/java/se/lublin/humla/audio/encoder/ResamplingEncoder.java b/src/main/java/se/lublin/humla/audio/encoder/ResamplingEncoder.java
index 5411dbb..4e1ca7f 100644
--- a/src/main/java/se/lublin/humla/audio/encoder/ResamplingEncoder.java
+++ b/src/main/java/se/lublin/humla/audio/encoder/ResamplingEncoder.java
@@ -17,12 +17,12 @@
 
 package se.lublin.humla.audio.encoder;
 
+import java.nio.BufferUnderflowException;
+
 import se.lublin.humla.audio.javacpp.Speex;
 import se.lublin.humla.exception.NativeAudioException;
 import se.lublin.humla.net.PacketBuffer;
 
-import java.nio.BufferUnderflowException;
-
 /**
  * Wraps around another encoder, resampling up/down all input using the Speex resampler.
  * Created by andrew on 16/04/14.
diff --git a/src/main/java/se/lublin/humla/audio/inputmode/ToggleInputMode.java b/src/main/java/se/lublin/humla/audio/inputmode/ToggleInputMode.java
index 57ae04d..732627c 100644
--- a/src/main/java/se/lublin/humla/audio/inputmode/ToggleInputMode.java
+++ b/src/main/java/se/lublin/humla/audio/inputmode/ToggleInputMode.java
@@ -19,12 +19,12 @@ package se.lublin.humla.audio.inputmode;
 
 import android.util.Log;
 
-import se.lublin.humla.Constants;
-
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
+import se.lublin.humla.Constants;
+
 /**
  * An input mode that depends on a toggle, such as push to talk.
  * Created by andrew on 13/02/16.
diff --git a/src/main/java/se/lublin/humla/audio/javacpp/CELT11.java b/src/main/java/se/lublin/humla/audio/javacpp/CELT11.java
index f683d3c..5400c35 100644
--- a/src/main/java/se/lublin/humla/audio/javacpp/CELT11.java
+++ b/src/main/java/se/lublin/humla/audio/javacpp/CELT11.java
@@ -22,12 +22,13 @@ import com.googlecode.javacpp.Loader;
 import com.googlecode.javacpp.Pointer;
 import com.googlecode.javacpp.annotation.Cast;
 import com.googlecode.javacpp.annotation.Platform;
+
+import java.nio.ByteBuffer;
+
 import se.lublin.humla.audio.IDecoder;
 import se.lublin.humla.exception.NativeAudioException;
 import se.lublin.humla.protocol.AudioHandler;
 
-import java.nio.ByteBuffer;
-
 /**
  * Created by andrew on 20/10/13.
  */
diff --git a/src/main/java/se/lublin/humla/audio/javacpp/CELT7.java b/src/main/java/se/lublin/humla/audio/javacpp/CELT7.java
index adb1c94..45a4a03 100644
--- a/src/main/java/se/lublin/humla/audio/javacpp/CELT7.java
+++ b/src/main/java/se/lublin/humla/audio/javacpp/CELT7.java
@@ -22,12 +22,13 @@ import com.googlecode.javacpp.Loader;
 import com.googlecode.javacpp.Pointer;
 import com.googlecode.javacpp.annotation.Cast;
 import com.googlecode.javacpp.annotation.Platform;
+
+import java.nio.ByteBuffer;
+
 import se.lublin.humla.audio.IDecoder;
 import se.lublin.humla.exception.NativeAudioException;
 import se.lublin.humla.protocol.AudioHandler;
 
-import java.nio.ByteBuffer;
-
 /**
  * Created by andrew on 20/10/13.
  */
diff --git a/src/main/java/se/lublin/humla/audio/javacpp/Opus.java b/src/main/java/se/lublin/humla/audio/javacpp/Opus.java
index 879c3e2..3478665 100644
--- a/src/main/java/se/lublin/humla/audio/javacpp/Opus.java
+++ b/src/main/java/se/lublin/humla/audio/javacpp/Opus.java
@@ -22,11 +22,12 @@ import com.googlecode.javacpp.Loader;
 import com.googlecode.javacpp.Pointer;
 import com.googlecode.javacpp.annotation.Cast;
 import com.googlecode.javacpp.annotation.Platform;
-import se.lublin.humla.audio.IDecoder;
-import se.lublin.humla.exception.NativeAudioException;
 
 import java.nio.ByteBuffer;
 
+import se.lublin.humla.audio.IDecoder;
+import se.lublin.humla.exception.NativeAudioException;
+
 /**
  * Created by andrew on 18/10/13.
  */
diff --git a/src/main/java/se/lublin/humla/audio/javacpp/Speex.java b/src/main/java/se/lublin/humla/audio/javacpp/Speex.java
index ba5a36e..1fe01ce 100644
--- a/src/main/java/se/lublin/humla/audio/javacpp/Speex.java
+++ b/src/main/java/se/lublin/humla/audio/javacpp/Speex.java
@@ -25,11 +25,12 @@ import com.googlecode.javacpp.annotation.MemberGetter;
 import com.googlecode.javacpp.annotation.MemberSetter;
 import com.googlecode.javacpp.annotation.Name;
 import com.googlecode.javacpp.annotation.Platform;
-import se.lublin.humla.audio.IDecoder;
-import se.lublin.humla.exception.NativeAudioException;
 
 import java.nio.ByteBuffer;
 
+import se.lublin.humla.audio.IDecoder;
+import se.lublin.humla.exception.NativeAudioException;
+
 /**
  * JavaCPP interface for Speex JNI.
  * Created by andrew on 18/10/13.
diff --git a/src/main/java/se/lublin/humla/net/HumlaConnection.java b/src/main/java/se/lublin/humla/net/HumlaConnection.java
index 2106210..15e007c 100644
--- a/src/main/java/se/lublin/humla/net/HumlaConnection.java
+++ b/src/main/java/se/lublin/humla/net/HumlaConnection.java
@@ -24,13 +24,6 @@ import android.util.Log;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.Message;
-import se.lublin.humla.Constants;
-import se.lublin.humla.exception.NotConnectedException;
-import se.lublin.humla.exception.NotSynchronizedException;
-import se.lublin.humla.protobuf.Mumble;
-import se.lublin.humla.protocol.HumlaTCPMessageListener;
-import se.lublin.humla.protocol.HumlaUDPMessageListener;
-import se.lublin.humla.util.HumlaException;
 
 import org.spongycastle.jce.provider.BouncyCastleProvider;
 
@@ -57,6 +50,14 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
+import se.lublin.humla.Constants;
+import se.lublin.humla.exception.NotConnectedException;
+import se.lublin.humla.exception.NotSynchronizedException;
+import se.lublin.humla.protobuf.Mumble;
+import se.lublin.humla.protocol.HumlaTCPMessageListener;
+import se.lublin.humla.protocol.HumlaUDPMessageListener;
+import se.lublin.humla.util.HumlaException;
+
 public class HumlaConnection implements HumlaTCP.TCPConnectionListener, HumlaUDP.UDPConnectionListener {
 
     /**
diff --git a/src/main/java/se/lublin/humla/net/HumlaSSLSocketFactory.java b/src/main/java/se/lublin/humla/net/HumlaSSLSocketFactory.java
index 95bc61f..94ebafb 100644
--- a/src/main/java/se/lublin/humla/net/HumlaSSLSocketFactory.java
+++ b/src/main/java/se/lublin/humla/net/HumlaSSLSocketFactory.java
@@ -19,8 +19,6 @@ package se.lublin.humla.net;
 
 import android.util.Log;
 
-import se.lublin.humla.Constants;
-
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.net.InetAddress;
@@ -43,6 +41,8 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
 
+import se.lublin.humla.Constants;
+
 public class HumlaSSLSocketFactory {
     private SSLContext mContext;
     private HumlaTrustManagerWrapper mTrustWrapper;
diff --git a/src/main/java/se/lublin/humla/net/HumlaTCP.java b/src/main/java/se/lublin/humla/net/HumlaTCP.java
index 8a068c5..fcdac31 100644
--- a/src/main/java/se/lublin/humla/net/HumlaTCP.java
+++ b/src/main/java/se/lublin/humla/net/HumlaTCP.java
@@ -22,8 +22,6 @@ import android.os.Build;
 import android.util.Log;
 
 import com.google.protobuf.Message;
-import se.lublin.humla.Constants;
-import se.lublin.humla.util.HumlaException;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -36,6 +34,9 @@ import java.security.cert.X509Certificate;
 import javax.net.ssl.SSLHandshakeException;
 import javax.net.ssl.SSLSocket;
 
+import se.lublin.humla.Constants;
+import se.lublin.humla.util.HumlaException;
+
 /**
  * Class to maintain and interface with the TCP connection to a Mumble server.
  * Parses Mumble protobuf packets according to the Mumble protocol specification.
diff --git a/src/main/java/se/lublin/humla/net/HumlaUDP.java b/src/main/java/se/lublin/humla/net/HumlaUDP.java
index 0febdb9..37807de 100644
--- a/src/main/java/se/lublin/humla/net/HumlaUDP.java
+++ b/src/main/java/se/lublin/humla/net/HumlaUDP.java
@@ -20,8 +20,6 @@ package se.lublin.humla.net;
 import android.os.Handler;
 import android.util.Log;
 
-import se.lublin.humla.Constants;
-
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
@@ -35,6 +33,8 @@ import javax.crypto.BadPaddingException;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.ShortBufferException;
 
+import se.lublin.humla.Constants;
+
 /**
  * Class to maintain and receive packets from the UDP connection to a Mumble server.
  * Public interface is not thread safe.
diff --git a/src/main/java/se/lublin/humla/protocol/ModelHandler.java b/src/main/java/se/lublin/humla/protocol/ModelHandler.java
index abe8fdc..b23795d 100644
--- a/src/main/java/se/lublin/humla/protocol/ModelHandler.java
+++ b/src/main/java/se/lublin/humla/protocol/ModelHandler.java
@@ -20,24 +20,24 @@ package se.lublin.humla.protocol;
 import android.content.Context;
 import android.util.Log;
 
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import se.lublin.humla.Constants;
 import se.lublin.humla.R;
 import se.lublin.humla.model.Channel;
 import se.lublin.humla.model.Message;
 import se.lublin.humla.model.User;
 import se.lublin.humla.protobuf.Mumble;
-import se.lublin.humla.util.IHumlaObserver;
 import se.lublin.humla.util.HumlaLogger;
+import se.lublin.humla.util.IHumlaObserver;
 import se.lublin.humla.util.MessageFormatter;
 
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 /**
  * Handles network messages related to the user-channel tree model.
  * This includes channels, users, messages, and permissions.
diff --git a/src/main/java/se/lublin/humla/util/HumlaCallbacks.java b/src/main/java/se/lublin/humla/util/HumlaCallbacks.java
index b10968e..78c93c4 100644
--- a/src/main/java/se/lublin/humla/util/HumlaCallbacks.java
+++ b/src/main/java/se/lublin/humla/util/HumlaCallbacks.java
@@ -17,15 +17,15 @@
 
 package se.lublin.humla.util;
 
-import se.lublin.humla.model.IChannel;
-import se.lublin.humla.model.IMessage;
-import se.lublin.humla.model.IUser;
-
 import java.security.cert.X509Certificate;
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import se.lublin.humla.model.IChannel;
+import se.lublin.humla.model.IMessage;
+import se.lublin.humla.model.IUser;
+
 /**
  * A composite wrapper around Humla observers to easily broadcast to each observer.
  * Created by andrew on 12/07/14.
diff --git a/src/main/java/se/lublin/humla/util/HumlaObserver.java b/src/main/java/se/lublin/humla/util/HumlaObserver.java
index 85905e9..5eb6126 100644
--- a/src/main/java/se/lublin/humla/util/HumlaObserver.java
+++ b/src/main/java/se/lublin/humla/util/HumlaObserver.java
@@ -17,12 +17,12 @@
 
 package se.lublin.humla.util;
 
+import java.security.cert.X509Certificate;
+
 import se.lublin.humla.model.IChannel;
 import se.lublin.humla.model.IMessage;
 import se.lublin.humla.model.IUser;
 
-import java.security.cert.X509Certificate;
-
 /**
  * Stub class for Humla service observation.
  * Created by andrew on 31/07/13.
diff --git a/src/main/java/se/lublin/humla/util/IHumlaObserver.java b/src/main/java/se/lublin/humla/util/IHumlaObserver.java
index fcfc996..6410d79 100644
--- a/src/main/java/se/lublin/humla/util/IHumlaObserver.java
+++ b/src/main/java/se/lublin/humla/util/IHumlaObserver.java
@@ -17,12 +17,12 @@
 
 package se.lublin.humla.util;
 
+import java.security.cert.X509Certificate;
+
 import se.lublin.humla.model.IChannel;
 import se.lublin.humla.model.IMessage;
 import se.lublin.humla.model.IUser;
 
-import java.security.cert.X509Certificate;
-
 /**
  * Created by andrew on 18/10/15.
  */
diff --git a/src/main/java/se/lublin/humla/util/MumbleURLParser.java b/src/main/java/se/lublin/humla/util/MumbleURLParser.java
index b6badd7..2b46a73 100644
--- a/src/main/java/se/lublin/humla/util/MumbleURLParser.java
+++ b/src/main/java/se/lublin/humla/util/MumbleURLParser.java
@@ -17,13 +17,13 @@
 
 package se.lublin.humla.util;
 
-import se.lublin.humla.Constants;
-import se.lublin.humla.model.Server;
-
 import java.net.MalformedURLException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import se.lublin.humla.Constants;
+import se.lublin.humla.model.Server;
+
 /**
  * An implementation of the Mumble URL scheme.
  * @see <a href="http://mumble.sourceforge.net/Mumble_URL">http://mumble.sourceforge.net/Mumble_URL</a>