diff options
author | Daniel Lublin <daniel@lublin.se> | 2020-03-30 11:31:54 +0300 |
---|---|---|
committer | Daniel Lublin <daniel@lublin.se> | 2020-03-30 11:34:58 +0300 |
commit | df4909df2c482069a4a6f1b641519dd1fec2b770 (patch) | |
tree | b1dd4b5afbe40c04e5153f96f7832b1f8f050421 | |
parent | 971ef2cb954e78538804267c9c1ac886aa5a8d12 (diff) |
Optimize imports
19 files changed, 6 insertions, 54 deletions
diff --git a/src/androidTest/java/com/morlunk/jumble/test/MixerTest.java b/src/androidTest/java/com/morlunk/jumble/test/MixerTest.java index e92e527..f862543 100644 --- a/src/androidTest/java/com/morlunk/jumble/test/MixerTest.java +++ b/src/androidTest/java/com/morlunk/jumble/test/MixerTest.java @@ -7,7 +7,6 @@ import com.morlunk.jumble.audio.IAudioMixerSource; import junit.framework.TestCase; import java.util.ArrayList; -import java.util.Collection; import java.util.List; /** diff --git a/src/main/java/com/morlunk/jumble/IJumbleService.java b/src/main/java/com/morlunk/jumble/IJumbleService.java index 2080546..acc82ec 100644 --- a/src/main/java/com/morlunk/jumble/IJumbleService.java +++ b/src/main/java/com/morlunk/jumble/IJumbleService.java @@ -17,18 +17,10 @@ package com.morlunk.jumble; -import com.morlunk.jumble.model.IChannel; -import com.morlunk.jumble.model.IUser; -import com.morlunk.jumble.model.Message; import com.morlunk.jumble.model.Server; -import com.morlunk.jumble.model.WhisperTarget; -import com.morlunk.jumble.net.JumbleUDPMessageType; import com.morlunk.jumble.util.IJumbleObserver; import com.morlunk.jumble.util.JumbleDisconnectedException; import com.morlunk.jumble.util.JumbleException; -import com.morlunk.jumble.util.VoiceTargetMode; - -import java.util.List; /** * A public interface for clients to communicate with a {@link JumbleService}. diff --git a/src/main/java/com/morlunk/jumble/IJumbleSession.java b/src/main/java/com/morlunk/jumble/IJumbleSession.java index a501f3e..40bb0d2 100644 --- a/src/main/java/com/morlunk/jumble/IJumbleSession.java +++ b/src/main/java/com/morlunk/jumble/IJumbleSession.java @@ -3,10 +3,8 @@ package com.morlunk.jumble; import com.morlunk.jumble.model.IChannel; import com.morlunk.jumble.model.IUser; import com.morlunk.jumble.model.Message; -import com.morlunk.jumble.model.Server; import com.morlunk.jumble.model.WhisperTarget; import com.morlunk.jumble.net.JumbleUDPMessageType; -import com.morlunk.jumble.util.IJumbleObserver; import com.morlunk.jumble.util.VoiceTargetMode; import java.util.List; diff --git a/src/main/java/com/morlunk/jumble/JumbleService.java b/src/main/java/com/morlunk/jumble/JumbleService.java index f1ea5c1..438294e 100644 --- a/src/main/java/com/morlunk/jumble/JumbleService.java +++ b/src/main/java/com/morlunk/jumble/JumbleService.java @@ -53,15 +53,15 @@ import com.morlunk.jumble.model.User; import com.morlunk.jumble.model.WhisperTarget; import com.morlunk.jumble.model.WhisperTargetList; import com.morlunk.jumble.net.JumbleConnection; -import com.morlunk.jumble.net.JumbleUDPMessageType; -import com.morlunk.jumble.util.IJumbleObserver; -import com.morlunk.jumble.util.JumbleDisconnectedException; -import com.morlunk.jumble.util.JumbleException; import com.morlunk.jumble.net.JumbleTCPMessageType; +import com.morlunk.jumble.net.JumbleUDPMessageType; import com.morlunk.jumble.protobuf.Mumble; import com.morlunk.jumble.protocol.AudioHandler; import com.morlunk.jumble.protocol.ModelHandler; +import com.morlunk.jumble.util.IJumbleObserver; import com.morlunk.jumble.util.JumbleCallbacks; +import com.morlunk.jumble.util.JumbleDisconnectedException; +import com.morlunk.jumble.util.JumbleException; import com.morlunk.jumble.util.JumbleLogger; import com.morlunk.jumble.util.VoiceTargetMode; diff --git a/src/main/java/com/morlunk/jumble/audio/AudioInput.java b/src/main/java/com/morlunk/jumble/audio/AudioInput.java index 5fc9609..6ea9407 100644 --- a/src/main/java/com/morlunk/jumble/audio/AudioInput.java +++ b/src/main/java/com/morlunk/jumble/audio/AudioInput.java @@ -21,11 +21,9 @@ import android.media.AudioFormat; import android.media.AudioRecord; import android.util.Log; -import com.morlunk.jumble.BuildConfig; import com.morlunk.jumble.Constants; import com.morlunk.jumble.exception.AudioInitializationException; import com.morlunk.jumble.exception.NativeAudioException; -import com.morlunk.jumble.model.TalkState; import com.morlunk.jumble.protocol.AudioHandler; /** diff --git a/src/main/java/com/morlunk/jumble/audio/AudioOutput.java b/src/main/java/com/morlunk/jumble/audio/AudioOutput.java index c734853..d080d81 100644 --- a/src/main/java/com/morlunk/jumble/audio/AudioOutput.java +++ b/src/main/java/com/morlunk/jumble/audio/AudioOutput.java @@ -18,7 +18,6 @@ package com.morlunk.jumble.audio; import android.media.AudioFormat; -import android.media.AudioManager; import android.media.AudioTrack; import android.os.Handler; import android.os.Looper; diff --git a/src/main/java/com/morlunk/jumble/audio/BluetoothScoReceiver.java b/src/main/java/com/morlunk/jumble/audio/BluetoothScoReceiver.java index 4577296..696b773 100644 --- a/src/main/java/com/morlunk/jumble/audio/BluetoothScoReceiver.java +++ b/src/main/java/com/morlunk/jumble/audio/BluetoothScoReceiver.java @@ -21,10 +21,6 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.media.AudioManager; -import android.widget.Toast; - -import com.morlunk.jumble.R; -import com.morlunk.jumble.exception.AudioInitializationException; /** * Manages the state of Bluetooth SCO. diff --git a/src/main/java/com/morlunk/jumble/audio/encoder/CELT11Encoder.java b/src/main/java/com/morlunk/jumble/audio/encoder/CELT11Encoder.java index 9c98ac6..0bd603e 100644 --- a/src/main/java/com/morlunk/jumble/audio/encoder/CELT11Encoder.java +++ b/src/main/java/com/morlunk/jumble/audio/encoder/CELT11Encoder.java @@ -22,7 +22,6 @@ import com.googlecode.javacpp.Pointer; import com.morlunk.jumble.audio.javacpp.CELT11; import com.morlunk.jumble.exception.NativeAudioException; import com.morlunk.jumble.net.PacketBuffer; -import com.morlunk.jumble.protocol.AudioHandler; import java.nio.BufferOverflowException; import java.nio.BufferUnderflowException; diff --git a/src/main/java/com/morlunk/jumble/audio/encoder/CELT7Encoder.java b/src/main/java/com/morlunk/jumble/audio/encoder/CELT7Encoder.java index 5c191f1..56c18e8 100644 --- a/src/main/java/com/morlunk/jumble/audio/encoder/CELT7Encoder.java +++ b/src/main/java/com/morlunk/jumble/audio/encoder/CELT7Encoder.java @@ -22,7 +22,6 @@ import com.googlecode.javacpp.Pointer; import com.morlunk.jumble.audio.javacpp.CELT7; import com.morlunk.jumble.exception.NativeAudioException; import com.morlunk.jumble.net.PacketBuffer; -import com.morlunk.jumble.protocol.AudioHandler; import java.nio.BufferOverflowException; import java.nio.BufferUnderflowException; diff --git a/src/main/java/com/morlunk/jumble/audio/inputmode/IInputMode.java b/src/main/java/com/morlunk/jumble/audio/inputmode/IInputMode.java index c7eed42..c8d1e12 100644 --- a/src/main/java/com/morlunk/jumble/audio/inputmode/IInputMode.java +++ b/src/main/java/com/morlunk/jumble/audio/inputmode/IInputMode.java @@ -17,8 +17,6 @@ package com.morlunk.jumble.audio.inputmode; -import java.util.concurrent.locks.Condition; - /** * A talk state engine, providing information regarding when it is appropriate to send audio. * Created by andrew on 13/02/16. diff --git a/src/main/java/com/morlunk/jumble/model/Message.java b/src/main/java/com/morlunk/jumble/model/Message.java index 202e803..56cb446 100644 --- a/src/main/java/com/morlunk/jumble/model/Message.java +++ b/src/main/java/com/morlunk/jumble/model/Message.java @@ -17,10 +17,6 @@ package com.morlunk.jumble.model; -import android.os.Parcel; -import android.os.Parcelable; -import android.text.format.Time; - import java.util.ArrayList; import java.util.Collections; import java.util.Date; diff --git a/src/main/java/com/morlunk/jumble/model/WhisperTargetChannel.java b/src/main/java/com/morlunk/jumble/model/WhisperTargetChannel.java index abe41b5..366f714 100644 --- a/src/main/java/com/morlunk/jumble/model/WhisperTargetChannel.java +++ b/src/main/java/com/morlunk/jumble/model/WhisperTargetChannel.java @@ -17,13 +17,8 @@ package com.morlunk.jumble.model; -import android.os.Parcel; -import android.os.Parcelable; - import com.morlunk.jumble.protobuf.Mumble; -import java.util.List; - /** * An abstraction around a channel whisper target. * Created by andrew on 28/04/16. diff --git a/src/main/java/com/morlunk/jumble/model/WhisperTargetList.java b/src/main/java/com/morlunk/jumble/model/WhisperTargetList.java index 32f5761..d568127 100644 --- a/src/main/java/com/morlunk/jumble/model/WhisperTargetList.java +++ b/src/main/java/com/morlunk/jumble/model/WhisperTargetList.java @@ -17,8 +17,6 @@ package com.morlunk.jumble.model; -import java.util.List; - /** * A simple implementation of a fixed-size whisper target list using a bit vector. * Created by andrew on 29/04/16. diff --git a/src/main/java/com/morlunk/jumble/net/JumbleConnection.java b/src/main/java/com/morlunk/jumble/net/JumbleConnection.java index 9194902..aae7d9c 100644 --- a/src/main/java/com/morlunk/jumble/net/JumbleConnection.java +++ b/src/main/java/com/morlunk/jumble/net/JumbleConnection.java @@ -38,7 +38,6 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.net.ConnectException; import java.nio.ByteBuffer; -import java.nio.channels.NotYetConnectedException; import java.security.InvalidKeyException; import java.security.KeyManagementException; import java.security.KeyStore; diff --git a/src/main/java/com/morlunk/jumble/net/JumbleTCP.java b/src/main/java/com/morlunk/jumble/net/JumbleTCP.java index 7ea9b5a..442090d 100644 --- a/src/main/java/com/morlunk/jumble/net/JumbleTCP.java +++ b/src/main/java/com/morlunk/jumble/net/JumbleTCP.java @@ -17,6 +17,8 @@ package com.morlunk.jumble.net; +import android.net.SSLCertificateSocketFactory; +import android.os.Build; import android.util.Log; import com.google.protobuf.Message; @@ -34,9 +36,6 @@ import java.security.cert.X509Certificate; import javax.net.ssl.SSLHandshakeException; import javax.net.ssl.SSLSocket; -import android.net.SSLCertificateSocketFactory; -import android.os.Build; - /** * 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/com/morlunk/jumble/net/JumbleUDP.java b/src/main/java/com/morlunk/jumble/net/JumbleUDP.java index b593a7f..a365670 100644 --- a/src/main/java/com/morlunk/jumble/net/JumbleUDP.java +++ b/src/main/java/com/morlunk/jumble/net/JumbleUDP.java @@ -25,14 +25,11 @@ import com.morlunk.jumble.Constants; import org.jetbrains.annotations.NotNull; import java.io.IOException; -import java.net.ConnectException; import java.net.DatagramPacket; import java.net.DatagramSocket; import java.net.InetAddress; -import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.TimeUnit; import javax.crypto.BadPaddingException; import javax.crypto.IllegalBlockSizeException; diff --git a/src/main/java/com/morlunk/jumble/protocol/ModelHandler.java b/src/main/java/com/morlunk/jumble/protocol/ModelHandler.java index f1917e4..13f9e3c 100644 --- a/src/main/java/com/morlunk/jumble/protocol/ModelHandler.java +++ b/src/main/java/com/morlunk/jumble/protocol/ModelHandler.java @@ -18,9 +18,6 @@ package com.morlunk.jumble.protocol; import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.os.RemoteException; import android.util.Log; import com.morlunk.jumble.Constants; @@ -29,7 +26,6 @@ import com.morlunk.jumble.model.Channel; import com.morlunk.jumble.model.Message; import com.morlunk.jumble.model.User; import com.morlunk.jumble.protobuf.Mumble; -import com.morlunk.jumble.protocol.JumbleTCPMessageListener; import com.morlunk.jumble.util.IJumbleObserver; import com.morlunk.jumble.util.JumbleLogger; import com.morlunk.jumble.util.MessageFormatter; @@ -38,7 +34,6 @@ import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/morlunk/jumble/util/JumbleCallbacks.java b/src/main/java/com/morlunk/jumble/util/JumbleCallbacks.java index 5d1aa71..e8e8886 100644 --- a/src/main/java/com/morlunk/jumble/util/JumbleCallbacks.java +++ b/src/main/java/com/morlunk/jumble/util/JumbleCallbacks.java @@ -21,11 +21,8 @@ import com.morlunk.jumble.model.IChannel; import com.morlunk.jumble.model.IMessage; import com.morlunk.jumble.model.IUser; -import org.spongycastle.jcajce.provider.asymmetric.X509; - import java.security.cert.X509Certificate; import java.util.Collections; -import java.util.HashSet; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/com/morlunk/jumble/util/JumbleLogger.java b/src/main/java/com/morlunk/jumble/util/JumbleLogger.java index cdbaa91..d0f1fb5 100644 --- a/src/main/java/com/morlunk/jumble/util/JumbleLogger.java +++ b/src/main/java/com/morlunk/jumble/util/JumbleLogger.java @@ -17,8 +17,6 @@ package com.morlunk.jumble.util; -import com.morlunk.jumble.model.Message; - /** * An interface for reporting user-readable information. * Created by andrew on 12/07/14. |