Use in-class TAG constant for logging

13 files changed, 60 insertions, 59 deletions

diff --git a/src/main/java/se/lublin/humla/Constants.java b/src/main/java/se/lublin/humla/Constants.java
index 2321dbc..6cf21b4 100644
--- a/src/main/java/se/lublin/humla/Constants.java
+++ b/src/main/java/se/lublin/humla/Constants.java
@@ -32,6 +32,4 @@ public class Constants {
     public static final int PROTOCOL_VERSION = (PROTOCOL_MAJOR << 16) | (PROTOCOL_MINOR << 8) | PROTOCOL_PATCH;
     public static final String PROTOCOL_STRING = PROTOCOL_MAJOR+ "." +PROTOCOL_MINOR+"."+PROTOCOL_PATCH;
     public static final int DEFAULT_PORT = 64738;
-
-    public static final String TAG = "Humla";
 }
diff --git a/src/main/java/se/lublin/humla/HumlaService.java b/src/main/java/se/lublin/humla/HumlaService.java
index ac83980..1600587 100644
--- a/src/main/java/se/lublin/humla/HumlaService.java
+++ b/src/main/java/se/lublin/humla/HumlaService.java
@@ -33,13 +33,13 @@ import android.os.IBinder;
 import android.os.PowerManager;
 import android.util.Log;
 
+import org.minidns.dnsserverlookup.android21.AndroidUsingLinkProperties;
+
 import java.security.Security;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.minidns.dnsserverlookup.android21.AndroidUsingLinkProperties;
-
 import se.lublin.humla.audio.AudioOutput;
 import se.lublin.humla.audio.BluetoothScoReceiver;
 import se.lublin.humla.audio.inputmode.ActivityInputMode;
