ATO is now working with security

Note that the plugin reads the pwd from the source code and stores it in
the security cache after the upload.
The pwd used is the pwd found in the stored cache unless no pwd was
found there.
This should support changing and removing pwd's without ever having to
type one

I also added "never and always" as options in the dialog box "build
before upload"

Author: jantje

it.baeyens.arduino.common/META-INF/MANIFEST.MF

@@ -6,13 +6,16 @@ Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: it.baeyens.arduino.common.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.junit
+ org.junit,
+ org.eclipse.wb.core.lib,
+ org.eclipse.cdt.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: it.baeyens.arduino.arduino,
  it.baeyens.arduino.common
 Import-Package: org.eclipse.cdt.core,
  org.eclipse.cdt.core.envvar,
+ org.eclipse.cdt.core.index,
  org.eclipse.cdt.core.model,
  org.eclipse.cdt.core.settings.model,
  org.eclipse.core.resources

it.baeyens.arduino.common/src/it/baeyens/arduino/common/IndexHelper.java

@@ -0,0 +1,106 @@
+package it.baeyens.arduino.common;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.commons.io.FileUtils;
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunction;
+import org.eclipse.cdt.core.index.IIndex;
+import org.eclipse.cdt.core.index.IIndexBinding;
+import org.eclipse.cdt.core.index.IIndexName;
+import org.eclipse.cdt.core.index.IndexFilter;
+import org.eclipse.cdt.core.model.CoreModel;
+import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+
+public class IndexHelper {
+    /**
+     * given a list of names from the indexer. Find a function call and return
+     * the parameter I assume there is only one parameter and it is a string so
+     * there are quotes
+     * 
+     * @param names
+     *            the names provided by the indexer
+     * @param function
+     *            the name of the function for which we are looking for a
+     *            parameter
+     * @return the string or defaultValue if no string is found
+     */
+    private static String findParameterInFunction(IIndexName[] names, String function, String defaultValue) {
+	for (IIndexName name : names) {
+	    String SetupFileName = name.getFileLocation().getFileName();
+	    String SetupFileContent;
+	    try {
+		SetupFileContent = FileUtils.readFileToString(new File(SetupFileName));
+	    } catch (IOException e) {
+		return defaultValue;
+	    }
+	    SetupFileContent = SetupFileContent.replaceAll("//.*|/\\*((.|\\n)(?!=*/))+\\*/", ""); //$NON-NLS-1$ //$NON-NLS-2$
+	    int serialBeginStart = SetupFileContent.indexOf(function);
+	    if (serialBeginStart != -1) {
+		int serialBeginStartbraket = SetupFileContent.indexOf("(", serialBeginStart); //$NON-NLS-1$
+		if (serialBeginStartbraket != -1) {
+		    int serialBeginCloseBraket = SetupFileContent.indexOf(")", serialBeginStartbraket); //$NON-NLS-1$
+		    if (serialBeginCloseBraket != -1) {
+			return SetupFileContent.substring(serialBeginStartbraket + 1, serialBeginCloseBraket).trim();
+
+		    }
+		}
+	    }
+	}
+	return defaultValue;
+
+    }
+
+    /**
+     * given a project look in the source code for the line of code that sets
+     * the password;
+     * 
+     * 
+     * 
+     * return the password string of no_pwd_found_in_code
+     * 
+     * @param iProject
+     * @return
+     */
+    public static String findParameterInFunction(IProject project, String parentFunctionName, String childFunctionName,
+	    String defaultValue) {
+
+	ICProject curProject = CoreModel.getDefault().getCModel().getCProject(project.getName());
+
+	IIndex index = null;
+	try {
+	    index = CCorePlugin.getIndexManager().getIndex(curProject);
+	    index.acquireReadLock();
+	    IIndexBinding[] bindings = index.findBindings(parentFunctionName.toCharArray(), IndexFilter.ALL_DECLARED,
+		    new NullProgressMonitor());
+	    ICPPFunction parentFunction = null;
+	    for (IIndexBinding curbinding : bindings) {
+		if (curbinding instanceof ICPPFunction) {
+		    parentFunction = (ICPPFunction) curbinding;
+		}
+	    }
+
+	    if (parentFunction == null) {
+		return defaultValue;// that on found binding must be a function
+	    }
+
+	    IIndexName[] names = index.findNames(parentFunction, org.eclipse.cdt.core.index.IIndex.FIND_DEFINITIONS);
+
+	    return findParameterInFunction(names, childFunctionName, defaultValue);
+
+	} catch (CoreException | InterruptedException e) {
+	    e.printStackTrace();
+	} finally {
+	    if (index != null) {
+		index.releaseReadLock();
+	    }
+	}
+
+	return defaultValue;
+    }
+
+}

