arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-23 19:21:59 +03:00
Code Activity

re-asking for password if previous upload failed

Browse Source
This commit is contained in:
Federico Fissore
2013-04-18 11:23:58 +02:00
parent dc71ab77bf
commit 0c03dc8db9
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/processing/app/Sketch.java
View File

@ -1665,24 +1665,27 @@ public class Sketch {
Uploader uploader = new UploaderFactory().newUploader(target.getBoards().get(board), Preferences.get("serial.port")); Uploader uploader = new UploaderFactory().newUploader(target.getBoards().get(board), Preferences.get("serial.port"));
if (uploader.requiresAuthorization() && !Preferences.has(uploader.getAuthorizationKey())) { boolean success = false;
PasswordAuthorizationDialog dialog = new PasswordAuthorizationDialog(editor); do {
dialog.setLocationRelativeTo(editor); if (uploader.requiresAuthorization() && !Preferences.has(uploader.getAuthorizationKey())) {
dialog.setVisible(true); PasswordAuthorizationDialog dialog = new PasswordAuthorizationDialog(editor);
dialog.setLocationRelativeTo(editor);
dialog.setVisible(true);
if (dialog.isCancelled()) { if (dialog.isCancelled()) {
editor.statusNotice(_("Upload cancelled")); editor.statusNotice(_("Upload cancelled"));
return false; return false;
}
Preferences.set(uploader.getAuthorizationKey(), DigestUtils.sha512Hex(dialog.getPassword()));
} }
Preferences.set(uploader.getAuthorizationKey(), DigestUtils.sha512Hex(dialog.getPassword())); success = uploader.uploadUsingPreferences(buildPath, suggestedClassName, usingProgrammer);
}
boolean success = uploader.uploadUsingPreferences(buildPath, suggestedClassName, usingProgrammer); if (uploader.requiresAuthorization() && !success) {
Preferences.remove(uploader.getAuthorizationKey());
if (uploader.requiresAuthorization() && !success) { }
Preferences.remove(uploader.getAuthorizationKey()); } while (uploader.requiresAuthorization() && !success);
}
return success; return success;
} }