Revert "properly manage creation of AVD"

This reverts commit 1cd33d5.

Author: omerjerk

src/processing/mode/android/AVD.java

@@ -17,7 +17,7 @@ public class AVD {
   static private final String AVD_CREATE_SECONDARY =
     "The default Android emulator could not be set up. Make sure<br>" +
     "that the Android SDK is installed properly, and that the<br>" +
-    "Android and Google APIs are installed for level %s.<br>" +
+    "Android and Google APIs are installed for level " + AndroidBuild.sdkVersion + ".<br>" +
     "(Between you and me, occasionally, this error is a red herring,<br>" +
     "and your sketch may be launching shortly.)";
 
@@ -48,96 +48,53 @@ public class AVD {
   /** x86, x86_64 or armeabi **/
   protected String abi;
 
-  protected VirtualDevice virtualDevice;
-  
   public static final String PREF_KEY_ABI = "android.sdk.abi";
   public static final String[] ABI = {"armeabi", "x86", "x86_64"};
 
   /** Default virtual device used by Processing. */
   static public AVD defaultAVD;
 //            "Google Inc.:Google APIs:" + AndroidBuild.sdkVersion);
 
-  static ArrayList<VirtualDevice> avdList;
-  static ArrayList<VirtualDevice> badList;
-  
-  
-  private static class VirtualDevice {
-      public String name;
-      public String target;
-      public String abi;
-      public VirtualDevice(String name, String target, String abi) {
-          this.name = name;
-          this.target = target;
-          this.abi = abi;
-      }
+  static ArrayList<String> avdList;
+  static ArrayList<String> badList;
+//  static ArrayList<String> skinList;
 
-      @Override
-      public boolean equals(Object o) {
-          VirtualDevice device = (VirtualDevice) o;
-          if (device.name.equals(name) && device.target.equals(target)
-                  && device.abi.equals(abi)) {
-              return true;
-          }
-          return false;
-      }
-  }
-  
 
   public AVD(String name, String target, String abi) {
     this.name = name;
     this.target = target;
     this.abi = abi;
-    virtualDevice = new VirtualDevice(name, target, abi);
   }
 
 
   static protected void list(final AndroidSDK sdk) throws IOException {
     try {
-      avdList = new ArrayList<VirtualDevice>();
-      badList = new ArrayList<VirtualDevice>();
+      avdList = new ArrayList<String>();
+      badList = new ArrayList<String>();
       ProcessResult listResult =
         new ProcessHelper(sdk.getAndroidToolPath(), "list", "avds").execute();
       if (listResult.succeeded()) {
         boolean badness = false;
-        String mTarget = null;
-        String mAbi = null;
-        String mName = null;
         for (String line : listResult) {
           String[] m = PApplet.match(line, "\\s+Name\\:\\s+(\\S+)");
           if (m != null) {
-            mName = m[1];
-            continue;
-          }
-              
-          m = PApplet.match(line, "API\\slevel\\s([0-9]+)");
-          if (m != null) {
-            mTarget = m[1];
-            continue;
-          }
-          
-          m = PApplet.match(line, "\\s+Tag\\/ABI\\:\\s\\S+\\/(\\S+)");
-          if (m != null) {
-              mAbi = m[1];
-          }
-          
-          if (mName != null && mTarget != null && mAbi != null) {
-            VirtualDevice mVirtualDevice = new VirtualDevice(mName, mTarget, mAbi);
-            mTarget = null;
-            mAbi = null;
             if (!badness) {
-              avdList.add(mVirtualDevice);
+//              System.out.println("good: " + m[1]);
+              avdList.add(m[1]);
             } else {
-              badList.add(mVirtualDevice);
+//              System.out.println("bad: " + m[1]);
+              badList.add(m[1]);
             }
+//          } else {
+//            System.out.println("nope: " + line);
           }
-          
           // "The following Android Virtual Devices could not be loaded:"
           if (line.contains("could not be loaded:")) {
 //            System.out.println("starting the bad list");
 //            System.err.println("Could not list AVDs:");
 //            System.err.println(listResult);
             badness = true;
-            break;
+//            break;
           }
         }
       } else {
@@ -152,9 +109,15 @@ protected boolean exists(final AndroidSDK sdk) throws IOException {
     if (avdList == null) {
       list(sdk);
     }
-    virtualDevice.target = AndroidBuild.sdkVersion;
-    virtualDevice.abi = abi;
-    return avdList.contains(virtualDevice);
+    for (String avd : avdList) {
+      if (Base.DEBUG) {
+        System.out.println("AVD.exists() checking for " + name + " against " + avd);
+      }
+      if (avd.equals(name)) {
+        return true;
+      }
+    }
+    return false;
   }
 
 
@@ -164,7 +127,12 @@ protected boolean exists(final AndroidSDK sdk) throws IOException {
    * (Prestigious may also not be the right word.)
    */
   protected boolean badness() {
-    return badList.contains(virtualDevice);
+    for (String avd : badList) {
+      if (avd.equals(name)) {
+        return true;
+      }
+    }
+    return false;
   }
 
 
@@ -197,8 +165,7 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
       } else {
         // Just generally not working
 //        Base.showWarning("Android Error", AVD_CREATE_ERROR, null);
-        Base.showWarningTiered("Android Error", AVD_CREATE_PRIMARY,
-                String.format(AVD_CREATE_SECONDARY, AndroidBuild.sdkVersion), null);
+        Base.showWarningTiered("Android Error", AVD_CREATE_PRIMARY, AVD_CREATE_SECONDARY, null);
         System.out.println(createAvdResult);
 //        throw new IOException("Error creating the AVD");
       }
@@ -211,8 +178,7 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
 
   static public boolean ensureProperAVD(final AndroidSDK sdk, final String abi) {
     try {
-      defaultAVD = new AVD("Processing-0" + Base.getRevision() + "-" + AndroidBuild.sdkVersion +
-              "-" + abi,
+      defaultAVD = new AVD("Processing-0" + Base.getRevision(),
           "android-" + AndroidBuild.sdkVersion, abi);
       if (defaultAVD.exists(sdk)) {
 //        System.out.println("the avd exists");
@@ -229,10 +195,8 @@ static public boolean ensureProperAVD(final AndroidSDK sdk, final String abi) {
         return true;
       }
     } catch (final Exception e) {
-        e.printStackTrace();
 //      Base.showWarning("Android Error", AVD_CREATE_ERROR, e);
-      Base.showWarningTiered("Android Error", AVD_CREATE_PRIMARY,
-              String.format(AVD_CREATE_SECONDARY, AndroidBuild.sdkVersion), null);
+      Base.showWarningTiered("Android Error", AVD_CREATE_PRIMARY, AVD_CREATE_SECONDARY, null);
     }
     System.out.println("at bottom of ensure proper");
     return false;