From 96014a736567130d8f335f5eb3b1f3dd891050a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 20 Aug 2015 18:37:25 -0700
Subject: [PATCH] Simplify debugging logging via Utils

---
 .../org/fdroid/fdroid/CompatibilityChecker.java  | 16 ++++++----------
 F-Droid/src/org/fdroid/fdroid/Preferences.java   |  4 +---
 F-Droid/src/org/fdroid/fdroid/Utils.java         | 12 ++++++++++++
 .../src/org/fdroid/fdroid/compat/FileCompat.java |  8 ++------
 .../fdroid/net/WifiStateChangeService.java       |  4 +---
 5 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/F-Droid/src/org/fdroid/fdroid/CompatibilityChecker.java b/F-Droid/src/org/fdroid/fdroid/CompatibilityChecker.java
index 40b159380..078681d62 100644
--- a/F-Droid/src/org/fdroid/fdroid/CompatibilityChecker.java
+++ b/F-Droid/src/org/fdroid/fdroid/CompatibilityChecker.java
@@ -47,7 +47,7 @@ public class CompatibilityChecker extends Compatibility {
                     for (FeatureInfo fi : pm.getSystemAvailableFeatures()) {
                         logMsg.append('\n').append(fi.name);
                     }
-                    Log.d(TAG, logMsg.toString());
+                    Utils.DebugLog(TAG, logMsg.toString());
                 }
                 for (FeatureInfo fi : pm.getSystemAvailableFeatures()) {
                     features.add(fi.name);
@@ -102,10 +102,8 @@ public class CompatibilityChecker extends Compatibility {
                 }
                 if (!features.contains(feat)) {
                     Collections.addAll(incompatibleReasons, feat.split(","));
-                    if (BuildConfig.DEBUG) {
-                        Log.d(TAG, apk.id + " vercode " + apk.vercode
-                                + " is incompatible based on lack of " + feat);
-                    }
+                    Utils.DebugLog(TAG, apk.id + " vercode " + apk.vercode
+                            + " is incompatible based on lack of " + feat);
                 }
             }
         }
@@ -113,11 +111,9 @@ public class CompatibilityChecker extends Compatibility {
             for (final String code : apk.nativecode) {
                 incompatibleReasons.add(code);
             }
-            if (BuildConfig.DEBUG) {
-                Log.d(TAG, apk.id + " vercode " + apk.vercode
-                        + " only supports " + Utils.CommaSeparatedList.str(apk.nativecode)
-                        + " while your architectures are " + cpuAbisDesc);
-            }
+            Utils.DebugLog(TAG, apk.id + " vercode " + apk.vercode
+                    + " only supports " + Utils.CommaSeparatedList.str(apk.nativecode)
+                    + " while your architectures are " + cpuAbisDesc);
         }
 
         return incompatibleReasons;
diff --git a/F-Droid/src/org/fdroid/fdroid/Preferences.java b/F-Droid/src/org/fdroid/fdroid/Preferences.java
index ede945a97..3e7027b84 100644
--- a/F-Droid/src/org/fdroid/fdroid/Preferences.java
+++ b/F-Droid/src/org/fdroid/fdroid/Preferences.java
@@ -258,9 +258,7 @@ public class Preferences implements SharedPreferences.OnSharedPreferenceChangeLi
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        if (BuildConfig.DEBUG) {
-            Log.d(TAG, "Invalidating preference '" + key + "'.");
-        }
+        Utils.DebugLog(TAG, "Invalidating preference '" + key + "'.");
         uninitialize(key);
 
         switch (key) {
diff --git a/F-Droid/src/org/fdroid/fdroid/Utils.java b/F-Droid/src/org/fdroid/fdroid/Utils.java
index a17f7a441..1444a602f 100644
--- a/F-Droid/src/org/fdroid/fdroid/Utils.java
+++ b/F-Droid/src/org/fdroid/fdroid/Utils.java
@@ -633,4 +633,16 @@ public final class Utils {
         }
     }
 
+    public static void DebugLog(String tag, String msg) {
+        if (BuildConfig.DEBUG) {
+            Log.d(tag, msg);
+        }
+    }
+
+    public static void DebugLog(String tag, String msg, Throwable tr) {
+        if (BuildConfig.DEBUG) {
+            Log.d(tag, msg, tr);
+        }
+    }
+
 }
diff --git a/F-Droid/src/org/fdroid/fdroid/compat/FileCompat.java b/F-Droid/src/org/fdroid/fdroid/compat/FileCompat.java
index ef2de0686..546fefed0 100644
--- a/F-Droid/src/org/fdroid/fdroid/compat/FileCompat.java
+++ b/F-Droid/src/org/fdroid/fdroid/compat/FileCompat.java
@@ -59,9 +59,7 @@ public class FileCompat extends Compatibility {
             dest.getAbsolutePath()
         };
         try {
-            if (BuildConfig.DEBUG) {
-                Log.d(TAG, "Executing command: " + commands[0] + " " + commands[1] + " " + commands[2]);
-            }
+            Utils.DebugLog(TAG, "Executing command: " + commands[0] + " " + commands[1] + " " + commands[2]);
             Process proc = Runtime.getRuntime().exec(commands);
             Utils.consumeStream(proc.getInputStream());
             Utils.consumeStream(proc.getErrorStream());
@@ -109,9 +107,7 @@ public class FileCompat extends Compatibility {
         };
 
         try {
-            if (BuildConfig.DEBUG) {
-                Log.d(TAG, "Executing following command: " + args[0] + " " + args[1] + " " + args[2]);
-            }
+            Utils.DebugLog(TAG, "Executing following command: " + args[0] + " " + args[1] + " " + args[2]);
             Process proc = Runtime.getRuntime().exec(args);
             Utils.consumeStream(proc.getInputStream());
             Utils.consumeStream(proc.getErrorStream());
diff --git a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java
index bb90e1af4..b7d18845d 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java
@@ -85,9 +85,7 @@ public class WifiStateChangeService extends Service {
                         FDroidApp.ipAddressString = getIpAddressFromNetworkInterface();
                     }
                     Thread.sleep(1000);
-                    if (BuildConfig.DEBUG) {
-                        Log.d(TAG, "waiting for an IP address...");
-                    }
+                    Utils.DebugLog(TAG, "waiting for an IP address...");
                 }
                 if (isCancelled())  // can be canceled by a change via WifiStateChangeReceiver
                     return null;