diff --git a/app/src/main/cpp/main.cpp b/app/src/main/cpp/main.cpp index 513c860..a190b8d 100644 --- a/app/src/main/cpp/main.cpp +++ b/app/src/main/cpp/main.cpp @@ -178,8 +178,9 @@ private: void readJson() { LOGD("JSON contains %d keys!", static_cast(json.size())); + // Verbose logging if VERBOSE_LOGS with level number is last entry if (json.contains("VERBOSE_LOGS")) { - if (!json["VERBOSE_LOGS"].is_null() && json["VERBOSE_LOGS"].is_string()) { + if (!json["VERBOSE_LOGS"].is_null() && json["VERBOSE_LOGS"].is_string() && json["VERBOSE_LOGS"] != "") { VERBOSE_LOGS = stoi(json["VERBOSE_LOGS"].get()); if (VERBOSE_LOGS > 0) LOGD("Verbose logging (level %d) enabled!", VERBOSE_LOGS); } else { @@ -187,23 +188,6 @@ private: } } - // Backwards compatibility for chiteroman's alternate API naming - if (json.contains("FIRST_API_LEVEL")) { - if (!json["FIRST_API_LEVEL"].is_null() && json["FIRST_API_LEVEL"].is_string()) { - if (json["FIRST_API_LEVEL"] == "") { - LOGD("FIRST_API_LEVEL is empty, skipping..."); - json.erase("FIRST_API_LEVEL"); - } else { - LOGD("Using deprecated 'FIRST_API_LEVEL' field for '*.first_api_level' direct property spoofing..."); - if (VERBOSE_LOGS > 0) LOGD("Adding '*.first_api_level' to properties list"); - jsonProps["*.first_api_level"] = json["FIRST_API_LEVEL"].get(); - } - } else { - LOGD("Error parsing FIRST_API_LEVEL!"); - json.erase("FIRST_API_LEVEL"); - } - } - std::vector eraseKeys; for (auto &jsonList: json.items()) { if (VERBOSE_LOGS > 1) LOGD("Parsing %s...", jsonList.key().c_str()); diff --git a/app/src/main/java/es/chiteroman/playintegrityfix/EntryPoint.java b/app/src/main/java/es/chiteroman/playintegrityfix/EntryPoint.java index 088bdc6..2d5e18c 100644 --- a/app/src/main/java/es/chiteroman/playintegrityfix/EntryPoint.java +++ b/app/src/main/java/es/chiteroman/playintegrityfix/EntryPoint.java @@ -71,9 +71,6 @@ public final class EntryPoint { // Verbose logging if VERBOSE_LOGS with level number is last entry if (key.equals("VERBOSE_LOGS")) { verboseLogs = Integer.parseInt(map.get("VERBOSE_LOGS")); - // Backwards compatibility for chiteroman's alternate API naming - } else if (key.equals("FIRST_API_LEVEL")) { - setField("DEVICE_INITIAL_SDK_INT", map.get("FIRST_API_LEVEL")); } else { setField(key, map.get(key)); }