@@ -73,6 +73,7 @@ import se.lublin.humla.util.IHumlaObserver;
 import se.lublin.humla.util.VoiceTargetMode;
 
 public class HumlaService extends Service implements IHumlaService, IHumlaSession, HumlaConnection.HumlaConnectionListener, HumlaLogger, BluetoothScoReceiver.Listener {
+    private static final String TAG = HumlaService.class.getName();
 
     static {
         // Use Spongy Castle for crypto implementation so we can create and manage PKCS #12 (.p12) certificates.
@@ -169,7 +170,7 @@ public class HumlaService extends Service implements IHumlaService, IHumlaSessio
             ConnectivityManager cm = (ConnectivityManager) context.getSystemService(CONNECTIVITY_SERVICE);
             NetworkInfo info = cm.getActiveNetworkInfo();
             if (info != null && info.isConnected()) {
-                Log.v(Constants.TAG, "Connectivity restored, attempting reconnect.");
+                Log.v(TAG, "Connectivity restored, attempting reconnect.");
                 connect();
             }
         }
@@ -361,13 +362,13 @@ public class HumlaService extends Service implements IHumlaService, IHumlaSessio
 
         // TODO hackish, but this seems to happen?!
         if (mModelHandler == null) {
-            Log.e(Constants.TAG, "Error in HumlaService.onConnectionSynchronized: mAudioHandler is null");
+            Log.e(TAG, "onConnectionSynchronized: mAudioHandler is null");
             return;
         }
 
         mConnectionState = ConnectionState.CONNECTED;
 
-        Log.v(Constants.TAG, "Connected");
+        Log.v(TAG, "Connected");
         mWakeLock.acquire();
 
         try {
@@ -395,14 +396,13 @@ public class HumlaService extends Service implements IHumlaService, IHumlaSessio
     @Override
     public void onConnectionDisconnected(HumlaException e) {
         if (e != null) {
-            Log.e(Constants.TAG, "Error: " + e.getMessage() +
-                    " (reason: " + e.getReason().name() + ")");
+            Log.e(TAG, "Error: " + e.getMessage() + " (reason: " + e.getReason().name() + ")");
             mConnectionState = ConnectionState.CONNECTION_LOST;
 
             setReconnecting(mAutoReconnect
                     && e.getReason() == HumlaException.HumlaDisconnectReason.CONNECTION_ERROR);
         } else {
-            Log.v(Constants.TAG, "Disconnected");
+            Log.v(TAG, "Disconnected");
             mConnectionState = ConnectionState.DISCONNECTED;
         }
 
@@ -456,7 +456,7 @@ public class HumlaService extends Service implements IHumlaService, IHumlaSessio
             ConnectivityManager cm = (ConnectivityManager) getSystemService(CONNECTIVITY_SERVICE);
             NetworkInfo info = cm.getActiveNetworkInfo();
             if (info != null && info.isConnected()) {
-                Log.v(Constants.TAG, "Connection lost due to non-connectivity issue. Start reconnect polling.");
+                Log.v(TAG, "Connection lost due to non-connectivity issue. Start reconnect polling.");
                 Handler mainHandler = new Handler();
                 mainHandler.postDelayed(new Runnable() {
                     @Override
@@ -467,7 +467,7 @@ public class HumlaService extends Service implements IHumlaService, IHumlaSessio
             } else {
                 // In the event that we've lost connectivity, don't poll. Wait until network
                 // returns before we resume connection attempts.
-                Log.v(Constants.TAG, "Connection lost due to connectivity issue. Waiting until network returns.");
+                Log.v(TAG, "Connection lost due to connectivity issue. Waiting until network returns.");
                 try {
                     registerReceiver(mConnectivityReceiver,
                             new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
@@ -633,7 +633,7 @@ public class HumlaService extends Service implements IHumlaService, IHumlaSessio
         // Reload audio subsystem if initialized
         if (mAudioHandler != null && mAudioHandler.isInitialized()) {
             createAudioHandler();
-            Log.i(Constants.TAG, "Audio subsystem reloaded after settings change.");
+            Log.i(TAG, "Audio subsystem reloaded after settings change.");
         }
         return reconnectNeeded;
     }
diff --git a/src/main/java/se/lublin/humla/audio/AudioInput.java b/src/main/java/se/lublin/humla/audio/AudioInput.java
index 07fdd76..35474cb 100644
--- a/src/main/java/se/lublin/humla/audio/AudioInput.java
+++ b/src/main/java/se/lublin/humla/audio/AudioInput.java
@@ -21,7 +21,6 @@ import android.media.AudioFormat;
 import android.media.AudioRecord;
 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.protocol.AudioHandler;
@@ -30,7 +29,9 @@ import se.lublin.humla.protocol.AudioHandler;
  * Created by andrew on 23/08/13.
  */
 public class AudioInput implements Runnable {
-    public static final int[] SAMPLE_RATES = { 48000, 44100, 16000, 8000 };
+    private static final String TAG = AudioInput.class.getName();
+
+    public static final int[] SAMPLE_RATES = {48000, 44100, 16000, 8000};
 
     // AudioRecord state
     private AudioInputListener mListener;
@@ -150,7 +151,7 @@ public class AudioInput implements Runnable {
     public void run() {
         android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_URGENT_AUDIO);
 
-        Log.i(Constants.TAG, "AudioInput: started");
+        Log.i(TAG, "started");
 
         mAudioRecord.startRecording();
 
@@ -164,13 +165,13 @@ public class AudioInput implements Runnable {
             if(shortsRead > 0) {
                 mListener.onAudioInputReceived(mAudioBuffer, mFrameSize);
             } else {
-                Log.e(Constants.TAG, "Error fetching audio! AudioRecord error " + shortsRead);
+                Log.e(TAG, "Error fetching audio! AudioRecord error " + shortsRead);
             }
         }
 
         mAudioRecord.stop();
 
-        Log.i(Constants.TAG, "AudioInput: stopped");
+        Log.i(TAG, "stopped");
     }
 
     public interface AudioInputListener {
diff --git a/src/main/java/se/lublin/humla/audio/AudioOutput.java b/src/main/java/se/lublin/humla/audio/AudioOutput.java
index 30fc4f3..86a3766 100644
--- a/src/main/java/se/lublin/humla/audio/AudioOutput.java
+++ b/src/main/java/se/lublin/humla/audio/AudioOutput.java
@@ -36,7 +36,6 @@ 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;
@@ -49,7 +48,9 @@ import se.lublin.humla.protocol.AudioHandler;
  * Created by andrew on 16/07/13.
  */
 public class AudioOutput implements Runnable, AudioOutputSpeech.TalkStateListener {
-    private Map<Integer,AudioOutputSpeech> mAudioOutputs = new HashMap<>();
+    private static final String TAG = AudioOutput.class.getName();
+
+    private Map<Integer, AudioOutputSpeech> mAudioOutputs = new HashMap<>();
     private AudioTrack mAudioTrack;
     private int mBufferSize;
     private Thread mThread;
@@ -76,7 +77,7 @@ public class AudioOutput implements Runnable, AudioOutputSpeech.TalkStateListene
         int minBufferSize = AudioTrack.getMinBufferSize(AudioHandler.SAMPLE_RATE,
                 AudioFormat.CHANNEL_OUT_MONO, AudioFormat.ENCODING_PCM_16BIT);
         mBufferSize = Math.min(minBufferSize, AudioHandler.FRAME_SIZE * 12);
-        Log.v(Constants.TAG, "Using buffer size " + mBufferSize + ", system's min buffer size: " + minBufferSize);
+        Log.v(TAG, "Using buffer size " + mBufferSize + ", system's min buffer size: " + minBufferSize);
 
         try {
             mAudioTrack = new AudioTrack(audioStream,
@@ -126,7 +127,7 @@ public class AudioOutput implements Runnable, AudioOutputSpeech.TalkStateListene
 
     @Override
     public void run() {
-        Log.v(Constants.TAG, "Started audio output thread.");
+        Log.v(TAG, "Started thread.");
         android.os.Process.setThreadPriority(Process.THREAD_PRIORITY_URGENT_AUDIO);
         mRunning = true;
         mAudioTrack.play();
@@ -137,7 +138,7 @@ public class AudioOutput implements Runnable, AudioOutputSpeech.TalkStateListene
             if(fetchAudio(mix, 0, mBufferSize)) {
                 mAudioTrack.write(mix, 0, mBufferSize);
             } else {
-                Log.v(Constants.TAG, "Pausing audio output thread.");
+                Log.v(TAG, "Pausing thread.");
                 synchronized (mInactiveLock) {
                     mAudioTrack.flush();
                     mAudioTrack.pause();
@@ -150,7 +151,7 @@ public class AudioOutput implements Runnable, AudioOutputSpeech.TalkStateListene
 
                     mAudioTrack.play();
                 }
-                Log.v(Constants.TAG, "Resuming audio output thread.");
+                Log.v(TAG, "Resuming thread.");
             }
         }
 
@@ -180,7 +181,7 @@ public class AudioOutput implements Runnable, AudioOutputSpeech.TalkStateListene
                     sources.add(result);
                 } else {
                     AudioOutputSpeech speech = result.getSpeechOutput();
-                    Log.v(Constants.TAG, "Deleted audio user " + speech.getUser().getName());
+                    Log.v(TAG, "Deleted audio user " + speech.getUser().getName());
                     mAudioOutputs.remove(speech.getSession());
                     speech.destroy();
                 }
@@ -226,11 +227,11 @@ public class AudioOutput implements Runnable, AudioOutputSpeech.TalkStateListene
                 try {
                     aop = new AudioOutputSpeech(user, messageType, mBufferSize, this);
                 } catch (NativeAudioException e) {
-                    Log.v(Constants.TAG, "Failed to create audio user "+user.getName());
+                    Log.v(TAG, "Failed to create audio user " + user.getName());
                     e.printStackTrace();
                     return;
                 }
-                Log.v(Constants.TAG, "Created audio user "+user.getName());
+                Log.v(TAG, "Created audio user " + user.getName());
                 mAudioOutputs.put(session, aop);
             }
             mPacketLock.unlock();
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 732627c..edf1511 100644
--- a/src/main/java/se/lublin/humla/audio/inputmode/ToggleInputMode.java
+++ b/src/main/java/se/lublin/humla/audio/inputmode/ToggleInputMode.java
@@ -23,13 +23,13 @@ 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.
  */
 public class ToggleInputMode implements IInputMode {
+    private static final String TAG = ToggleInputMode.class.getName();
+
     private boolean mInputOn;
     private final Lock mToggleLock;
     private final Condition mToggleCondition;
@@ -64,14 +64,14 @@ public class ToggleInputMode implements IInputMode {
     public void waitForInput() {
         mToggleLock.lock();
         if (!mInputOn) {
-            Log.v(Constants.TAG, "PTT: Suspending audio input.");
+            Log.v(TAG, "PTT: Suspending audio input.");
             long startTime = System.currentTimeMillis();
             try {
                 mToggleCondition.await();
             } catch (InterruptedException e) {
-                Log.w(Constants.TAG, "Blocking for PTT interrupted, likely due to input thread shutdown.");
+                Log.w(TAG, "Blocking for PTT interrupted, likely due to input thread shutdown.");
             }
-            Log.v(Constants.TAG, "PTT: Suspended audio input for " + (System.currentTimeMillis() - startTime) + "ms.");
+            Log.v(TAG, "PTT: Suspended audio input for " + (System.currentTimeMillis() - startTime) + "ms.");
         }
         mToggleLock.unlock();
     }
diff --git a/src/main/java/se/lublin/humla/model/Server.java b/src/main/java/se/lublin/humla/model/Server.java
index dd4b30a..ebd0dd8 100644
--- a/src/main/java/se/lublin/humla/model/Server.java
+++ b/src/main/java/se/lublin/humla/model/Server.java
@@ -37,6 +37,8 @@ import java.util.concurrent.atomic.AtomicReference;
 import se.lublin.humla.Constants;
 
 public class Server implements Parcelable {
+    private static final String TAG = Server.class.getName();
+
     private long mId;
     private String mName;
     private String mHost;
@@ -199,17 +201,17 @@ public class Server implements Parcelable {
                         final String lookup = "_mumble._tcp." + srvHost.get();
                         SrvResolverResult res = ResolverApi.INSTANCE.resolveSrv(lookup);
                         if (!res.wasSuccessful()) {
-                            Log.d(Constants.TAG, "resolveSrv " + lookup + ": " + res.getResponseCode());
+                            Log.d(TAG, "resolveSrv " + lookup + ": " + res.getResponseCode());
                             return;
                         }
                         Set<SRV> answers = res.getAnswersOrEmptySet();
                         if (answers.isEmpty()) {
-                            Log.d(Constants.TAG, "resolveSrv " + lookup + ": empty answer");
+                            Log.d(TAG, "resolveSrv " + lookup + ": empty answer");
                             return;
                         }
                         List<SRV> srvs = SrvUtil.sortSrvRecords(answers);
                         for (SRV srv : srvs) {
-                            Log.d(Constants.TAG, "resolved " + lookup + " SRV: " + srv.toString());
+                            Log.d(TAG, "resolved " + lookup + " SRV: " + srv.toString());
                             srvHost.set(srv.target.toString());
                             srvPort.set(srv.port);
                             // TODO SRV just picking the first record.
@@ -218,7 +220,7 @@ public class Server implements Parcelable {
                     } catch (IOException | IllegalArgumentException e) {
                         // java.net.IDN.toASCII down in resolveSrv() happens to throw IAE
                         // https://github.com/MiniDNS/minidns/issues/104
-                        Log.d(Constants.TAG, "Server, exception in srvResolve: " + e);
+                        Log.d(TAG, "exception in srvResolve: " + e);
                     }
                 }
             });
@@ -226,7 +228,7 @@ public class Server implements Parcelable {
             t.join();
         }
         catch (Exception e) {
-            Log.d(Constants.TAG, "resolveSRV() " + e);
+            Log.d(TAG, "resolveSRV() " + e);
         }
         mResolvedHost = srvHost.get();
         mResolvedPort = srvPort.get();
diff --git a/src/main/java/se/lublin/humla/net/HumlaConnection.java b/src/main/java/se/lublin/humla/net/HumlaConnection.java
index caabcb6..68b1056 100644
--- a/src/main/java/se/lublin/humla/net/HumlaConnection.java
+++ b/src/main/java/se/lublin/humla/net/HumlaConnection.java
@@ -51,7 +51,6 @@ 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;
@@ -60,6 +59,7 @@ import se.lublin.humla.protocol.HumlaUDPMessageListener;
 import se.lublin.humla.util.HumlaException;
 
 public class HumlaConnection implements HumlaTCP.TCPConnectionListener, HumlaUDP.UDPConnectionListener {
+    private static final String TAG = HumlaConnection.class.getName();
 
     /**
      * Message types that aren't shown in logcat.
@@ -140,7 +140,7 @@ public class HumlaConnection implements HumlaTCP.TCPConnectionListener, HumlaUDP
             try {
                 mPingTask = mPingExecutorService.scheduleAtFixedRate(mPingRunnable, 0, 5, TimeUnit.SECONDS);
             } catch(RejectedExecutionException e) {
-                Log.w(Constants.TAG, "HumlaConnection fail to start ping thread, in \"shutdown\"? ", e);
+                Log.w(TAG, "failed to start ping thread, in \"shutdown\"? ", e);
             }
 
             mSession = msg.getSession();
@@ -250,7 +250,7 @@ public class HumlaConnection implements HumlaTCP.TCPConnectionListener, HumlaUDP
 
         @Override
         public void messageUDPPing(byte[] data) {
-//            Log.v(Constants.TAG, "IN: UDP Ping");
+//            Log.v(TAG, "IN: UDP Ping");
             byte[] timedata = new byte[8];
             System.arraycopy(data, 1, timedata, 0, 8);
             ByteBuffer buffer = ByteBuffer.allocate(8);
@@ -277,7 +277,7 @@ public class HumlaConnection implements HumlaTCP.TCPConnectionListener, HumlaUDP
                 buffer.putLong(t);
 
                 sendUDPMessage(buffer.array(), 16, true);
-//                Log.v(Constants.TAG, "OUT: UDP Ping");
+//                Log.v(TAG, "OUT: UDP Ping");
             }
 
             Mumble.Ping.Builder pb = Mumble.Ping.newBuilder();
@@ -608,7 +608,7 @@ public class HumlaConnection implements HumlaTCP.TCPConnectionListener, HumlaUDP
     @Override
     public void onTCPMessageReceived(HumlaTCPMessageType type, int length, byte[] data) {
         if(!UNLOGGED_MESSAGES.contains(type))
-            Log.v(Constants.TAG, "IN: "+type);
+            Log.v(TAG, "IN: " + type);
 
         if(type == HumlaTCPMessageType.UDPTunnel) {
             onUDPDataReceived(data);
diff --git a/src/main/java/se/lublin/humla/net/HumlaNetworkThread.java b/src/main/java/se/lublin/humla/net/HumlaNetworkThread.java
index 68ecfed..2db9512 100644
--- a/src/main/java/se/lublin/humla/net/HumlaNetworkThread.java
+++ b/src/main/java/se/lublin/humla/net/HumlaNetworkThread.java
@@ -24,8 +24,6 @@ import android.util.Log;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import se.lublin.humla.Constants;
-
 /**
  * Base class for TCP/UDP protocol implementations.
  * Provides a common threading model (single threaded queue for write)
@@ -33,6 +31,7 @@ import se.lublin.humla.Constants;
  * @deprecated This shouldn't be needed. Redundant inheritance with limited shared code.
  */
 public abstract class HumlaNetworkThread implements Runnable {
+    private static final String TAG = HumlaNetworkThread.class.getName();
 
     private ExecutorService mExecutor;
     private ExecutorService mSendExecutor;
@@ -58,7 +57,7 @@ public abstract class HumlaNetworkThread implements Runnable {
     protected void stopThreads() {
         if (!mInitialized) {
             // TODO? Used throw, like startThreads()
-            Log.e(Constants.TAG, "Error in stopThreads: Threads already shutdown");
+            Log.e(TAG, "Error in stopThreads: Threads already shutdown");
             return;
         }
         mSendExecutor.shutdown();
diff --git a/src/main/java/se/lublin/humla/net/HumlaSSLSocketFactory.java b/src/main/java/se/lublin/humla/net/HumlaSSLSocketFactory.java
index 5907cfa..0a66727 100644
--- a/src/main/java/se/lublin/humla/net/HumlaSSLSocketFactory.java
+++ b/src/main/java/se/lublin/humla/net/HumlaSSLSocketFactory.java
@@ -41,9 +41,9 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
 
-import se.lublin.humla.Constants;
-
 public class HumlaSSLSocketFactory {
+    private static final String TAG = HumlaSSLSocketFactory.class.getName();
+
     private SSLContext mContext;
     private HumlaTrustManagerWrapper mTrustWrapper;
 
@@ -61,10 +61,10 @@ public class HumlaSSLSocketFactory {
             TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
             tmf.init(trustStore);
             mTrustWrapper = new HumlaTrustManagerWrapper((X509TrustManager) tmf.getTrustManagers()[0]);
-            Log.i(Constants.TAG, "Using custom trust store " + trustStorePath + " with system trust store");
+            Log.i(TAG, "Using custom trust store " + trustStorePath + " with system trust store");
         } else {
             mTrustWrapper = new HumlaTrustManagerWrapper(null);
-            Log.i(Constants.TAG, "Using system trust store");
+            Log.i(TAG, "Using system trust store");
         }
 
         mContext.init(kmf.getKeyManagers(), new TrustManager[] { mTrustWrapper }, null);
diff --git a/src/main/java/se/lublin/humla/net/HumlaTCP.java b/src/main/java/se/lublin/humla/net/HumlaTCP.java
index 1dc77ba..b0e497c 100644
--- a/src/main/java/se/lublin/humla/net/HumlaTCP.java
+++ b/src/main/java/se/lublin/humla/net/HumlaTCP.java
@@ -40,7 +40,7 @@ import se.lublin.humla.util.HumlaException;
  * Parses Mumble protobuf packets according to the Mumble protocol specification.
  */
 public class HumlaTCP extends HumlaNetworkThread {
-    private final static String TAG = HumlaTCP.class.getName();
+    private static final String TAG = HumlaTCP.class.getName();
     private final HumlaSSLSocketFactory mSocketFactory;
     private String mHost;
     private int mPort;
diff --git a/src/main/java/se/lublin/humla/net/HumlaUDP.java b/src/main/java/se/lublin/humla/net/HumlaUDP.java
index 37807de..91713fe 100644
--- a/src/main/java/se/lublin/humla/net/HumlaUDP.java
+++ b/src/main/java/se/lublin/humla/net/HumlaUDP.java
@@ -33,14 +33,12 @@ 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.
  */
 public class HumlaUDP implements Runnable {
-    private static final String TAG = "HumlaUDP";
+    private static final String TAG = HumlaUDP.class.getName();
 
     private static final int BUFFER_SIZE = 2048;
     private final CryptState mCryptState;
@@ -143,7 +141,7 @@ public class HumlaUDP implements Runnable {
                         }
                     }
                 } catch (BadPaddingException | IllegalBlockSizeException | ShortBufferException e) {
-                    Log.d(Constants.TAG, "Discarding packet", e);
+                    Log.d(TAG, "Discarding packet", e);
                 }
             }
         } catch (final IOException e) {
diff --git a/src/main/java/se/lublin/humla/protocol/AudioHandler.java b/src/main/java/se/lublin/humla/protocol/AudioHandler.java
index 716211b..75031fb 100644
--- a/src/main/java/se/lublin/humla/protocol/AudioHandler.java
+++ b/src/main/java/se/lublin/humla/protocol/AudioHandler.java
@@ -21,7 +21,6 @@ import android.content.Context;
 import android.media.AudioManager;
 import android.util.Log;
 
-import se.lublin.humla.Constants;
 import se.lublin.humla.R;
 import se.lublin.humla.audio.AudioInput;
 import se.lublin.humla.audio.AudioOutput;
@@ -53,6 +52,8 @@ import se.lublin.humla.util.HumlaNetworkListener;
  * Created by andrew on 23/04/14.
  */
 public class AudioHandler extends HumlaNetworkListener implements AudioInput.AudioInputListener {
+    private static final String TAG = AudioHandler.class.getName();
+
     public static final int SAMPLE_RATE = 48000;
     public static final int FRAME_SIZE = SAMPLE_RATE/100;
     public static final int MAX_BUFFER_SIZE = 960;
@@ -207,7 +208,7 @@ public class AudioHandler extends HumlaNetworkListener implements AudioInput.Aud
         }
 
         if (codec == null) {
-            Log.w(Constants.TAG, "AudioHandler setCodec(null) Input disabled.");
+            Log.w(TAG, "setCodec(null) Input disabled.");
             return;
         }
 
@@ -225,7 +226,7 @@ public class AudioHandler extends HumlaNetworkListener implements AudioInput.Aud
                         MAX_BUFFER_SIZE);
                 break;
             default:
-                Log.w(Constants.TAG, "Unsupported codec, input disabled.");
+                Log.w(TAG, "Unsupported codec, input disabled.");
                 return;
         }
 
diff --git a/src/main/java/se/lublin/humla/protocol/ModelHandler.java b/src/main/java/se/lublin/humla/protocol/ModelHandler.java
index 9b88d49..d79e0ef 100644
--- a/src/main/java/se/lublin/humla/protocol/ModelHandler.java
+++ b/src/main/java/se/lublin/humla/protocol/ModelHandler.java
@@ -28,7 +28,6 @@ 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;
@@ -44,6 +43,8 @@ import se.lublin.humla.util.MessageFormatter;
  * Created by andrew on 18/07/13.
  */
 public class ModelHandler extends HumlaTCPMessageListener.Stub {
+    private static final String TAG = ModelHandler.class.getName();
+
     private final Context mContext;
     private final Map<Integer, Channel> mChannels;
     private final Map<Integer, User> mUsers;
@@ -334,7 +335,7 @@ public class ModelHandler extends HumlaTCPMessageListener.Stub {
         if(msg.hasChannelId()) {
             final Channel channel = mChannels.get(msg.getChannelId());
             if(channel == null) {
-                Log.e(Constants.TAG, "Invalid channel for user!");
+                Log.e(TAG, "Invalid channel for user!");
                 return; // TODO handle better
             }
             final Channel old = user.getChannel();