Skip to content

Commit e465392

Browse files
committed
Add support for all the new iPads
1 parent 8c0588d commit e465392

File tree

2 files changed

+94
-3
lines changed

2 files changed

+94
-3
lines changed

src/main/java/com/airsquared/blobsaver/Controller.java

+85-2
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,10 @@ public void initialize() {
158158
"iPad Mini 4 (Wifi)", "iPad Mini 4 (Cellular)", "iPad Air 2 (WiFi)", "iPad Air 2 (Cellular)",
159159
"iPad Pro 9.7 (Wifi)", "iPad Pro 9.7 (Cellular)", "iPad Pro 12.9 (WiFi)", "iPad Pro 12.9 (Cellular)",
160160
"iPad 5 (Wifi)", "iPad 5 (Cellular)", "iPad Pro 2 12.9 (WiFi)(iPad7,1)", "iPad Pro 2 12.9 (Cellular)(iPad7,2)",
161-
"iPad Pro 10.5 (WiFi)(iPad7,3)", "iPad 10.5 (Cellular)(iPad7,4)", "iPad 6 (WiFi)(iPad 7,5)", "iPad 6 (Cellular)(iPad7,6)");
161+
"iPad Pro 10.5 (WiFi)(iPad7,3)", "iPad 10.5 (Cellular)(iPad7,4)", "iPad 6 (WiFi)(iPad 7,5)",
162+
"iPad 6 (Cellular)(iPad7,6)", "iPad Pro 3 11' (WiFi)(iPad8,1)", "iPad Pro 3 11' (WiFi)(iPad8,2)",
163+
"iPad Pro 3 11' (Cellular)(iPad8,3)", "iPad Pro 3 11' (Cellular)(iPad8,4)", "iPad Pro 3 12.9'(WiFi)(iPad8,5)",
164+
"iPad Pro 3 12.9 (WiFi)(iPad8,6)", "iPad Pro 3 12.9 (Cellular)(iPad8,7)", "iPad Pro 3 12.9 (Cellular)(iPad8,8)");
162165
final ObservableList AppleTVs = FXCollections.observableArrayList("Apple TV 2G", "Apple TV 3", "Apple TV 3 (2013)", "Apple TV 4 (2015)", "Apple TV 4K");
163166
deviceTypeChoiceBox.setItems(FXCollections.observableArrayList("iPhone", "iPod", "iPad", "AppleTV"));
164167

