Skip to content

Commit 59e804a

Browse files
committed
Save user target sdk choice
1 parent e085078 commit 59e804a

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

src/processing/mode/android/AndroidBuild.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,7 @@
2525
import org.apache.tools.ant.DefaultLogger;
2626
import org.apache.tools.ant.Project;
2727
import org.apache.tools.ant.ProjectHelper;
28-
29-
import processing.app.Base;
30-
import processing.app.Library;
31-
import processing.app.Sketch;
32-
import processing.app.SketchException;
28+
import processing.app.*;
3329
import processing.app.exec.ProcessHelper;
3430
import processing.app.exec.ProcessResult;
3531
import processing.core.PApplet;
@@ -73,6 +69,8 @@ public static void setSdkTarget(AndroidSDK.SDKTarget target, Sketch sketch) {
7369

7470
Manifest manifest = new Manifest(sketch);
7571
manifest.setSdkTarget(sdkVersion);
72+
73+
Preferences.set("android.sdk.version", sdkVersion);
7674
}
7775

7876
/**

src/processing/mode/android/AndroidEditor.java

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,14 +284,23 @@ private void updateSdkMenu(final JMenu sdkMenu) {
284284
AndroidSDK.SDKTarget lowestTargetAvailable = null;
285285
JCheckBoxMenuItem lowestTargetMenuItem = null;
286286

287+
String savedTargetVersion = Preferences.get("android.sdk.version");
288+
boolean savedTargetSet = false;
289+
287290
for(final AndroidSDK.SDKTarget target : targets) {
288291
final JCheckBoxMenuItem item = new JCheckBoxMenuItem("API " + target.name + " (" + target.version + ")");
289292

290-
if(lowestTargetAvailable == null || lowestTargetAvailable.version > target.version) {
293+
if(savedTargetSet == false && (lowestTargetAvailable == null || lowestTargetAvailable.version > target.version)) {
291294
lowestTargetAvailable = target;
292295
lowestTargetMenuItem = item;
293296
}
294297

298+
if(Integer.toString(target.version).equals(savedTargetVersion)) {
299+
AndroidBuild.setSdkTarget(target, sketch);
300+
item.setState(true);
301+
savedTargetSet = true;
302+
}
303+
295304
item.addChangeListener(new ChangeListener() {
296305
@Override
297306
public void stateChanged(ChangeEvent e) {
@@ -316,8 +325,10 @@ public void actionPerformed(ActionEvent e) {
316325
sdkMenu.add(item);
317326
}
318327

319-
AndroidBuild.setSdkTarget(lowestTargetAvailable, sketch);
320-
lowestTargetMenuItem.setState(true);
328+
if(!savedTargetSet) {
329+
AndroidBuild.setSdkTarget(lowestTargetAvailable, sketch);
330+
lowestTargetMenuItem.setState(true);
331+
}
321332
} catch (IOException e) {
322333
e.printStackTrace();
323334
}

0 commit comments

Comments
 (0)