move sdk and keystore to <sketchbook>/android

Author: codeanticode

src/processing/mode/android/AndroidKeyStore.java

@@ -43,7 +43,8 @@ public static File getKeyStore() {
 
   public static File getKeyStoreLocation() {
     File sketchbookFolder = processing.app.Base.getSketchbookFolder();
-    File keyStoreFolder = new File(sketchbookFolder, "keystore");
+    File androidFolder = new File(sketchbookFolder, "android");    
+    File keyStoreFolder = new File(androidFolder, "keystore");
     if (!keyStoreFolder.exists()) {
       boolean result = keyStoreFolder.mkdirs();
 

src/processing/mode/android/AndroidSDK.java

@@ -394,7 +394,7 @@ static public boolean locateSysImage(final Frame window,
 
   static public AndroidSDK download(final Frame editor, final AndroidMode androidMode) 
       throws BadSDKException, CancelException {
-    final SDKDownloader downloader = new SDKDownloader(editor, androidMode);    
+    final SDKDownloader downloader = new SDKDownloader(editor);    
     downloader.run(); // This call blocks until the SDK download complete, or user cancels.
 
     if (downloader.cancelled()) {
@@ -410,7 +410,7 @@ static public AndroidSDK download(final Frame editor, final AndroidMode androidM
   static public boolean downloadSysImage(final Frame editor, 
       final AndroidMode androidMode, final boolean wear) 
       throws BadSDKException, CancelException {
-    final SysImageDownloader downloader = new SysImageDownloader(editor, androidMode, wear);    
+    final SysImageDownloader downloader = new SysImageDownloader(editor, wear);    
     downloader.run(); // This call blocks until the SDK download complete, or user cancels.
 
     if (downloader.cancelled()) {

src/processing/mode/android/SDKDownloader.java

@@ -74,7 +74,6 @@ public class SDKDownloader extends JDialog implements PropertyChangeListener {
   private SDKDownloadTask downloadTask;
 
   private Frame editor;
-  private AndroidMode mode;
   private AndroidSDK sdk;
   private boolean cancelled;
 
@@ -96,11 +95,13 @@ class SDKDownloadTask extends SwingWorker<Object, Object> {
 
     @Override
     protected Object doInBackground() throws Exception {
-      File modeFolder = mode.getFolder();
-      
+      File sketchbookFolder = processing.app.Base.getSketchbookFolder();
+      File androidFolder = new File(sketchbookFolder, "android");
+      if (!androidFolder.exists()) androidFolder.mkdir();
+            
       // creating sdk folders
-      File sdkFolder = new File(modeFolder, "sdk");
-      if (!sdkFolder.exists()) sdkFolder.mkdir();
+      File sdkFolder = new File(androidFolder, "sdk");
+      if (!sdkFolder.exists()) sdkFolder.mkdirs();
       File platformsFolder = new File(sdkFolder, "platforms");
       if (!platformsFolder.exists()) platformsFolder.mkdir();
       File buildToolsFolder = new File(sdkFolder, "build-tools");
@@ -113,7 +114,7 @@ protected Object doInBackground() throws Exception {
       if (!androidRepoFolder.exists()) androidRepoFolder.mkdir();      
 
       // creating temp folder for downloaded zip packages
-      File tempFolder = new File(modeFolder, "temp");
+      File tempFolder = new File(androidFolder, "temp");
       if (!tempFolder.exists()) tempFolder.mkdir();
 
       try {
@@ -463,10 +464,9 @@ public static String humanReadableByteCount(long bytes, boolean si) {
     return String.format("%.1f %sB", bytes / Math.pow(unit, exp), pre);
   }
 
-  public SDKDownloader(Frame editor, AndroidMode mode) {
+  public SDKDownloader(Frame editor) {
     super(editor, "SDK download", true);
     this.editor = editor;
-    this.mode = mode;
     this.sdk = null;    
     createLayout();
   }

src/processing/mode/android/SysImageDownloader.java

@@ -69,7 +69,6 @@ public class SysImageDownloader extends JDialog implements PropertyChangeListene
   private DownloadTask downloadTask;
 
   private Frame editor;
-  private AndroidMode mode;
   private boolean result;
   private boolean wear;
   private boolean cancelled;
@@ -94,8 +93,12 @@ protected Object doInBackground() throws Exception {
 
       // The SDK should already be detected by the android mode
       String sdkPrefsPath = Preferences.get("android.sdk.path");
-      File sdkFolder = new File(sdkPrefsPath);
-      File modeFolder = mode.getFolder();      
+      
+      File sketchbookFolder = processing.app.Base.getSketchbookFolder();
+      File androidFolder = new File(sketchbookFolder, "android");
+      if (!androidFolder.exists()) androidFolder.mkdir();
+      
+      File sdkFolder = new File(sdkPrefsPath); 
       if (!sdkFolder.exists()) {
         throw new IOException("SDK folder does not exist " + sdkFolder.getAbsolutePath());
       }
@@ -105,7 +108,7 @@ protected Object doInBackground() throws Exception {
       if (!sysImgFolder.exists()) sysImgFolder.mkdir();
 
       // creating temp folder for downloaded zip packages
-      File tempFolder = new File(modeFolder, "temp");
+      File tempFolder = new File(androidFolder, "temp");
       if (!tempFolder.exists()) tempFolder.mkdir();
 
       try {
@@ -295,10 +298,9 @@ public static String humanReadableByteCount(long bytes, boolean si) {
     return String.format("%.1f %sB", bytes / Math.pow(unit, exp), pre);
   }
 
-  public SysImageDownloader(Frame editor, AndroidMode mode, boolean wear) {
+  public SysImageDownloader(Frame editor, boolean wear) {
     super(editor, "Emulator download", true);
     this.editor = editor;
-    this.mode = mode;
     this.wear = wear;
     this.result = false;    
     createLayout();