Improve minApi and maxApi props handling.

pull/27/head
Fox2Code 3 years ago
parent 535fdd8ae3
commit 6256de1cda

@ -92,7 +92,7 @@ public class PropUtils {
String name, boolean local) throws IOException { String name, boolean local) throws IOException {
boolean readId = false, readIdSec = false, readName = false, boolean readId = false, readIdSec = false, readName = false,
readVersionCode = false, readVersion = false, readDescription = false, readVersionCode = false, readVersion = false, readDescription = false,
readUpdateJson = false, invalid = false; readUpdateJson = false, invalid = false, readMinApi = false, readMaxApi = false;
try (BufferedReader bufferedReader = new BufferedReader( try (BufferedReader bufferedReader = new BufferedReader(
new InputStreamReader(inputStream, StandardCharsets.UTF_8))) { new InputStreamReader(inputStream, StandardCharsets.UTF_8))) {
String line; String line;
@ -214,26 +214,25 @@ public class PropUtils {
moduleInfo.minMagisk = 0; moduleInfo.minMagisk = 0;
} }
break; break;
case "minSdkVersion": // Improve compatibility
case "minApi": case "minApi":
// Special case for Riru EdXposed because // Special case for Riru EdXposed because
// minApi don't mean the same thing for them // minApi don't mean the same thing for them
if (moduleInfo.id.equals("riru_edxposed") && if ("10".equals(value)) break;
"10".equals(value)) { case "minSdkVersion": // Improve compatibility
break;
}
try { try {
moduleInfo.minApi = Integer.parseInt(value); moduleInfo.minApi = Integer.parseInt(value);
readMinApi = true;
} catch (Exception e) { } catch (Exception e) {
moduleInfo.minApi = 0; if (!readMinApi) moduleInfo.minApi = 0;
} }
break; break;
case "maxSdkVersion": // Improve compatibility case "maxSdkVersion": // Improve compatibility
case "maxApi": case "maxApi":
try { try {
moduleInfo.maxApi = Integer.parseInt(value); moduleInfo.maxApi = Integer.parseInt(value);
readMaxApi = true;
} catch (Exception e) { } catch (Exception e) {
moduleInfo.maxApi = 0; if (!readMaxApi) moduleInfo.maxApi = 0;
} }
break; break;
} }
@ -272,7 +271,7 @@ public class PropUtils {
if (!readUpdateJson) { if (!readUpdateJson) {
moduleInfo.updateJson = moduleUpdateJsonFallbacks.get(moduleInfo.id); moduleInfo.updateJson = moduleUpdateJsonFallbacks.get(moduleInfo.id);
} }
if (moduleInfo.minApi == 0) { if (moduleInfo.minApi == 0 || !readMinApi) {
Integer minApiFallback = moduleMinApiFallbacks.get(moduleInfo.id); Integer minApiFallback = moduleMinApiFallbacks.get(moduleInfo.id);
if (minApiFallback != null) if (minApiFallback != null)
moduleInfo.minApi = minApiFallback; moduleInfo.minApi = minApiFallback;

Loading…
Cancel
Save