br0kenpixel/PlayIntegrityFork
1
0
Fork 0
mirror of https://github.com/osm0sis/PlayIntegrityFork.git synced 2025-09-06 06:37:06 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Remove remaining cross-fork API compatibility hacks

Browse Source
This commit is contained in:
osm0sis
2023-12-21 10:59:40 -04:00
parent dc10cae2b6
commit 89348bb75c
2 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/cpp/main.cpp
View File

@@ -178,8 +178,9 @@ private:
void readJson() { void readJson() {
LOGD("JSON contains %d keys!", static_cast<int>(json.size())); LOGD("JSON contains %d keys!", static_cast<int>(json.size()));
// Verbose logging if VERBOSE_LOGS with level number is last entry
if (json.contains("VERBOSE_LOGS")) { 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<std::string>()); VERBOSE_LOGS = stoi(json["VERBOSE_LOGS"].get<std::string>());
if (VERBOSE_LOGS > 0) LOGD("Verbose logging (level %d) enabled!", VERBOSE_LOGS); if (VERBOSE_LOGS > 0) LOGD("Verbose logging (level %d) enabled!", VERBOSE_LOGS);
} else { } 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<std::string>();
}
} else {
LOGD("Error parsing FIRST_API_LEVEL!");
json.erase("FIRST_API_LEVEL");
}
}
std::vector<std::string> eraseKeys; std::vector<std::string> eraseKeys;
for (auto &jsonList: json.items()) { 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());

3
app/src/main/java/es/chiteroman/playintegrityfix/EntryPoint.java
View File

@@ -71,9 +71,6 @@ public final class EntryPoint {
// Verbose logging if VERBOSE_LOGS with level number is last entry // Verbose logging if VERBOSE_LOGS with level number is last entry
if (key.equals("VERBOSE_LOGS")) { if (key.equals("VERBOSE_LOGS")) {
verboseLogs = Integer.parseInt(map.get("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 { } else {
setField(key, map.get(key)); setField(key, map.get(key));
} }