Skip to content

Commit d7d6fc4

Browse files
[Fix]cancelDownload->Remove sdk folder
1 parent 6e1dd0d commit d7d6fc4

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

mode/src/processing/mode/android/SDKDownloader.java

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ public class SDKDownloader extends JDialog implements PropertyChangeListener {
8484
private boolean cancelled;
8585
private boolean goBack;
8686

87-
private int totalSize = 0;
87+
private int totalSize = 0;
88+
private File sdkFolder;
8889

8990
class SDKUrlHolder {
9091
public String platformToolsVersion, buildToolsVersion,platformVersion,toolsVersion,emulatorVersion ;
@@ -118,7 +119,7 @@ protected Object doInBackground() throws Exception {
118119
File androidFolder = new File(sketchbookFolder, "android");
119120
if (!androidFolder.exists()) androidFolder.mkdir();
120121

121-
File sdkFolder = AndroidUtil.createSubFolder(androidFolder, "sdk");
122+
sdkFolder = AndroidUtil.createSubFolder(androidFolder, "sdk");
122123

123124
// creating sdk folders
124125
File platformsFolder = new File(sdkFolder, "platforms");
@@ -688,6 +689,17 @@ private void addPackage(GridBagConstraints gc, int gridy, JPanel packagesPanel,
688689
packagesPanel.add(versionLabel,gc);
689690
}
690691

692+
private void deleteFolder(File folder) { //recursively delete a complete directory with files and folders.
693+
for (File f : folder.listFiles()) {
694+
if (f.isDirectory()) {
695+
deleteFolder(f);
696+
f.delete();
697+
}
698+
else f.delete();
699+
}
700+
folder.delete();
701+
}
702+
691703
private void createInitLayout(SDKUrlHolder downloadUrls) {
692704
goBack = false;
693705
Container outer = getContentPane();
@@ -867,6 +879,7 @@ private void createLayout() {
867879
public void actionPerformed(ActionEvent e) {
868880
if (downloadTask != null) {
869881
downloadTask.cancel(true);
882+
deleteFolder(sdkFolder);
870883
}
871884
setVisible(false);
872885
cancelled = true;

0 commit comments

Comments
 (0)