it.baeyens.arduino.common/src/it/baeyens/arduino/common/InstancePreferences.java

@@ -9,15 +9,13 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.swt.SWT;
+import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
 import org.osgi.service.prefs.BackingStoreException;
 
 /**
- * ArduinoPreferences is a class containing only static methods that help managing the preferences.
+ * ArduinoPreferences is a class containing only static methods that help
+ * managing the preferences.
  * 
  * @author jan Baeyens
  * 
@@ -46,17 +44,19 @@ public static void setAutomaticallyIncludeLibraries(boolean value) {
     }
 
     /***
-     * get the stored option whether a build before the upload is wanted or not. If nothing is stored the option is ask and this method will pop up a
+     * get the stored option whether a build before the upload is wanted or not.
+     * If nothing is stored the option is ask and this method will pop up a
      * dialogbox
      * 
-     * @return true if a build is wanted before upload false if no build is wanted before upload
+     * @return true if a build is wanted before upload false if no build is
+     *         wanted before upload
      */
     public static boolean getBuildBeforeUploadOption() {
 
 	switch (getGlobalString(KEY_BUILD_BEFORE_UPLOAD_OPTION, "ASK")) { //$NON-NLS-1$
-	case "YES": //$NON-NLS-1$
+	case Const.TRUE:
 	    return true;
-	case "NO": //$NON-NLS-1$
+	case Const.FALSE:
 	    return false;
 	default:
 	    break;
@@ -70,17 +70,26 @@ boolean getAnswer() {
 
 	    @Override
 	    public void run() {
-		Shell theShell = PlatformUI.getWorkbench().getDisplay().getActiveShell();
-		MessageBox dialog = new MessageBox(theShell, SWT.ICON_QUESTION | SWT.YES | SWT.NO);
-		dialog.setText(Messages.Build_before_upload);
-		dialog.setMessage(Messages.do_you_want_to_build_before_upload);
+
+		MessageDialog dialog = new MessageDialog(null, Messages.Build_before_upload, null,
+			Messages.do_you_want_to_build_before_upload, MessageDialog.QUESTION,
+			new String[] { "Yes", "No", "Always", "Never" }, 0); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+
 		switch (dialog.open()) {
-		case SWT.NO:
+		case 0:
+		    this.ret = true;
+		    break;
+		case 1:
 		    this.ret = false;
 		    break;
-		case SWT.YES:
+		case 2:
+		    setGlobalValue(KEY_BUILD_BEFORE_UPLOAD_OPTION, Const.TRUE);
 		    this.ret = true;
 		    break;
+		case 3:
+		    setGlobalValue(KEY_BUILD_BEFORE_UPLOAD_OPTION, Const.FALSE);
+		    this.ret = false;
+		    break;
 		default:
 		    this.ret = false;
 		    break;
@@ -93,7 +102,8 @@ public void run() {
     }
 
     /**
-     * This method reads the name of the last used arduino board from the instance preferences
+     * This method reads the name of the last used arduino board from the
+     * instance preferences
      * 
      * @return the Arduino Board name
      * @author Jan Baeyens
@@ -173,7 +183,8 @@ public static void setGlobalValue(String key, String Value) {
 	try {
 	    myScope.flush();
 	} catch (BackingStoreException e) {
-	    Common.log(new Status(IStatus.WARNING, CORE_PLUGIN_ID, "failed to set global variable of type string " + key)); //$NON-NLS-1$
+	    Common.log(
+		    new Status(IStatus.WARNING, CORE_PLUGIN_ID, "failed to set global variable of type string " + key)); //$NON-NLS-1$
 	    e.printStackTrace();
 	}
     }
@@ -195,7 +206,8 @@ protected static void setGlobalValue(String key, boolean Value) {
 	try {
 	    myScope.flush();
 	} catch (BackingStoreException e) {
-	    Common.log(new Status(IStatus.WARNING, CORE_PLUGIN_ID, "failed to set global variable of type boolean " + key)); //$NON-NLS-1$
+	    Common.log(new Status(IStatus.WARNING, CORE_PLUGIN_ID,
+		    "failed to set global variable of type boolean " + key)); //$NON-NLS-1$
 	    e.printStackTrace();
 	}
     }
@@ -206,13 +218,15 @@ protected static void setGlobalValue(String key, long Value) {
 	try {
 	    myScope.flush();
 	} catch (BackingStoreException e) {
-	    Common.log(new Status(IStatus.WARNING, CORE_PLUGIN_ID, "failed to set global variable of type long " + key)); //$NON-NLS-1$
+	    Common.log(
+		    new Status(IStatus.WARNING, CORE_PLUGIN_ID, "failed to set global variable of type long " + key)); //$NON-NLS-1$
 	    e.printStackTrace();
 	}
     }
 
     /**
-     * This method returns the index of the last used line ending options are CR LF CR+LF none
+     * This method returns the index of the last used line ending options are CR
+     * LF CR+LF none
      * 
      * @return the index of the last used setting
      */
@@ -221,7 +235,8 @@ public static int getLastUsedSerialLineEnd() {
     }
 
     /**
-     * This method returns the index of the last used line ending options are CR LF CR+LF none
+     * This method returns the index of the last used line ending options are CR
+     * LF CR+LF none
      * 
      * @return the index of the last used setting
      */
@@ -278,7 +293,8 @@ public static void setConfigured() {
     }
 
     /**
-     * This method returns boolean whether the plugin is properly configured The plugin is configured properly if a board has been installed
+     * This method returns boolean whether the plugin is properly configured The
+     * plugin is configured properly if a board has been installed
      * 
      * @return
      */
@@ -356,8 +372,8 @@ public static void setPrivateHardwarePaths(String[] folderName) {
      * @return a list of all the folder locations that can contain hardware
      */
     public static String[] getHardwarePaths() {
-	return (getGlobalString(KEY_PRIVATE_HARDWARE_PATHS, EMPTY_STRING) + File.pathSeparator + ConfigurationPreferences.getInstallationPath())
-		.split(File.pathSeparator);
+	return (getGlobalString(KEY_PRIVATE_HARDWARE_PATHS, EMPTY_STRING) + File.pathSeparator
+		+ ConfigurationPreferences.getInstallationPath()).split(File.pathSeparator);
     }
 
 }

it.baeyens.arduino.core/config/pre_processing_platform_default.txt

@@ -12,3 +12,4 @@ build.system.path={RUNTIME.PLATFORM.PATH}/system
 tools.esp8266OTA={tools.esptool.network_cmd}
 tools.esp8266OTA.upload.pattern={tools.esptool.upload.network_pattern}
 esp8266.network.upload.tool=esp8266OTA
+TOOLS.ESPTOOL.NETWORK.PASSWORD={NETWORK.AUTH}

it.baeyens.arduino.core/src/cc/arduino/packages/discoverers/NetworkDiscovery.java

@@ -44,6 +44,8 @@
 import javax.jmdns.ServiceListener;
 import javax.jmdns.impl.DNSTaskStarter;
 
+import it.baeyens.arduino.common.Const;
+
 public class NetworkDiscovery implements ServiceListener {
 
     private class bonour {
@@ -235,7 +237,7 @@ public static String getAddress(String name) {
     public static String getPort(String name) {
 	bonour board = getBoardByName(name);
 	if (board == null)
-	    return null;
+	    return Const.EMPTY_STRING;
 	return board.port;
     }