@@ -234,6 +237,46 @@ public void initialize() {
234237
getBoardConfig = true;
235238
boardConfigField.setDisable(false);
236239
boardConfigField.setText("N841AP");
240+
} else if (v.equals("iPad Pro 3 11' (WiFi)(iPad8,1)")) {
241+
boardConfigField.setEffect(borderGlow);
242+
getBoardConfig = true;
243+
boardConfigField.setDisable(false);
244+
boardConfigField.setText("J317AP");
245+
} else if (v.equals("iPad Pro 3 11' (WiFi)(iPad8,2)")) {
246+
boardConfigField.setEffect(borderGlow);
247+
getBoardConfig = true;
248+
boardConfigField.setDisable(false);
249+
boardConfigField.setText("J317xAP");
250+
} else if (v.equals("iPad Pro 3 11' (Cellular)(iPad8,3)")) {
251+
boardConfigField.setEffect(borderGlow);
252+
getBoardConfig = true;
253+
boardConfigField.setDisable(false);
254+
boardConfigField.setText("J318AP");
255+
} else if (v.equals("iPad Pro 3 11' (Cellular)(iPad8,4)")) {
256+
boardConfigField.setEffect(borderGlow);
257+
getBoardConfig = true;
258+
boardConfigField.setDisable(false);
259+
boardConfigField.setText("J318xAP");
260+
} else if (v.equals("iPad Pro 3 12.9'(WiFi)(iPad8,5)")) {
261+
boardConfigField.setEffect(borderGlow);
262+
getBoardConfig = true;
263+
boardConfigField.setDisable(false);
264+
boardConfigField.setText("J320AP");
265+
} else if (v.equals("iPad Pro 3 12.9 (WiFi)(iPad8,6)")) {
266+
boardConfigField.setEffect(borderGlow);
267+
getBoardConfig = true;
268+
boardConfigField.setDisable(false);
269+
boardConfigField.setText("J320xAP");
270+
} else if (v.equals("iPad Pro 3 12.9 (Cellular)(iPad8,7)")) {
271+
boardConfigField.setEffect(borderGlow);
272+
getBoardConfig = true;
273+
boardConfigField.setDisable(false);
274+
boardConfigField.setText("J321AP");
275+
} else if (v.equals("iPad Pro 3 12.9 (Cellular)(iPad8,8)")) {
276+
boardConfigField.setEffect(borderGlow);
277+
getBoardConfig = true;
278+
boardConfigField.setDisable(false);
279+
boardConfigField.setText("J321xAP");
237280
} else {
238281
boardConfigField.setEffect(null);
239282
getBoardConfig = false;
@@ -278,6 +321,46 @@ public void initialize() {
278321
getBoardConfig = true;
279322
boardConfigField.setDisable(false);
280323
boardConfigField.setText("N841AP");
324+
} else if (newValue.equals("iPad8,1")) {
325+
boardConfigField.setEffect(borderGlow);
326+
getBoardConfig = true;
327+
boardConfigField.setDisable(false);
328+
boardConfigField.setText("J317AP");
329+
} else if (newValue.equals("iPad8,2")) {
330+
boardConfigField.setEffect(borderGlow);
331+
getBoardConfig = true;
332+
boardConfigField.setDisable(false);
333+
boardConfigField.setText("J317xAP");
334+
} else if (newValue.equals("iPad8,3")) {
335+
boardConfigField.setEffect(borderGlow);
336+
getBoardConfig = true;
337+
boardConfigField.setDisable(false);
338+
boardConfigField.setText("J318AP");
339+
} else if (newValue.equals("iPad8,4)")) {
340+
boardConfigField.setEffect(borderGlow);
341+
getBoardConfig = true;
342+
boardConfigField.setDisable(false);
343+
boardConfigField.setText("J318xAP");
344+
} else if (newValue.equals("iPad8,5")) {
345+
boardConfigField.setEffect(borderGlow);
346+
getBoardConfig = true;
347+
boardConfigField.setDisable(false);
348+
boardConfigField.setText("J320AP");
349+
} else if (newValue.equals("iPad8,6")) {
350+
boardConfigField.setEffect(borderGlow);
351+
getBoardConfig = true;
352+
boardConfigField.setDisable(false);
353+
boardConfigField.setText("J320xAP");
354+
} else if (newValue.equals("iPad8,7")) {
355+
boardConfigField.setEffect(borderGlow);
356+
getBoardConfig = true;
357+
boardConfigField.setDisable(false);
358+
boardConfigField.setText("J321AP");
359+
} else if (newValue.equals("iPad8,8")) {
360+
boardConfigField.setEffect(borderGlow);
361+
getBoardConfig = true;
362+
boardConfigField.setDisable(false);
363+
boardConfigField.setText("J321xAP");
281364
} else {
282365
boardConfigField.setEffect(null);
283366
getBoardConfig = false;
@@ -868,7 +951,7 @@ public void aboutMenuHandler() {
868951
alert.setHeaderText("blobsaver " + Main.appVersion);
869952
alert.setContentText("blobsaver Copyright (c) 2018 airsquared\n\n" +
870953
"This program is licensed under GNU GPL v3.0-only");
871-
954+
872955
resizeAlertButtons(alert);
873956
alert.showAndWait();
874957
switch (alert.getResult().getText()) {

src/main/resources/com/airsquared/blobsaver/devicemodels.properties

+9-1
Original file line numberDiff line numberDiff line change
@@ -92,4 +92,12 @@ iPad\ Pro\ 2\ 12.9\ (Cellular)(iPad7,2)=iPad7,2
9292
iPad\ Pro\ 10.5\ (WiFi)(iPad7,3)=iPad7,3
9393
iPad\ 10.5\ (Cellular)(iPad7,4)=iPad7,4
9494
iPad\ 6\ (WiFi)(iPad\ 7,5)=iPad7,5
95-
iPad\ 6\ (Cellular)(iPad7,6)=iPad7,6
95+
iPad\ 6\ (Cellular)(iPad7,6)=iPad7,6
96+
iPad\ Pro\ 3\ 11'\ (WiFi)(iPad8,1)=iPad8,1
97+
iPad\ Pro\ 3\ 11'\ (WiFi)(iPad8,2)=iPad8,2
98+
iPad\ Pro\ 3\ 11'\ (Cellular)(iPad8,3)=iPad8,3
99+
iPad\ Pro\ 3\ 11'\ (Cellular)(iPad8,4)=iPad8,4
100+
iPad\ Pro\ 3\ 12.9'(WiFi)(iPad8,5)=iPad8,5
101+
iPad\ Pro\ 3\ 12.9\ (WiFi)(iPad8,6)=iPad8,6
102+
iPad\ Pro\ 3\ 12.9\ (Cellular)(iPad8,7)=iPad8,7
103+
iPad\ Pro\ 3\ 12.9\ (Cellular)(iPad8,8)=iPad8,8

0 commit comments

Comments
 (0)