reset manifest when changing component, fixes #283

codeanticode · codeanticode · commit b8f26c0a2975 · 2017-04-26T19:05:04.000-04:00
diff --git a/src/processing/mode/android/AndroidBuild.java b/src/processing/mode/android/AndroidBuild.java
@@ -110,7 +110,6 @@ class AndroidBuild extends JavaBuild {
   
   private boolean runOnEmulator = false;
   private int appComponent = FRAGMENT;
-  private boolean rewriteManifest = false;
   
   private String renderer = "";
   
@@ -226,6 +225,7 @@ public File createProject(String targetID, boolean external, boolean wear)
       Platform.openFolder(tmpFolder);
     }
 
+    boolean rewriteManifest = false;
     if (!external) {
       // If creating an export project, then the manifest might have attributes
       // that create trouble with gradle, so we just re-write it...
@@ -235,7 +235,6 @@ public File createProject(String targetID, boolean external, boolean wear)
     }
     manifest = new Manifest(sketch, appComponent, mode.getFolder(), rewriteManifest);    
     manifest.setSdkTarget(target_sdk);
-    rewriteManifest = false;
 
     // build the preproc and get to work
     AndroidPreprocessor preproc = new AndroidPreprocessor(sketch, getPackageName());
@@ -529,10 +528,6 @@ public int getAppComponent() {
 //    }
 //  }
   
-  public void resetManifest() {
-    rewriteManifest = true;
-  }
-  
   protected boolean usesOpenGL() {
     return renderer != null && (renderer.equals("P2D") || renderer.equals("P3D")); 
   }
diff --git a/src/processing/mode/android/AndroidEditor.java b/src/processing/mode/android/AndroidEditor.java
@@ -52,8 +52,6 @@ public class AndroidEditor extends JavaEditor {
   private int appComponent;
   
   private Settings settings;
-  private boolean resetManifest = false;
-  
   private AndroidMode androidMode;
 
   private java.util.Timer updateDevicesTimer;
@@ -77,11 +75,11 @@ protected AndroidEditor(Base base, String path, EditorState state,
                           Mode mode) throws EditorException {
     super(base, path, state, mode);
     
-    loadModeSettings();
-    
     androidMode = (AndroidMode) mode;
     androidMode.resetUserSelection();
-    androidMode.checkSDK(this);    
+    androidMode.checkSDK(this);
+    
+    loadModeSettings();
   }  
 
   @Override
@@ -267,46 +265,42 @@ public void actionPerformed(ActionEvent e) {
 
     fragmentItem.addActionListener(new ActionListener() {
       @Override
-      public void actionPerformed(ActionEvent e) {
-        setAppComponent(AndroidBuild.FRAGMENT);
+      public void actionPerformed(ActionEvent e) {        
         fragmentItem.setState(true);
         wallpaperItem.setState(false);
         watchfaceItem.setSelected(false);
         vrItem.setSelected(false);
-        androidMode.showSelectComponentMessage(AndroidBuild.FRAGMENT);
+        setAppComponent(AndroidBuild.FRAGMENT);
       }
     });
     wallpaperItem.addActionListener(new ActionListener() {
       @Override
-      public void actionPerformed(ActionEvent e) {
-        setAppComponent(AndroidBuild.WALLPAPER);
+      public void actionPerformed(ActionEvent e) {        
         fragmentItem.setState(false);
         wallpaperItem.setState(true);
         watchfaceItem.setSelected(false);
         vrItem.setSelected(false);
-        androidMode.showSelectComponentMessage(AndroidBuild.WALLPAPER);
+        setAppComponent(AndroidBuild.WALLPAPER);        
       }
     });
     watchfaceItem.addActionListener(new ActionListener() {
       @Override
-      public void actionPerformed(ActionEvent e) {
-        setAppComponent(AndroidBuild.WATCHFACE);
+      public void actionPerformed(ActionEvent e) {        
         fragmentItem.setState(false);
         wallpaperItem.setState(false);
         watchfaceItem.setSelected(true);
         vrItem.setSelected(false);
-        androidMode.showSelectComponentMessage(AndroidBuild.WATCHFACE);
+        setAppComponent(AndroidBuild.WATCHFACE);        
       }
     });
     vrItem.addActionListener(new ActionListener() {
       @Override
-      public void actionPerformed(ActionEvent e) {
-        setAppComponent(AndroidBuild.VR);
+      public void actionPerformed(ActionEvent e) {        
         fragmentItem.setState(false);
         wallpaperItem.setState(false);
         watchfaceItem.setSelected(false);
         vrItem.setSelected(true);
-        androidMode.showSelectComponentMessage(AndroidBuild.VR);
+        setAppComponent(AndroidBuild.VR);
       }
     });    
        
@@ -471,10 +465,9 @@ public void actionPerformed(ActionEvent e) {
   }
 */
 
-  private void setAppComponent(int opt) {
-    if (appComponent != opt) {
-      appComponent = opt;
-      resetManifest = true;
+  private void setAppComponent(int comp) {
+    if (appComponent != comp) {
+      appComponent = comp;
       
       if (appComponent == AndroidBuild.FRAGMENT) {
         settings.set("component", "app");  
@@ -485,7 +478,9 @@ private void setAppComponent(int opt) {
       } else if (appComponent == AndroidBuild.VR) {
         settings.set("component", "vr");
       }
-      settings.save();
+      settings.save();            
+      androidMode.resetManifest(sketch, appComponent);
+      androidMode.showSelectComponentMessage(comp); 
     }
   }  
   
@@ -630,9 +625,7 @@ public void run() {
         startIndeterminate();
         prepareRun();
         try {
-          androidMode.handleRunEmulator(sketch, AndroidEditor.this, AndroidEditor.this,
-              resetManifest);
-          resetManifest = false;
+          androidMode.handleRunEmulator(sketch, AndroidEditor.this, AndroidEditor.this);
         } catch (SketchException e) {
           statusError(e);
         } catch (IOException e) {
@@ -667,9 +660,7 @@ public void run() {
           startIndeterminate();
           prepareRun();
           try {
-            androidMode.handleRunDevice(sketch, AndroidEditor.this, AndroidEditor.this,
-                resetManifest);
-            resetManifest = false;
+            androidMode.handleRunDevice(sketch, AndroidEditor.this, AndroidEditor.this);
           } catch (SketchException e) {
             statusError(e);
           } catch (IOException e) {
@@ -809,6 +800,8 @@ private void loadModeSettings() {
         appComponent = AndroidBuild.VR;
         vrItem.setState(true);
       }  
+      
+      if (save) androidMode.initManifest(sketch, appComponent);
     } catch (IOException e) {
       System.err.println("While creating " + sketchProps + ": " + e.getMessage());
     }   
diff --git a/src/processing/mode/android/AndroidMode.java b/src/processing/mode/android/AndroidMode.java
@@ -265,12 +265,11 @@ static public String getDateStamp(long stamp) {
 //    }
 //  }
   public void handleRunEmulator(Sketch sketch, AndroidEditor editor, 
-      RunnerListener listener, boolean resetManifest) throws SketchException, IOException {
+      RunnerListener listener) throws SketchException, IOException {
     listener.startIndeterminate();
     listener.statusNotice("Starting build...");
     AndroidBuild build = new AndroidBuild(sketch, this, 
         editor.getAppComponent(), true);
-    if (resetManifest) build.resetManifest();
 
     listener.statusNotice("Building Android project...");
     build.build("debug");
@@ -291,7 +290,7 @@ public void handleRunEmulator(Sketch sketch, AndroidEditor editor,
 
 
   public void handleRunDevice(Sketch sketch, AndroidEditor editor, 
-      RunnerListener listener, boolean resetManifest)
+      RunnerListener listener)
     throws SketchException, IOException {    
     
     final Devices devices = Devices.getInstance();
@@ -310,7 +309,6 @@ public void handleRunDevice(Sketch sketch, AndroidEditor editor,
     listener.statusNotice("Starting build...");
     AndroidBuild build = new AndroidBuild(sketch, this, 
         editor.getAppComponent(), false);
-    if (resetManifest) build.resetManifest();
 
     listener.statusNotice("Building Android project...");
     build.build("debug");
@@ -353,10 +351,22 @@ public void handleStop(RunnerListener listener) {
     }
   }
 
+  
+  public void initManifest(Sketch sketch, int comp) {
+    new Manifest(sketch, comp, getFolder(), false);
+  }  
+  
+  
+  public void resetManifest(Sketch sketch, int comp) {
+    new Manifest(sketch, comp, getFolder(), true);
+  }
+  
+  
   public static void createFileFromTemplate(final File tmplFile, final File destFile) {
     createFileFromTemplate(tmplFile, destFile, null);
   }
   
+  
   public static void createFileFromTemplate(final File tmplFile, final File destFile, 
       final HashMap<String, String> replaceMap) {
     PrintWriter pw = PApplet.createWriter(destFile);    
diff --git a/src/processing/mode/android/Permissions.java b/src/processing/mode/android/Permissions.java
@@ -306,7 +306,7 @@ public void actionPerformed(ActionEvent actionEvent) {
     setLocation((screen.width - windowSize.width) / 2,
                 (screen.height - windowSize.height) / 2);
 
-    Manifest mf = new Manifest(sketch, appComp, modeFolder, false);
+    Manifest mf = new Manifest(sketch, appComp, modeFolder, true);
     setSelections(mf.getPermissions());
 
     // show the window and get to work
