From 721c99c6d955b8eb15fb804d379dc88a8c93b5b5 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Thu, 11 Feb 2016 17:42:32 +0100
Subject: [PATCH] Optimized imports.

---
 .../com/nutomic/ensichat/fragments/SettingsFragment.scala | 2 +-
 .../scala/com/nutomic/ensichat/service/BootReceiver.scala | 2 +-
 .../com/nutomic/ensichat/service/CallbackHandler.scala    | 2 +-
 .../com/nutomic/ensichat/core/ConnectionHandler.scala     | 1 -
 .../ensichat/core/internet/InternetInterface.scala        | 3 ++-
 .../ensichat/core/internet/InternetServerThread.scala     | 8 +++-----
 .../src/main/scala/com/nutomic/ensichat/server/Main.scala | 2 +-
 7 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/android/src/main/scala/com/nutomic/ensichat/fragments/SettingsFragment.scala b/android/src/main/scala/com/nutomic/ensichat/fragments/SettingsFragment.scala
index 1ae2b4f..849e4b8 100644
--- a/android/src/main/scala/com/nutomic/ensichat/fragments/SettingsFragment.scala
+++ b/android/src/main/scala/com/nutomic/ensichat/fragments/SettingsFragment.scala
@@ -1,7 +1,7 @@
 package com.nutomic.ensichat.fragments
 
-import android.content.{Intent, SharedPreferences}
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener
+import android.content.{Intent, SharedPreferences}
 import android.os.Bundle
 import android.preference.{PreferenceFragment, PreferenceManager}
 import com.nutomic.ensichat.activities.EnsichatActivity
diff --git a/android/src/main/scala/com/nutomic/ensichat/service/BootReceiver.scala b/android/src/main/scala/com/nutomic/ensichat/service/BootReceiver.scala
index 72b19c1..7673a66 100644
--- a/android/src/main/scala/com/nutomic/ensichat/service/BootReceiver.scala
+++ b/android/src/main/scala/com/nutomic/ensichat/service/BootReceiver.scala
@@ -1,6 +1,6 @@
 package com.nutomic.ensichat.service
 
-import android.content.{Intent, Context, BroadcastReceiver}
+import android.content.{BroadcastReceiver, Context, Intent}
 import android.preference.PreferenceManager
 
 /**
diff --git a/android/src/main/scala/com/nutomic/ensichat/service/CallbackHandler.scala b/android/src/main/scala/com/nutomic/ensichat/service/CallbackHandler.scala
index 40f8be9..e816a3b 100644
--- a/android/src/main/scala/com/nutomic/ensichat/service/CallbackHandler.scala
+++ b/android/src/main/scala/com/nutomic/ensichat/service/CallbackHandler.scala
@@ -1,6 +1,6 @@
 package com.nutomic.ensichat.service
 
-import android.content.{Context, Intent}
+import android.content.Intent
 import android.support.v4.content.LocalBroadcastManager
 import com.nutomic.ensichat.core.interfaces.CallbackInterface
 import com.nutomic.ensichat.core.{ConnectionHandler, Message}
diff --git a/core/src/main/scala/com/nutomic/ensichat/core/ConnectionHandler.scala b/core/src/main/scala/com/nutomic/ensichat/core/ConnectionHandler.scala
index 59eb9a1..75df211 100644
--- a/core/src/main/scala/com/nutomic/ensichat/core/ConnectionHandler.scala
+++ b/core/src/main/scala/com/nutomic/ensichat/core/ConnectionHandler.scala
@@ -1,6 +1,5 @@
 package com.nutomic.ensichat.core
 
-import java.io.File
 import java.util.Date
 
 import com.nutomic.ensichat.core.body.{ConnectionInfo, MessageBody, UserInfo}
diff --git a/core/src/main/scala/com/nutomic/ensichat/core/internet/InternetInterface.scala b/core/src/main/scala/com/nutomic/ensichat/core/internet/InternetInterface.scala
index 8ea8356..55f16fc 100644
--- a/core/src/main/scala/com/nutomic/ensichat/core/internet/InternetInterface.scala
+++ b/core/src/main/scala/com/nutomic/ensichat/core/internet/InternetInterface.scala
@@ -4,9 +4,10 @@ import java.io.IOException
 import java.net.{InetAddress, Socket}
 
 import com.nutomic.ensichat.core.body.ConnectionInfo
-import com.nutomic.ensichat.core.interfaces.{SettingsInterface, Log, TransmissionInterface}
+import com.nutomic.ensichat.core.interfaces.{Log, SettingsInterface, TransmissionInterface}
 import com.nutomic.ensichat.core.util.FutureHelper
 import com.nutomic.ensichat.core.{Address, ConnectionHandler, Crypto, Message}
+
 import scala.concurrent.ExecutionContext.Implicits.global
 
 object InternetInterface {
diff --git a/core/src/main/scala/com/nutomic/ensichat/core/internet/InternetServerThread.scala b/core/src/main/scala/com/nutomic/ensichat/core/internet/InternetServerThread.scala
index 242af1e..a1624a9 100644
--- a/core/src/main/scala/com/nutomic/ensichat/core/internet/InternetServerThread.scala
+++ b/core/src/main/scala/com/nutomic/ensichat/core/internet/InternetServerThread.scala
@@ -1,12 +1,10 @@
 package com.nutomic.ensichat.core.internet
 
-import java.io.{IOException, PrintStream}
-import java.net.{Socket, ServerSocket}
+import java.io.IOException
+import java.net.ServerSocket
 
-import com.nutomic.ensichat.core.{Message, Crypto}
 import com.nutomic.ensichat.core.interfaces.Log
-
-import scala.io.BufferedSource
+import com.nutomic.ensichat.core.{Crypto, Message}
 
 class InternetServerThread(crypto: Crypto, onConnected: (InternetConnectionThread) => Unit,
                    onDisconnected: (InternetConnectionThread) => Unit, onReceive: (Message, InternetConnectionThread) => Unit) extends Thread {
diff --git a/server/src/main/scala/com/nutomic/ensichat/server/Main.scala b/server/src/main/scala/com/nutomic/ensichat/server/Main.scala
index fde873e..faec70a 100644
--- a/server/src/main/scala/com/nutomic/ensichat/server/Main.scala
+++ b/server/src/main/scala/com/nutomic/ensichat/server/Main.scala
@@ -6,7 +6,7 @@ import java.util.concurrent.TimeUnit
 import com.nutomic.ensichat.core.body.Text
 import com.nutomic.ensichat.core.interfaces.SettingsInterface._
 import com.nutomic.ensichat.core.interfaces.{CallbackInterface, Log, SettingsInterface}
-import com.nutomic.ensichat.core.{Message, ConnectionHandler, Crypto}
+import com.nutomic.ensichat.core.{ConnectionHandler, Crypto, Message}
 import scopt.OptionParser
 
 object Main extends App with CallbackInterface {