From 8cc262badeb4f47647a0336f8f0b4a38ef0627ed Mon Sep 17 00:00:00 2001
From: Daniel Lublin <daniel@lublin.se>
Date: Tue, 14 Apr 2020 01:55:34 +0200
Subject: Prefer Log message

---
 app/src/main/java/se/lublin/mumla/Settings.java             | 4 +++-
 app/src/main/java/se/lublin/mumla/app/MumlaActivity.java    | 9 +++++----
 app/src/main/java/se/lublin/mumla/service/MumlaService.java | 3 +++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/se/lublin/mumla/Settings.java b/app/src/main/java/se/lublin/mumla/Settings.java
index c4a0713..933aea0 100644
--- a/app/src/main/java/se/lublin/mumla/Settings.java
+++ b/app/src/main/java/se/lublin/mumla/Settings.java
@@ -43,6 +43,8 @@ import se.lublin.humla.Constants;
 import se.lublin.mumla.db.DatabaseCertificate;
 import se.lublin.mumla.db.MumlaSQLiteDatabase;
 
+import static se.lublin.mumla.Constants.TAG;
+
 /**
  * Singleton settings class for universal access to the app's preferences.
  * @author morlunk
@@ -189,7 +191,7 @@ public class Settings {
             String certPath = preferences.getString(PREF_CERT_DEPRECATED, "");
             String certPassword = preferences.getString(PREF_CERT_PASSWORD_DEPRECATED, "");
 
-            Log.d(se.lublin.mumla.Constants.TAG, "Migrating certificate from " + certPath);
+            Log.d(TAG, "Migrating certificate from " + certPath);
             try {
                 File certFile = new File(certPath);
                 FileInputStream certInput = new FileInputStream(certFile);
diff --git a/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java b/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java
index 7879db4..916da05 100644
--- a/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java
+++ b/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java
@@ -79,7 +79,6 @@ import se.lublin.humla.util.HumlaException;
 import se.lublin.humla.util.HumlaObserver;
 import se.lublin.humla.util.MumbleURLParser;
 import se.lublin.mumla.BuildConfig;
-import se.lublin.mumla.Constants;
 import se.lublin.mumla.R;
 import se.lublin.mumla.Settings;
 import se.lublin.mumla.channel.AccessTokenFragment;
@@ -101,6 +100,8 @@ import se.lublin.mumla.util.HumlaServiceFragment;
 import se.lublin.mumla.util.HumlaServiceProvider;
 import se.lublin.mumla.util.MumlaTrustStore;
 
+import static se.lublin.mumla.Constants.TAG;
+
 public class MumlaActivity extends AppCompatActivity implements ListView.OnItemClickListener,
         FavouriteServerListFragment.ServerConnectHandler, HumlaServiceProvider, DatabaseProvider,
         SharedPreferences.OnSharedPreferenceChangeListener, DrawerAdapter.DrawerDataProvider,
@@ -602,7 +603,7 @@ public class MumlaActivity extends AppCompatActivity implements ListView.OnItemC
                         socket.close();
                         open.set(true);
                     } catch (Exception e) {
-                        e.printStackTrace();
+                        Log.d(TAG, "isPortOpen() run()" + e);
                     }
                 }
             });
@@ -611,7 +612,7 @@ public class MumlaActivity extends AppCompatActivity implements ListView.OnItemC
             return open.get();
         }
         catch (Exception e) {
-            e.printStackTrace();
+            Log.d(TAG, "isPortOpen() " + e);
         }
         return false;
     }
@@ -625,7 +626,7 @@ public class MumlaActivity extends AppCompatActivity implements ListView.OnItemC
                 if (mServerPendingPerm != null) {
                     connectToServer(mServerPendingPerm);
                 } else {
-                    Log.w(Constants.TAG, "No pending server after permission was granted");
+                    Log.w(TAG, "No pending server after permission was granted");
                 }
             } else {
                 Toast.makeText(MumlaActivity.this, getString(R.string.grant_perm_microphone),
diff --git a/app/src/main/java/se/lublin/mumla/service/MumlaService.java b/app/src/main/java/se/lublin/mumla/service/MumlaService.java
index 95a2731..08816d1 100644
--- a/app/src/main/java/se/lublin/mumla/service/MumlaService.java
+++ b/app/src/main/java/se/lublin/mumla/service/MumlaService.java
@@ -30,6 +30,7 @@ import android.os.IBinder;
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
 import android.speech.tts.TextToSpeech;
+import android.util.Log;
 import android.view.WindowManager;
 import android.widget.Toast;
 
@@ -56,6 +57,8 @@ import se.lublin.mumla.Settings;
 import se.lublin.mumla.service.ipc.TalkBroadcastReceiver;
 import se.lublin.mumla.util.HtmlUtils;
 
+import static se.lublin.mumla.Constants.TAG;
+
 /**
  * An extension of the Humla service with some added Mumla-exclusive non-standard Mumble features.
  * Created by andrew on 28/07/13.
-- 
cgit v1.2.3