From 87a4cfb27cce49323920dc105a2042531f9862d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sun, 24 Apr 2016 15:06:11 +0100
Subject: [PATCH] Get rid of Log.d calls in src/main

Also, Log.d in tests don't make much sense - replace by Log.i. This way
it's easier to limit all Log.d calls to Utils.java.
---
 .../java/org/fdroid/fdroid/MultiRepoUpdaterTest.java      | 4 ++--
 app/src/androidTest/java/org/fdroid/fdroid/TestUtils.java | 2 +-
 .../main/java/org/fdroid/fdroid/data/RepoPersister.java   | 3 +--
 .../org/fdroid/fdroid/installer/ApkSignatureVerifier.java | 8 ++++----
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/src/androidTest/java/org/fdroid/fdroid/MultiRepoUpdaterTest.java b/app/src/androidTest/java/org/fdroid/fdroid/MultiRepoUpdaterTest.java
index 7d0364623..ad72da4df 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/MultiRepoUpdaterTest.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/MultiRepoUpdaterTest.java
@@ -160,7 +160,7 @@ public class MultiRepoUpdaterTest extends InstrumentationTestCase {
      * repository indeed contains the apks that it said it would provide.
      */
     private void assertExpected() {
-        Log.d(TAG, "Asserting all versions of each .apk are in index.");
+        Log.i(TAG, "Asserting all versions of each .apk are in index.");
         List<Repo> repos = RepoProvider.Helper.all(context);
         assertEquals("Repos", 3, repos.size());
 
@@ -173,7 +173,7 @@ public class MultiRepoUpdaterTest extends InstrumentationTestCase {
      *
      */
     private void assertSomewhatAcceptable() {
-        Log.d(TAG, "Asserting at least one versions of each .apk is in index.");
+        Log.i(TAG, "Asserting at least one versions of each .apk is in index.");
         List<Repo> repos = RepoProvider.Helper.all(context);
         assertEquals("Repos", 3, repos.size());
 
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/TestUtils.java b/app/src/androidTest/java/org/fdroid/fdroid/TestUtils.java
index 7b6fc2abf..62e90189b 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/TestUtils.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/TestUtils.java
@@ -200,7 +200,7 @@ public class TestUtils {
         OutputStream output = null;
         try {
             tempFile = File.createTempFile(assetName + "-", ".testasset", directory);
-            Log.d(TAG, "Copying asset file " + assetName + " to directory " + directory);
+            Log.i(TAG, "Copying asset file " + assetName + " to directory " + directory);
             input = context.getAssets().open(assetName);
             output = new FileOutputStream(tempFile);
             Utils.copy(input, output);
diff --git a/app/src/main/java/org/fdroid/fdroid/data/RepoPersister.java b/app/src/main/java/org/fdroid/fdroid/data/RepoPersister.java
index ca05dd631..2138f8575 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/RepoPersister.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/RepoPersister.java
@@ -8,7 +8,6 @@ import android.net.Uri;
 import android.os.RemoteException;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.util.Log;
 
 import org.fdroid.fdroid.CompatibilityChecker;
 import org.fdroid.fdroid.RepoUpdater;
@@ -99,7 +98,7 @@ public class RepoPersister {
         }
 
         if (apksToSave.size() > 0 || appsToSave.size() > 0) {
-            Log.d(TAG, "Flushing details of up to " + MAX_APP_BUFFER + " apps and their packages to the database.");
+            Utils.debugLog(TAG, "Flushing details of up to " + MAX_APP_BUFFER + " apps and their packages to the database.");
             flushAppsToDbInBatch();
             flushApksToDbInBatch();
             apksToSave.clear();
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/ApkSignatureVerifier.java b/app/src/main/java/org/fdroid/fdroid/installer/ApkSignatureVerifier.java
index c13049956..27b6aeb3f 100644
--- a/app/src/main/java/org/fdroid/fdroid/installer/ApkSignatureVerifier.java
+++ b/app/src/main/java/org/fdroid/fdroid/installer/ApkSignatureVerifier.java
@@ -24,8 +24,8 @@ import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.Signature;
-import android.util.Log;
 
+import org.fdroid.fdroid.Utils;
 import org.spongycastle.util.encoders.Hex;
 
 import java.io.ByteArrayOutputStream;
@@ -58,9 +58,9 @@ public class ApkSignatureVerifier {
             return true;
         }
 
-        Log.d(TAG, "Signature mismatch!");
-        Log.d(TAG, "APK sig: " + Hex.toHexString(getApkSignature(apkFile)));
-        Log.d(TAG, "F-Droid sig: " + Hex.toHexString(getFDroidSignature()));
+        Utils.debugLog(TAG, "Signature mismatch!");
+        Utils.debugLog(TAG, "APK sig: " + Hex.toHexString(getApkSignature(apkFile)));
+        Utils.debugLog(TAG, "F-Droid sig: " + Hex.toHexString(getFDroidSignature()));
         return false;
     }