From 802c0a7617a623ac1f028f1a41368536629bce65 Mon Sep 17 00:00:00 2001
From: osm0sis <osm0sis@outlook.com>
Date: Mon, 15 Jan 2024 17:11:55 -0400
Subject: [PATCH] Improve logging messages further

---
 app/src/main/cpp/main.cpp                          | 14 +++++++-------
 .../es/chiteroman/playintegrityfix/EntryPoint.java |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/cpp/main.cpp b/app/src/main/cpp/main.cpp
index 330d71e..2d03402 100644
--- a/app/src/main/cpp/main.cpp
+++ b/app/src/main/cpp/main.cpp
@@ -189,12 +189,12 @@ private:
 
         std::vector<std::string> eraseKeys;
         for (auto &jsonList: json.items()) {
-            if (VERBOSE_LOGS > 1) LOGD("Parsing %s...", jsonList.key().c_str());
+            if (VERBOSE_LOGS > 1) LOGD("Parsing %s", jsonList.key().c_str());
             if (jsonList.key().find_first_of("*.") != std::string::npos) {
                 // Name contains . or * (wildcard) so assume real property name
                 if (!jsonList.value().is_null() && jsonList.value().is_string()) {
                     if (jsonList.value() == "") {
-                        LOGD("%s is empty, skipping...", jsonList.key().c_str());
+                        LOGD("%s is empty, skipping", jsonList.key().c_str());
                     } else {
                         if (VERBOSE_LOGS > 0) LOGD("Adding '%s' to properties list", jsonList.key().c_str());
                         jsonProps[jsonList.key()] = jsonList.value();
@@ -212,30 +212,30 @@ private:
     }
 
     void inject() {
-        LOGD("JNI: Get system classloader");
+        LOGD("JNI: Getting system classloader");
         auto clClass = env->FindClass("java/lang/ClassLoader");
         auto getSystemClassLoader = env->GetStaticMethodID(clClass, "getSystemClassLoader", "()Ljava/lang/ClassLoader;");
         auto systemClassLoader = env->CallStaticObjectMethod(clClass, getSystemClassLoader);
 
-        LOGD("JNI: Create class loader");
+        LOGD("JNI: Creating class loader");
         auto dexClClass = env->FindClass("dalvik/system/InMemoryDexClassLoader");
         auto dexClInit = env->GetMethodID(dexClClass, "<init>", "(Ljava/nio/ByteBuffer;Ljava/lang/ClassLoader;)V");
         auto buffer = env->NewDirectByteBuffer(dexVector.data(), static_cast<jlong>(dexVector.size()));
         auto dexCl = env->NewObject(dexClClass, dexClInit, buffer, systemClassLoader);
 
-        LOGD("JNI: Load class");
+        LOGD("JNI: Loading class");
         auto loadClass = env->GetMethodID(clClass, "loadClass", "(Ljava/lang/String;)Ljava/lang/Class;");
         auto entryClassName = env->NewStringUTF("es.chiteroman.playintegrityfix.EntryPoint");
         auto entryClassObj = env->CallObjectMethod(dexCl, loadClass, entryClassName);
 
         auto entryClass = (jclass) entryClassObj;
 
-        LOGD("JNI: Send JSON");
+        LOGD("JNI: Sending JSON");
         auto receiveJson = env->GetStaticMethodID(entryClass, "receiveJson", "(Ljava/lang/String;)V");
         auto javaStr = env->NewStringUTF(json.dump().c_str());
         env->CallStaticVoidMethod(entryClass, receiveJson, javaStr);
 
-        LOGD("JNI: Call init");
+        LOGD("JNI: Calling init");
         auto entryInit = env->GetStaticMethodID(entryClass, "init", "(I)V");
         env->CallStaticVoidMethod(entryClass, entryInit, VERBOSE_LOGS);
     }
diff --git a/app/src/main/java/es/chiteroman/playintegrityfix/EntryPoint.java b/app/src/main/java/es/chiteroman/playintegrityfix/EntryPoint.java
index 0c15264..6b5f948 100644
--- a/app/src/main/java/es/chiteroman/playintegrityfix/EntryPoint.java
+++ b/app/src/main/java/es/chiteroman/playintegrityfix/EntryPoint.java
@@ -83,7 +83,7 @@ public final class EntryPoint {
 
     private static void setField(String name, String value) {
         if (value.isEmpty()) {
-            LOG(String.format("%s is empty, skipping...", name));
+            LOG(String.format("%s is empty, skipping", name));
             return;
         }