From 17ba7645183478fa846af3b4bd597a0ff88f59aa Mon Sep 17 00:00:00 2001
From: sim <git@sgougeon.fr>
Date: Tue, 20 Sep 2022 01:38:56 +0200
Subject: [PATCH] Remove tokens from logs

---
 .../unifiedpush/distributor/nextpush/api/ApiUtils.kt   | 10 +++++-----
 .../nextpush/distributor/DistributorUtils.kt           |  2 +-
 .../nextpush/receivers/RegisterBroadcastReceiver.kt    |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/unifiedpush/distributor/nextpush/api/ApiUtils.kt b/app/src/main/java/org/unifiedpush/distributor/nextpush/api/ApiUtils.kt
index 879bd25..0fb8c41 100644
--- a/app/src/main/java/org/unifiedpush/distributor/nextpush/api/ApiUtils.kt
+++ b/app/src/main/java/org/unifiedpush/distributor/nextpush/api/ApiUtils.kt
@@ -84,10 +84,10 @@ object ApiUtils {
                     }
 
                     override fun onNext(response: ApiResponse) {
-                        val deviceIdentifier: String = response.deviceId
-                        Log.d(TAG, "Device Identifier: $deviceIdentifier")
-                        saveDeviceId(context, deviceIdentifier)
-                        deviceId = deviceIdentifier
+                        response.deviceId.let {
+                            saveDeviceId(context, it)
+                            deviceId = it
+                        }
                     }
 
                     override fun onError(e: Throwable) {
@@ -105,7 +105,7 @@ object ApiUtils {
                 })
         } else {
             // Sync directly
-            Log.d(TAG, "Found deviceId: $deviceId")
+            Log.d(TAG, "Found saved deviceId")
             deviceId?.let {
                 cSync(context, it)
             }
diff --git a/app/src/main/java/org/unifiedpush/distributor/nextpush/distributor/DistributorUtils.kt b/app/src/main/java/org/unifiedpush/distributor/nextpush/distributor/DistributorUtils.kt
index 822ecd4..60741a5 100644
--- a/app/src/main/java/org/unifiedpush/distributor/nextpush/distributor/DistributorUtils.kt
+++ b/app/src/main/java/org/unifiedpush/distributor/nextpush/distributor/DistributorUtils.kt
@@ -89,7 +89,7 @@ object DistributorUtils {
         val db = getDb(context)
         val app = db.getPackageName(connectorToken)
         return if (app.isBlank()) {
-            Log.w(TAG, "No app found for $connectorToken")
+            Log.w(TAG, "No app found for this token")
             null
         } else {
             app
diff --git a/app/src/main/java/org/unifiedpush/distributor/nextpush/receivers/RegisterBroadcastReceiver.kt b/app/src/main/java/org/unifiedpush/distributor/nextpush/receivers/RegisterBroadcastReceiver.kt
index 0572171..15010ed 100644
--- a/app/src/main/java/org/unifiedpush/distributor/nextpush/receivers/RegisterBroadcastReceiver.kt
+++ b/app/src/main/java/org/unifiedpush/distributor/nextpush/receivers/RegisterBroadcastReceiver.kt
@@ -76,7 +76,7 @@ class RegisterBroadcastReceiver : BroadcastReceiver() {
                                 sendEndpoint(context.applicationContext, connectorToken)
                             }
                         } else {
-                            Log.d(TAG, "Already registering $connectorToken")
+                            Log.d(TAG, "Already registering this token")
                         }
                     }
                 }
@@ -101,7 +101,7 @@ class RegisterBroadcastReceiver : BroadcastReceiver() {
                         Log.d(TAG, "Could not delete app")
                     }
                 } else {
-                    Log.d(TAG, "Already deleting $connectorToken")
+                    Log.d(TAG, "Already deleting this token")
                 }
             }
         }