Skip to content
This repository was archived by the owner on May 4, 2023. It is now read-only.

Commit 6256de1

Browse files
committed
Improve minApi and maxApi props handling.
1 parent 535fdd8 commit 6256de1

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

app/src/main/java/com/fox2code/mmm/utils/PropUtils.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public static void readProperties(ModuleInfo moduleInfo, InputStream inputStream
9292
String name, boolean local) throws IOException {
9393
boolean readId = false, readIdSec = false, readName = false,
9494
readVersionCode = false, readVersion = false, readDescription = false,
95-
readUpdateJson = false, invalid = false;
95+
readUpdateJson = false, invalid = false, readMinApi = false, readMaxApi = false;
9696
try (BufferedReader bufferedReader = new BufferedReader(
9797
new InputStreamReader(inputStream, StandardCharsets.UTF_8))) {
9898
String line;
@@ -214,26 +214,25 @@ public static void readProperties(ModuleInfo moduleInfo, InputStream inputStream
214214
moduleInfo.minMagisk = 0;
215215
}
216216
break;
217-
case "minSdkVersion": // Improve compatibility
218217
case "minApi":
219218
// Special case for Riru EdXposed because
220219
// minApi don't mean the same thing for them
221-
if (moduleInfo.id.equals("riru_edxposed") &&
222-
"10".equals(value)) {
223-
break;
224-
}
220+
if ("10".equals(value)) break;
221+
case "minSdkVersion": // Improve compatibility
225222
try {
226223
moduleInfo.minApi = Integer.parseInt(value);
224+
readMinApi = true;
227225
} catch (Exception e) {
228-
moduleInfo.minApi = 0;
226+
if (!readMinApi) moduleInfo.minApi = 0;
229227
}
230228
break;
231229
case "maxSdkVersion": // Improve compatibility
232230
case "maxApi":
233231
try {
234232
moduleInfo.maxApi = Integer.parseInt(value);
233+
readMaxApi = true;
235234
} catch (Exception e) {
236-
moduleInfo.maxApi = 0;
235+
if (!readMaxApi) moduleInfo.maxApi = 0;
237236
}
238237
break;
239238
}
@@ -272,7 +271,7 @@ public static void readProperties(ModuleInfo moduleInfo, InputStream inputStream
272271
if (!readUpdateJson) {
273272
moduleInfo.updateJson = moduleUpdateJsonFallbacks.get(moduleInfo.id);
274273
}
275-
if (moduleInfo.minApi == 0) {
274+
if (moduleInfo.minApi == 0 || !readMinApi) {
276275
Integer minApiFallback = moduleMinApiFallbacks.get(moduleInfo.id);
277276
if (minApiFallback != null)
278277
moduleInfo.minApi = minApiFallback;

0 commit comments

Comments
 (0)