nutomic
/
ensichat
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Optimized imports.

This commit is contained in:
Felix Ableitner 2016-02-11 17:42:32 +01:00
parent 3fb6c009ba
commit 721c99c6d9
7 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/src/main/scala/com/nutomic/ensichat/fragments/SettingsFragment.scala
View File

@ -1,7 +1,7 @@
package com.nutomic.ensichat.fragments package com.nutomic.ensichat.fragments
import android.content.{Intent, SharedPreferences}
import android.content.SharedPreferences.OnSharedPreferenceChangeListener import android.content.SharedPreferences.OnSharedPreferenceChangeListener
import android.content.{Intent, SharedPreferences}
import android.os.Bundle import android.os.Bundle
import android.preference.{PreferenceFragment, PreferenceManager} import android.preference.{PreferenceFragment, PreferenceManager}
import com.nutomic.ensichat.activities.EnsichatActivity import com.nutomic.ensichat.activities.EnsichatActivity

2
android/src/main/scala/com/nutomic/ensichat/service/BootReceiver.scala
View File

@ -1,6 +1,6 @@
package com.nutomic.ensichat.service package com.nutomic.ensichat.service
import android.content.{Intent, Context, BroadcastReceiver} import android.content.{BroadcastReceiver, Context, Intent}
import android.preference.PreferenceManager import android.preference.PreferenceManager
/** /**

2
android/src/main/scala/com/nutomic/ensichat/service/CallbackHandler.scala
View File

@ -1,6 +1,6 @@
package com.nutomic.ensichat.service package com.nutomic.ensichat.service
import android.content.{Context, Intent} import android.content.Intent
import android.support.v4.content.LocalBroadcastManager import android.support.v4.content.LocalBroadcastManager
import com.nutomic.ensichat.core.interfaces.CallbackInterface import com.nutomic.ensichat.core.interfaces.CallbackInterface
import com.nutomic.ensichat.core.{ConnectionHandler, Message} import com.nutomic.ensichat.core.{ConnectionHandler, Message}

1
core/src/main/scala/com/nutomic/ensichat/core/ConnectionHandler.scala
View File

@ -1,6 +1,5 @@
package com.nutomic.ensichat.core package com.nutomic.ensichat.core
import java.io.File
import java.util.Date import java.util.Date
import com.nutomic.ensichat.core.body.{ConnectionInfo, MessageBody, UserInfo} import com.nutomic.ensichat.core.body.{ConnectionInfo, MessageBody, UserInfo}

3
core/src/main/scala/com/nutomic/ensichat/core/internet/InternetInterface.scala
View File

@ -4,9 +4,10 @@ import java.io.IOException
import java.net.{InetAddress, Socket} import java.net.{InetAddress, Socket}
import com.nutomic.ensichat.core.body.ConnectionInfo 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.util.FutureHelper
import com.nutomic.ensichat.core.{Address, ConnectionHandler, Crypto, Message} import com.nutomic.ensichat.core.{Address, ConnectionHandler, Crypto, Message}
import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.ExecutionContext.Implicits.global
object InternetInterface { object InternetInterface {

8
core/src/main/scala/com/nutomic/ensichat/core/internet/InternetServerThread.scala
View File

@ -1,12 +1,10 @@
package com.nutomic.ensichat.core.internet package com.nutomic.ensichat.core.internet
import java.io.{IOException, PrintStream} import java.io.IOException
import java.net.{Socket, ServerSocket} import java.net.ServerSocket
import com.nutomic.ensichat.core.{Message, Crypto}
import com.nutomic.ensichat.core.interfaces.Log import com.nutomic.ensichat.core.interfaces.Log
import com.nutomic.ensichat.core.{Crypto, Message}
import scala.io.BufferedSource
class InternetServerThread(crypto: Crypto, onConnected: (InternetConnectionThread) => Unit, class InternetServerThread(crypto: Crypto, onConnected: (InternetConnectionThread) => Unit,
onDisconnected: (InternetConnectionThread) => Unit, onReceive: (Message, InternetConnectionThread) => Unit) extends Thread { onDisconnected: (InternetConnectionThread) => Unit, onReceive: (Message, InternetConnectionThread) => Unit) extends Thread {

2
server/src/main/scala/com/nutomic/ensichat/server/Main.scala
View File

@ -6,7 +6,7 @@ import java.util.concurrent.TimeUnit
import com.nutomic.ensichat.core.body.Text import com.nutomic.ensichat.core.body.Text
import com.nutomic.ensichat.core.interfaces.SettingsInterface._ import com.nutomic.ensichat.core.interfaces.SettingsInterface._
import com.nutomic.ensichat.core.interfaces.{CallbackInterface, Log, 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 import scopt.OptionParser
object Main extends App with CallbackInterface { object Main extends App with CallbackInterface {