From c9ff840fdb3e5c378925ffa16af5dab55ddec9a7 Mon Sep 17 00:00:00 2001 From: codeanticode Date: Sun, 22 Jan 2023 10:43:36 -0500 Subject: [PATCH] minor code cleanup --- mode/src/processing/mode/android/Manifest.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/mode/src/processing/mode/android/Manifest.java b/mode/src/processing/mode/android/Manifest.java index 0c894833..856a43c4 100644 --- a/mode/src/processing/mode/android/Manifest.java +++ b/mode/src/processing/mode/android/Manifest.java @@ -324,32 +324,36 @@ protected void load(boolean forceNew) { try { xml = new XML(manifestFile); + boolean saveOld = false; + XML app = xml.getChild("application"); String icon = app.getString("android:icon"); if (icon.equals("@drawable/icon")) { // Manifest file generated with older version of the mode, replace icon and save app.setString("android:icon", "@mipmap/ic_launcher"); - if (!forceNew) save(); + saveOld = true; } XML activity = app.getChild("activity"); XML service = app.getChild("service"); if (activity != null && activity.getString("android:name").equals(".MainActivity")) { addExportedAttrib(activity); - if (!forceNew) save(); + saveOld = true; } if (service != null && service.getString("android:name").equals(".MainService")) { addExportedAttrib(service); - if (!forceNew) save(); + saveOld = true; } XML usesSDK = xml.getChild("uses-sdk"); if (usesSDK != null) { // Manifest file generated with older version of the mode, uses-sdk is no longer needed in manifest xml.removeChild(usesSDK); - if (!forceNew) save(); + saveOld = true; } + if (saveOld && !forceNew) save(); + } catch (Exception e) { e.printStackTrace(); System.err.println("Problem reading AndroidManifest.xml, creating a new version");