From 1a7c5103d1b16ca17f3cb0d53ee11971ceb2c035 Mon Sep 17 00:00:00 2001 From: osm0sis Date: Wed, 7 Feb 2024 22:53:13 -0400 Subject: [PATCH] verbose_logs is now verboseLogs - differentiate all the ways from a BUILD_FIELD_ENTRY and a system.property_entry - probably better this way in the long run --- app/src/main/cpp/main.cpp | 12 ++++++------ module/migrate.sh | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/cpp/main.cpp b/app/src/main/cpp/main.cpp index 253cd92..845ab72 100644 --- a/app/src/main/cpp/main.cpp +++ b/app/src/main/cpp/main.cpp @@ -184,15 +184,15 @@ private: void readJson() { LOGD("JSON contains %d keys!", static_cast(json.size())); - // Verbose logging if verbose_logs with level number is present - if (json.contains("verbose_logs")) { - if (!json["verbose_logs"].is_null() && json["verbose_logs"].is_string() && json["verbose_logs"] != "") { - verboseLogs = stoi(json["verbose_logs"].get()); + // Verbose logging if verboseLogs with level number is present + if (json.contains("verboseLogs")) { + if (!json["verboseLogs"].is_null() && json["verboseLogs"].is_string() && json["verboseLogs"] != "") { + verboseLogs = stoi(json["verboseLogs"].get()); if (verboseLogs > 0) LOGD("Verbose logging (level %d) enabled!", verboseLogs); } else { - LOGD("Error parsing verbose_logs!"); + LOGD("Error parsing verboseLogs!"); } - json.erase("verbose_logs"); + json.erase("verboseLogs"); } std::vector eraseKeys; diff --git a/module/migrate.sh b/module/migrate.sh index c144b95..f2e0eb0 100644 --- a/module/migrate.sh +++ b/module/migrate.sh @@ -119,7 +119,7 @@ echo ' "*.security_patch": "'$SECURITY_PATCH'",'; echo ' "*api_level": "'$DEVICE_INITIAL_SDK_INT'",'; if [ "$ADVANCED" ]; then echo "$N // Advanced Settings"; - echo ' "verbose_logs": "0",'; + echo ' "verboseLogs": "0",'; fi) | sed '$s/,/\n}/' > "$DIR/custom.pif.json"; [ "$INSTALL" ] || cat "$DIR/custom.pif.json";