properly reset manifest and ignore watch devices

codeanticode · codeanticode · commit befa46fc1e13 · 2016-06-13T13:53:36.000-04:00
diff --git a/src/processing/mode/android/AndroidBuild.java b/src/processing/mode/android/AndroidBuild.java
@@ -130,7 +130,7 @@ public File build(String target) throws IOException, SketchException {
         }
       }
       
-      File folder = createHandheldProject(wearFolder);
+      File folder = createHandheldProject(wearFolder, null);
       if (folder != null) {
         if (!antBuild()) {
           return null;
@@ -357,7 +357,7 @@ public File createProject(boolean wear) throws IOException, SketchException {
   // This creates the special activity project only needed to serve as the
   // (invisible) app on the handheld that allows to uninstall the watchface
   // from the watch.  
-  public File createHandheldProject(File wearFolder) 
+  public File createHandheldProject(File wearFolder, File wearPackage) 
       throws IOException, SketchException {
     // According to these instructions:
     // https://developer.android.com/training/wearables/apps/packaging.html#PackageManually
@@ -418,9 +418,22 @@ public File createHandheldProject(File wearFolder)
     writeIconFiles(sketchFolder, resFolder);    
 
     // Copy the wearable apk
-    String apkName = sketch.getName().toLowerCase() + "_debug";
+    String apkName = "";
+    if (wearPackage == null) {
+      String suffix = target.equals("release") ? "release_unsigned" : "debug";    
+      apkName = sketch.getName().toLowerCase() + "_" + suffix;
+    } else {
+      String name = wearPackage.getName();      
+      int dot = name.lastIndexOf('.');
+      if (dot == -1) {
+        apkName = name;
+      } else {
+        apkName = name.substring(0, dot);
+      }
+    }
+    
     File rawFolder = mkdirs(resFolder, "raw");
-    File wearApk = new File(wearFolder, "bin/" + apkName + ".apk"); // TODO TODO should be an argument, to support the release situation.
+    File wearApk = new File(wearFolder, "bin/" + apkName + ".apk");
     Util.copyFile(wearApk, new File(rawFolder, apkName + ".apk"));
         
     // Create dummy layout/activity_handheld.xml 
@@ -597,12 +610,16 @@ public int getAppComponent() {
     return appComponent;
   }
   
-  public void setAppComponent(int opt) {
-    if (appComponent != opt) {
-      appComponent = opt;
-      resetManifest = true;
-    }
-  }  
+//  public void setAppComponent(int opt) {
+//    if (appComponent != opt) {
+//      appComponent = opt;
+//      resetManifest = true;
+//    }
+//  }
+  
+  public void resetManifest() {
+    resetManifest = true;
+  }
   
   protected boolean usesGPU() {
     return renderer != null && (renderer.equals("P2D") || renderer.equals("P3D")); 
@@ -662,20 +679,14 @@ public File exportProject() throws IOException, SketchException {
     // this will set debuggable to true in the .xml file
     target = "debug";
     
-    if (appComponent == WATCHFACE && !runOnEmulator) {
+    if (appComponent == WATCHFACE) {
       // We are building a watchface not to run on the emulator. We need the
       // handheld app:
-      // https://developer.android.com/training/wearables/apps/creating.html
-      // so the watchface can be uninstalled from the phone, and can be
-      // published on Google Play.
       File wearFolder = createProject(true);
-      if (wearFolder != null) {
-        if (!antBuild()) {
-          return null;
-        }
-      }
+      if (wearFolder == null) return null;
+      if (!antBuild()) return null; 
       
-      File projectFolder = createHandheldProject(wearFolder);
+      File projectFolder = createHandheldProject(wearFolder, null);
       if (projectFolder != null) {
         File exportFolder = createExportFolder();
         Util.copyDir(projectFolder, exportFolder);
@@ -694,16 +705,35 @@ public File exportProject() throws IOException, SketchException {
   }
 
   public File exportPackage(String keyStorePassword) throws Exception {
-    // TODO TODO
-    File projectFolder = build("release");
-    if (projectFolder == null) return null;
-
-    File signedPackage = signPackage(projectFolder, keyStorePassword);
-    if (signedPackage == null) return null;
+    File projectFolder = null;
+    if (appComponent == WATCHFACE) {
+      this.target = "release";
+      // We need to sign and align the wearable and handheld apps:      
+      File wearFolder = createProject(true);
+      if (wearFolder == null) return null;
+      if (!antBuild()) return null;      
+      File signedWearPackage = signPackage(wearFolder, keyStorePassword);
+      if (signedWearPackage == null) return null;
+      
+      // Handheld package
+      projectFolder = createHandheldProject(wearFolder, signedWearPackage);
+      if (projectFolder == null) return null;
+      if (!antBuild()) return null;
+      
+      File signedPackage = signPackage(projectFolder, keyStorePassword);
+      if (signedPackage == null) return null;       
+    } else {
+      projectFolder = build("release");
+      if (projectFolder == null) return null;
 
+      File signedPackage = signPackage(projectFolder, keyStorePassword);
+      if (signedPackage == null) return null;
+    }
+    
+    // Final export folder
     File exportFolder = createExportFolder();
     Util.copyDir(projectFolder, exportFolder);
-    return new File(exportFolder, "/bin/");
+    return new File(exportFolder, "/bin/");     
   }
 
   private File signPackage(File projectFolder, String keyStorePassword) throws Exception {
diff --git a/src/processing/mode/android/AndroidEditor.java b/src/processing/mode/android/AndroidEditor.java
@@ -50,6 +50,7 @@
 @SuppressWarnings("serial")
 public class AndroidEditor extends JavaEditor {
   private int appComponent = AndroidBuild.FRAGMENT;
+  private boolean resetManifest = false;
   
   private AndroidMode androidMode;
 
@@ -75,6 +76,18 @@ class UpdateDeviceListTask extends TimerTask {
     public UpdateDeviceListTask(JMenu deviceMenu) {
       this.deviceMenu = deviceMenu;
     }
+    
+    private Device selectFirstNonWatchDevice(java.util.List<Device> deviceList) {
+      for (Device device : deviceList) {
+        if (device.hasFeature("watch")) {
+          // Don't include the watch devices to the list, they get their watch
+          // faces through the handheld they are paired with.
+          continue;
+        }
+        return device;
+      }
+      return null;
+    }
 
     @Override
     public void run() {
@@ -101,8 +114,8 @@ public void run() {
         deviceMenu.removeAll();
 
         if (selectedDevice == null) {
-          selectedDevice = deviceList.get(0);
-          devices.setSelectedDevice(selectedDevice);
+          selectedDevice = selectFirstNonWatchDevice(deviceList);
+          devices.setSelectedDevice(selectedDevice);  
         } else {
           // check if selected device is still connected
           boolean found = false;
@@ -114,8 +127,8 @@ public void run() {
           }
 
           if (!found) {
-            selectedDevice = deviceList.get(0);
-            devices.setSelectedDevice(selectedDevice);
+            selectedDevice = selectFirstNonWatchDevice(deviceList);
+            devices.setSelectedDevice(selectedDevice);  
           }
         }
 
@@ -235,7 +248,7 @@ public void actionPerformed(ActionEvent e) {
     fragmentItem.addActionListener(new ActionListener() {
       @Override
       public void actionPerformed(ActionEvent e) {
-        appComponent = AndroidBuild.FRAGMENT;
+        setAppComponent(AndroidBuild.FRAGMENT);
         fragmentItem.setState(true);
         wallpaperItem.setState(false);
         watchfaceItem.setSelected(false);
@@ -246,7 +259,7 @@ public void actionPerformed(ActionEvent e) {
     wallpaperItem.addActionListener(new ActionListener() {
       @Override
       public void actionPerformed(ActionEvent e) {
-        appComponent = AndroidBuild.WALLPAPER;
+        setAppComponent(AndroidBuild.WALLPAPER);
         fragmentItem.setState(false);
         wallpaperItem.setState(true);
         watchfaceItem.setSelected(false);
@@ -257,7 +270,7 @@ public void actionPerformed(ActionEvent e) {
     watchfaceItem.addActionListener(new ActionListener() {
       @Override
       public void actionPerformed(ActionEvent e) {
-        appComponent = AndroidBuild.WATCHFACE;
+        setAppComponent(AndroidBuild.WATCHFACE);
         fragmentItem.setState(false);
         wallpaperItem.setState(false);
         watchfaceItem.setSelected(true);
@@ -268,7 +281,7 @@ public void actionPerformed(ActionEvent e) {
     cardboardItem.addActionListener(new ActionListener() {
       @Override
       public void actionPerformed(ActionEvent e) {
-        appComponent = AndroidBuild.CARDBOARD;
+        setAppComponent(AndroidBuild.CARDBOARD);
         fragmentItem.setState(false);
         wallpaperItem.setState(false);
         watchfaceItem.setSelected(false);
@@ -438,6 +451,13 @@ public void actionPerformed(ActionEvent e) {
   }
 */
 
+  private void setAppComponent(int opt) {
+    if (appComponent != opt) {
+      appComponent = opt;
+      resetManifest = true;
+    }
+  }  
+  
   /**
    * Uses the main help menu, and adds a few extra options. If/when there's
    * Android-specific documentation, we'll switch to that.
@@ -579,7 +599,9 @@ public void run() {
         startIndeterminate();
         prepareRun();
         try {
-          androidMode.handleRunEmulator(sketch, AndroidEditor.this, AndroidEditor.this);
+          androidMode.handleRunEmulator(sketch, AndroidEditor.this, AndroidEditor.this,
+              resetManifest);
+          resetManifest = false;
         } catch (SketchException e) {
           statusError(e);
         } catch (IOException e) {
@@ -621,7 +643,9 @@ public void run() {
           startIndeterminate();
           prepareRun();
           try {
-            androidMode.handleRunDevice(sketch, AndroidEditor.this, AndroidEditor.this);
+            androidMode.handleRunDevice(sketch, AndroidEditor.this, AndroidEditor.this,
+                resetManifest);
+            resetManifest = false;
           } catch (SketchException e) {
             statusError(e);
           } catch (IOException e) {
diff --git a/src/processing/mode/android/AndroidMode.java b/src/processing/mode/android/AndroidMode.java
@@ -257,15 +257,15 @@ static public String getDateStamp(long stamp) {
 //    }
 //  }
   public void handleRunEmulator(Sketch sketch, AndroidEditor editor, 
-      RunnerListener listener) throws SketchException, IOException {
+      RunnerListener listener, boolean resetManifest) 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");
-
         
     boolean avd = AVD.ensureProperAVD(editor, this, sdk, build.isWear());
     if (!avd) {
@@ -283,7 +283,7 @@ public void handleRunEmulator(Sketch sketch, AndroidEditor editor,
 
 
   public void handleRunDevice(Sketch sketch, AndroidEditor editor, 
-      RunnerListener listener)
+      RunnerListener listener, boolean resetManifest)
     throws SketchException, IOException {    
     
     final Devices devices = Devices.getInstance();
@@ -302,6 +302,7 @@ 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");
@@ -317,7 +318,7 @@ public void showSelectComponentMessage(int appComp) {
     if (showBluetoothDebugMessage && appComp == AndroidBuild.WATCHFACE) {
       Messages.showMessage("Is Debugging over Bluetooth enabled?",
                            "Processing will access the wearable through the handheld paired to it.\n" +
-                           "Your watch won't show up the device list, select the paired handheld.\n" +
+                           "Your watch won't show up in the device list, select the paired handheld.\n" +
                            "Make sure to enable \"Debugging over Bluetooth\" for this to work:\n" +
                            "http://developer.android.com/training/wearables/apps/bt-debugging.html");   
       showBluetoothDebugMessage = false;
