Skip to content

Commit c9ff840

Browse files
committed
minor code cleanup
1 parent 4718cd0 commit c9ff840

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

mode/src/processing/mode/android/Manifest.java

+8-4
Original file line numberDiff line numberDiff line change
@@ -324,32 +324,36 @@ protected void load(boolean forceNew) {
324324
try {
325325
xml = new XML(manifestFile);
326326

327+
boolean saveOld = false;
328+
327329
XML app = xml.getChild("application");
328330
String icon = app.getString("android:icon");
329331
if (icon.equals("@drawable/icon")) {
330332
// Manifest file generated with older version of the mode, replace icon and save
331333
app.setString("android:icon", "@mipmap/ic_launcher");
332-
if (!forceNew) save();
334+
saveOld = true;
333335
}
334336

335337
XML activity = app.getChild("activity");
336338
XML service = app.getChild("service");
337339
if (activity != null && activity.getString("android:name").equals(".MainActivity")) {
338340
addExportedAttrib(activity);
339-
if (!forceNew) save();
341+
saveOld = true;
340342
}
341343
if (service != null && service.getString("android:name").equals(".MainService")) {
342344
addExportedAttrib(service);
343-
if (!forceNew) save();
345+
saveOld = true;
344346
}
345347

346348
XML usesSDK = xml.getChild("uses-sdk");
347349
if (usesSDK != null) {
348350
// Manifest file generated with older version of the mode, uses-sdk is no longer needed in manifest
349351
xml.removeChild(usesSDK);
350-
if (!forceNew) save();
352+
saveOld = true;
351353
}
352354

355+
if (saveOld && !forceNew) save();
356+
353357
} catch (Exception e) {
354358
e.printStackTrace();
355359
System.err.println("Problem reading AndroidManifest.xml, creating a new version");

0 commit comments

Comments
 (0)