From db33272fdc3c3ffa1df867b032c6cde6d3f68f39 Mon Sep 17 00:00:00 2001
From: xynngh <xynngh@protonmail.com>
Date: Thu, 10 Sep 2020 17:21:27 +0400
Subject: [PATCH] Properly quote numbers in logs

---
 .../yetanothercallblocker/CallMonitoringService.java     | 3 ++-
 .../dummydomain/yetanothercallblocker/CallReceiver.java  | 4 +++-
 .../yetanothercallblocker/PhoneStateHandler.java         | 7 ++++---
 .../yetanothercallblocker/utils/StringUtils.java         | 9 +++++++++
 4 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/dummydomain/yetanothercallblocker/utils/StringUtils.java

diff --git a/app/src/main/java/dummydomain/yetanothercallblocker/CallMonitoringService.java b/app/src/main/java/dummydomain/yetanothercallblocker/CallMonitoringService.java
index eab7c9a..1ea821d 100644
--- a/app/src/main/java/dummydomain/yetanothercallblocker/CallMonitoringService.java
+++ b/app/src/main/java/dummydomain/yetanothercallblocker/CallMonitoringService.java
@@ -17,6 +17,7 @@ import org.slf4j.LoggerFactory;
 
 import dummydomain.yetanothercallblocker.data.YacbHolder;
 
+import static dummydomain.yetanothercallblocker.utils.StringUtils.quote;
 import static java.util.Objects.requireNonNull;
 
 public class CallMonitoringService extends Service {
@@ -125,7 +126,7 @@ public class CallMonitoringService extends Service {
 
         @Override
         public void onCallStateChanged(int state, String phoneNumber) {
-            LOG.info("onCallStateChanged({}, \"{}\")", state, phoneNumber);
+            LOG.info("onCallStateChanged({}, {})", state, quote(phoneNumber));
 
             /*
              * According to docs, an empty string may be passed if the app lacks permissions.
diff --git a/app/src/main/java/dummydomain/yetanothercallblocker/CallReceiver.java b/app/src/main/java/dummydomain/yetanothercallblocker/CallReceiver.java
index 87c7454..a231251 100644
--- a/app/src/main/java/dummydomain/yetanothercallblocker/CallReceiver.java
+++ b/app/src/main/java/dummydomain/yetanothercallblocker/CallReceiver.java
@@ -11,6 +11,8 @@ import org.slf4j.LoggerFactory;
 
 import dummydomain.yetanothercallblocker.data.YacbHolder;
 
+import static dummydomain.yetanothercallblocker.utils.StringUtils.quote;
+
 public class CallReceiver extends BroadcastReceiver {
 
     private static final Logger LOG = LoggerFactory.getLogger(CallReceiver.class);
@@ -43,7 +45,7 @@ public class CallReceiver extends BroadcastReceiver {
         String incomingNumber = intent.getStringExtra(extraIncomingNumber);
         boolean hasNumberExtra = intent.hasExtra(extraIncomingNumber);
         LOG.info("onReceive() extraState={}, incomingNumber={}, hasNumberExtra={}",
-                telephonyExtraState, incomingNumber, hasNumberExtra);
+                telephonyExtraState, quote(incomingNumber), hasNumberExtra);
 
         extraLogging(intent); // TODO: make optional or remove
 
diff --git a/app/src/main/java/dummydomain/yetanothercallblocker/PhoneStateHandler.java b/app/src/main/java/dummydomain/yetanothercallblocker/PhoneStateHandler.java
index 9d71944..74ef056 100644
--- a/app/src/main/java/dummydomain/yetanothercallblocker/PhoneStateHandler.java
+++ b/app/src/main/java/dummydomain/yetanothercallblocker/PhoneStateHandler.java
@@ -20,6 +20,7 @@ import dummydomain.yetanothercallblocker.event.CallOngoingEvent;
 import dummydomain.yetanothercallblocker.utils.PhoneUtils;
 
 import static dummydomain.yetanothercallblocker.EventUtils.postEvent;
+import static dummydomain.yetanothercallblocker.utils.StringUtils.quote;
 
 public class PhoneStateHandler {
 
@@ -51,7 +52,7 @@ public class PhoneStateHandler {
     }
 
     public void onRinging(Source source, String phoneNumber) {
-        LOG.debug("onRinging({}, \"{}\")", source, phoneNumber);
+        LOG.debug("onRinging({}, {})", source, quote(phoneNumber));
 
         boolean ignore = false;
 
@@ -117,7 +118,7 @@ public class PhoneStateHandler {
     }
 
     public void onOffHook(Source source, String phoneNumber) {
-        LOG.debug("onOffHook({}, \"{}\")", source, phoneNumber);
+        LOG.debug("onOffHook({}, {})", source, quote(phoneNumber));
 
         isOffHook = true;
 
@@ -125,7 +126,7 @@ public class PhoneStateHandler {
     }
 
     public void onIdle(Source source, String phoneNumber) {
-        LOG.debug("onIdle({}, \"{}\")", source, phoneNumber);
+        LOG.debug("onIdle({}, {})", source, quote(phoneNumber));
 
         isOffHook = false;
 
diff --git a/app/src/main/java/dummydomain/yetanothercallblocker/utils/StringUtils.java b/app/src/main/java/dummydomain/yetanothercallblocker/utils/StringUtils.java
new file mode 100644
index 0000000..77b5884
--- /dev/null
+++ b/app/src/main/java/dummydomain/yetanothercallblocker/utils/StringUtils.java
@@ -0,0 +1,9 @@
+package dummydomain.yetanothercallblocker.utils;
+
+public class StringUtils {
+
+    public static String quote(String s) {
+        return s == null ? null : '"' + s + '"';
+    }
+
+}