newestRelease = result.get(0);
String newestTag = (String) newestRelease.get("tag_name");
System.out.println("Newest FRGUI version: " + newestTag);
//If user is not on latest version
- if (!newestTag.contains(currentFRGUIVersion)) {
+ if (!newestTag.equals(currentFRGUIVersion)) {
System.out.println("A newer version of FutureRestore GUI is available.");
- mainMenuInstance.appendToLog("A newer version of FutureRestore GUI is available.");
-
- Object[] choices = {"Open link", "Ok"};
+ mainMenuInstance.messageToLog("A newer version of FutureRestore GUI is available.");
+
+ // Label on top of release notes
+ JLabel label = new JLabel("A newer version of FutureRestore GUI is available.\n" +
+ "You're on version " + currentFRGUIVersion + " and the latest version is " + newestTag + ".");
+ Border padding = BorderFactory.createEmptyBorder(0, 0, 10, 10);
+ label.setBorder(padding);
+
+ // Fetch release notes
+ String mdReleaseBody = getLatestFrguiReleaseBody();
+ String htmlReleaseBody = "" +
+ "" +
+ "" +
+ "" +
+ ""
+ + Processor.process(mdReleaseBody).replaceAll("\\n", "") +
+ "
" +
+ "";
+ System.out.println(htmlReleaseBody);
+
+ // Build the text area
+ JTextPane whatsNewTextPane = new JTextPane();
+ whatsNewTextPane.setEditable(false);
+ whatsNewTextPane.setContentType("text/html");
+ whatsNewTextPane.setText(htmlReleaseBody);
+ JScrollPane scrollPane = new JScrollPane(whatsNewTextPane);
+ scrollPane.setBorder(null);
+ scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED);
+ scrollPane.setPreferredSize(new Dimension(150, 300));
+
+ JPanel panel = new JPanel();
+ BoxLayout boxlayout = new BoxLayout(panel, BoxLayout.Y_AXIS); // Top to bottom
+ panel.setBorder(null);
+ panel.setLayout(boxlayout);
+ panel.add(label);
+ panel.add(scrollPane);
+
+ Object[] choices = {"Update now", "Remind me later"};
Object defaultChoice = choices[0];
+ int response = JOptionPane.showOptionDialog(mainMenuFrame, panel, "Update FutureRestore GUI", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, choices, defaultChoice);
- int response = JOptionPane.showOptionDialog(mainMenuInstance.mainMenuView, "A newer version of FutureRestore GUI is available.\n" +
- "You're on version " + currentFRGUIVersion + " and the latest version is " + newestTag + ".\n" +
- "https://github.com/CoocooFroggy/FutureRestore-GUI/releases", "Update FutureRestore GUI", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, choices, defaultChoice);
if (response == JOptionPane.YES_OPTION) {
- FutureRestoreWorker.openWebpage("https://github.com/CoocooFroggy/FutureRestore-GUI/releases");
+// FRUtils.openWebpage("https://github.com/CoocooFroggy/FutureRestore-GUI/releases");
+ boolean didSucceedUpdate = FRUtils.updateFRGUI(mainMenuInstance);
+ // If update failed fatally, enable everything again
+ if (!didSucceedUpdate) {
+ FRUtils.setEnabled(mainMenuInstance.mainMenuView, true, true);
+ }
}
+
} else {
System.out.println("You're on the latest version of FutureRestore GUI.");
- mainMenuInstance.appendToLog("You're on the latest version of FutureRestore GUI.");
+ mainMenuInstance.messageToLog("You're on the latest version of FutureRestore GUI.");
}
- } catch (IOException e) {
+ } catch (IOException | InterruptedException e) {
e.printStackTrace();
}
}).start();
}
+ public static String getLatestFrguiReleaseBody() throws IOException {
+ String content = getRequestUrl("https://api.github.com/repos/CoocooFroggy/FutureRestore-GUI/releases");
+
+ Gson gson = new Gson();
+ ArrayList> result = gson.fromJson(content, ArrayList.class);
+ Map newestRelease = result.get(0);
+ return (String) newestRelease.get("body");
+ }
+
+ public static void deleteFile(File fileToDelete) {
+ if (!fileToDelete.delete()) {
+ try {
+ FileUtils.forceDelete(fileToDelete);
+ } catch (IOException exception) {
+ System.err.println("Unable to delete " + fileToDelete.getAbsolutePath() + ".");
+ exception.printStackTrace();
+ }
+ }
+ }
+
+ /* Private vars */
+ public JFrame getMainMenuFrame() {
+ return mainMenuFrame;
+ }
+
+ public JPanel getMainMenuView() {
+ return mainMenuView;
+ }
+
+ public JProgressBar getLogProgressBar() {
+ return logProgressBar;
+ }
+
+ public JTextField getCurrentTaskTextField() {
+ return currentTaskTextField;
+ }
+
+ public JButton getStartFutureRestoreButton() {
+ return startFutureRestoreButton;
+ }
+
+ public JButton getNextButtonFiles() {
+ return nextButtonFiles;
+ }
+
+ public JButton getNextButtonOptions() {
+ return nextButtonOptions;
+ }
+
/**
* Method generated by IntelliJ IDEA GUI Designer
* >>> IMPORTANT!! <<<
@@ -1118,97 +1333,30 @@ static void alertIfNewerFRGUIAvailable(MainMenu mainMenuInstance, String current
mainMenuView = new JPanel();
mainMenuView.setLayout(new GridBagLayout());
final JLabel label1 = new JLabel();
- Font label1Font = this.$$$getFont$$$(null, Font.BOLD, -1, label1.getFont());
+ Font label1Font = this.$$$getFont$$$(null, Font.BOLD, 28, label1.getFont());
if (label1Font != null) label1.setFont(label1Font);
- label1.setText("Blob");
+ label1.setText("FutureRestore GUI");
GridBagConstraints gbc;
gbc = new GridBagConstraints();
gbc.gridx = 0;
- gbc.gridy = 4;
- gbc.anchor = GridBagConstraints.WEST;
- gbc.insets = new Insets(0, 10, 0, 10);
- mainMenuView.add(label1, gbc);
- selectTargetIPSWFileButton = new JButton();
- selectTargetIPSWFileButton.setText("Select Target iPSW File...");
- gbc = new GridBagConstraints();
- gbc.gridx = 1;
- gbc.gridy = 5;
- gbc.gridwidth = 7;
- gbc.weightx = 1.0;
- gbc.fill = GridBagConstraints.HORIZONTAL;
- gbc.insets = new Insets(0, 0, 0, 10);
- mainMenuView.add(selectTargetIPSWFileButton, gbc);
- final JLabel label2 = new JLabel();
- Font label2Font = this.$$$getFont$$$(null, Font.BOLD, -1, label2.getFont());
- if (label2Font != null) label2.setFont(label2Font);
- label2.setText("Target IPSW");
- gbc = new GridBagConstraints();
- gbc.gridx = 0;
- gbc.gridy = 5;
- gbc.anchor = GridBagConstraints.WEST;
- gbc.insets = new Insets(0, 10, 0, 10);
- mainMenuView.add(label2, gbc);
- final JLabel label3 = new JLabel();
- Font label3Font = this.$$$getFont$$$(null, Font.BOLD, -1, label3.getFont());
- if (label3Font != null) label3.setFont(label3Font);
- label3.setText("Options");
- gbc = new GridBagConstraints();
- gbc.gridx = 0;
- gbc.gridy = 7;
- gbc.anchor = GridBagConstraints.WEST;
- gbc.insets = new Insets(0, 10, 0, 10);
- mainMenuView.add(label3, gbc);
- final JLabel label4 = new JLabel();
- Font label4Font = this.$$$getFont$$$(null, Font.BOLD, -1, label4.getFont());
- if (label4Font != null) label4.setFont(label4Font);
- label4.setText("FutureRestore");
- gbc = new GridBagConstraints();
- gbc.gridx = 0;
- gbc.gridy = 3;
- gbc.anchor = GridBagConstraints.WEST;
- gbc.insets = new Insets(0, 10, 0, 10);
- mainMenuView.add(label4, gbc);
- selectFutureRestoreBinaryExecutableButton = new JButton();
- selectFutureRestoreBinaryExecutableButton.setText("Select FutureRestore Binary/Executable...");
- gbc = new GridBagConstraints();
- gbc.gridx = 1;
- gbc.gridy = 3;
- gbc.gridwidth = 3;
- gbc.fill = GridBagConstraints.HORIZONTAL;
- mainMenuView.add(selectFutureRestoreBinaryExecutableButton, gbc);
- final JLabel label5 = new JLabel();
- Font label5Font = this.$$$getFont$$$(null, Font.BOLD, 28, label5.getFont());
- if (label5Font != null) label5.setFont(label5Font);
- label5.setText("FutureRestore GUI");
- gbc = new GridBagConstraints();
- gbc.gridx = 0;
gbc.gridy = 0;
- gbc.gridwidth = 4;
gbc.anchor = GridBagConstraints.WEST;
gbc.insets = new Insets(10, 10, 0, 0);
- mainMenuView.add(label5, gbc);
+ mainMenuView.add(label1, gbc);
authorAndVersionLabel = new JLabel();
authorAndVersionLabel.setText("by CoocooFroggy");
gbc = new GridBagConstraints();
gbc.gridx = 0;
gbc.gridy = 1;
- gbc.gridwidth = 2;
gbc.anchor = GridBagConstraints.WEST;
gbc.insets = new Insets(0, 10, 10, 0);
mainMenuView.add(authorAndVersionLabel, gbc);
- final JSeparator separator1 = new JSeparator();
+ logScrollPane = new JScrollPane();
gbc = new GridBagConstraints();
gbc.gridx = 0;
- gbc.gridy = 2;
- gbc.gridwidth = 8;
- gbc.fill = GridBagConstraints.BOTH;
- gbc.ipady = 1;
- mainMenuView.add(separator1, gbc);
- logScrollPane = new JScrollPane();
- gbc = new GridBagConstraints();
- gbc.gridx = 0;
- gbc.gridy = 17;
- gbc.gridwidth = 8;
+ gbc.gridy = 4;
+ gbc.gridwidth = 2;
+ gbc.weightx = 1.0;
gbc.weighty = 1.0;
gbc.fill = GridBagConstraints.BOTH;
mainMenuView.add(logScrollPane, gbc);
@@ -1222,6 +1370,80 @@ static void alertIfNewerFRGUIAvailable(MainMenu mainMenuInstance, String current
logTextArea.setText("");
logTextArea.setWrapStyleWord(true);
logScrollPane.setViewportView(logTextArea);
+ logProgressBar = new JProgressBar();
+ gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 3;
+ gbc.gridwidth = 2;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ mainMenuView.add(logProgressBar, gbc);
+ settingsButton = new JButton();
+ settingsButton.setText("Settings");
+ gbc = new GridBagConstraints();
+ gbc.gridx = 1;
+ gbc.gridy = 0;
+ gbc.anchor = GridBagConstraints.EAST;
+ gbc.insets = new Insets(0, 0, 0, 10);
+ mainMenuView.add(settingsButton, gbc);
+ tabbedPane = new JTabbedPane();
+ gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 2;
+ gbc.gridwidth = 2;
+ gbc.weightx = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ mainMenuView.add(tabbedPane, gbc);
+ final JPanel panel1 = new JPanel();
+ panel1.setLayout(new GridBagLayout());
+ tabbedPane.addTab("Files", panel1);
+ final JLabel label2 = new JLabel();
+ Font label2Font = this.$$$getFont$$$(null, Font.BOLD, -1, label2.getFont());
+ if (label2Font != null) label2.setFont(label2Font);
+ label2.setText("FutureRestore");
+ gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 1;
+ gbc.anchor = GridBagConstraints.EAST;
+ gbc.insets = new Insets(10, 10, 0, 10);
+ panel1.add(label2, gbc);
+ selectFutureRestoreBinaryExecutableButton = new JButton();
+ selectFutureRestoreBinaryExecutableButton.setText("Select FutureRestore Binary/Executable...");
+ gbc = new GridBagConstraints();
+ gbc.gridx = 1;
+ gbc.gridy = 1;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.insets = new Insets(10, 0, 0, 0);
+ panel1.add(selectFutureRestoreBinaryExecutableButton, gbc);
+ final JLabel label3 = new JLabel();
+ label3.setText("OR");
+ gbc = new GridBagConstraints();
+ gbc.gridx = 2;
+ gbc.gridy = 1;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.insets = new Insets(10, 5, 0, 5);
+ panel1.add(label3, gbc);
+ downloadFutureRestoreButton = new JButton();
+ downloadFutureRestoreButton.setText("Download FutureRestore");
+ gbc = new GridBagConstraints();
+ gbc.gridx = 3;
+ gbc.gridy = 1;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.insets = new Insets(10, 0, 0, 10);
+ panel1.add(downloadFutureRestoreButton, gbc);
+ final JLabel label4 = new JLabel();
+ Font label4Font = this.$$$getFont$$$(null, Font.BOLD, -1, label4.getFont());
+ if (label4Font != null) label4.setFont(label4Font);
+ label4.setText("Blob");
+ gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 3;
+ gbc.anchor = GridBagConstraints.EAST;
+ gbc.insets = new Insets(0, 10, 0, 10);
+ panel1.add(label4, gbc);
selectBlobFileButton = new JButton();
selectBlobFileButton.setHideActionText(false);
selectBlobFileButton.setHorizontalAlignment(0);
@@ -1230,12 +1452,102 @@ static void alertIfNewerFRGUIAvailable(MainMenu mainMenuInstance, String current
selectBlobFileButton.setVerticalTextPosition(0);
gbc = new GridBagConstraints();
gbc.gridx = 1;
- gbc.gridy = 4;
- gbc.gridwidth = 7;
+ gbc.gridy = 3;
+ gbc.gridwidth = 3;
gbc.weightx = 1.0;
- gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.weighty = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
gbc.insets = new Insets(0, 0, 0, 10);
- mainMenuView.add(selectBlobFileButton, gbc);
+ panel1.add(selectBlobFileButton, gbc);
+ final JLabel label5 = new JLabel();
+ Font label5Font = this.$$$getFont$$$(null, Font.BOLD, -1, label5.getFont());
+ if (label5Font != null) label5.setFont(label5Font);
+ label5.setText("Target IPSW");
+ gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 5;
+ gbc.anchor = GridBagConstraints.EAST;
+ gbc.insets = new Insets(0, 10, 0, 10);
+ panel1.add(label5, gbc);
+ selectTargetIPSWFileButton = new JButton();
+ selectTargetIPSWFileButton.setText("Select Target iPSW File...");
+ gbc = new GridBagConstraints();
+ gbc.gridx = 1;
+ gbc.gridy = 5;
+ gbc.gridwidth = 3;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.insets = new Insets(0, 0, 0, 10);
+ panel1.add(selectTargetIPSWFileButton, gbc);
+ nextButtonFiles = new JButton();
+ nextButtonFiles.setText("Next");
+ gbc = new GridBagConstraints();
+ gbc.gridx = 3;
+ gbc.gridy = 7;
+ gbc.anchor = GridBagConstraints.NORTHEAST;
+ gbc.insets = new Insets(0, 0, 5, 10);
+ panel1.add(nextButtonFiles, gbc);
+ final JPanel spacer1 = new JPanel();
+ gbc = new GridBagConstraints();
+ gbc.gridx = 1;
+ gbc.gridy = 6;
+ gbc.weighty = 0.5;
+ gbc.fill = GridBagConstraints.VERTICAL;
+ panel1.add(spacer1, gbc);
+ final JPanel spacer2 = new JPanel();
+ gbc = new GridBagConstraints();
+ gbc.gridx = 1;
+ gbc.gridy = 2;
+ gbc.weighty = 0.5;
+ gbc.fill = GridBagConstraints.VERTICAL;
+ panel1.add(spacer2, gbc);
+ final JPanel spacer3 = new JPanel();
+ gbc = new GridBagConstraints();
+ gbc.gridx = 1;
+ gbc.gridy = 4;
+ gbc.weighty = 0.5;
+ gbc.fill = GridBagConstraints.VERTICAL;
+ panel1.add(spacer3, gbc);
+ final JPanel spacer4 = new JPanel();
+ gbc = new GridBagConstraints();
+ gbc.gridx = 1;
+ gbc.gridy = 0;
+ gbc.weighty = 0.5;
+ gbc.fill = GridBagConstraints.VERTICAL;
+ panel1.add(spacer4, gbc);
+ final JPanel panel2 = new JPanel();
+ panel2.setLayout(new GridBagLayout());
+ tabbedPane.addTab("Options", panel2);
+ final JLabel label6 = new JLabel();
+ Font label6Font = this.$$$getFont$$$(null, Font.BOLD, -1, label6.getFont());
+ if (label6Font != null) label6.setFont(label6Font);
+ label6.setText("Arguments");
+ gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.gridheight = 2;
+ gbc.anchor = GridBagConstraints.EAST;
+ gbc.insets = new Insets(0, 10, 0, 10);
+ panel2.add(label6, gbc);
+ final JSeparator separator1 = new JSeparator();
+ gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 4;
+ gbc.gridwidth = 5;
+ gbc.fill = GridBagConstraints.BOTH;
+ panel2.add(separator1, gbc);
+ final JLabel label7 = new JLabel();
+ Font label7Font = this.$$$getFont$$$(null, Font.BOLD, -1, label7.getFont());
+ if (label7Font != null) label7.setFont(label7Font);
+ label7.setText("Baseband and SEP");
+ gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 5;
+ gbc.gridheight = 2;
+ gbc.anchor = GridBagConstraints.EAST;
+ gbc.insets = new Insets(0, 10, 0, 10);
+ panel2.add(label7, gbc);
basebandComboBox = new JComboBox();
final DefaultComboBoxModel defaultComboBoxModel1 = new DefaultComboBoxModel();
defaultComboBoxModel1.addElement("Latest Baseband");
@@ -1244,21 +1556,12 @@ static void alertIfNewerFRGUIAvailable(MainMenu mainMenuInstance, String current
basebandComboBox.setModel(defaultComboBoxModel1);
gbc = new GridBagConstraints();
gbc.gridx = 1;
- gbc.gridy = 10;
- gbc.anchor = GridBagConstraints.WEST;
- gbc.fill = GridBagConstraints.HORIZONTAL;
- mainMenuView.add(basebandComboBox, gbc);
- basebandTextField = new JTextField();
- basebandTextField.setEditable(false);
- basebandTextField.setText("✓ (No file)");
- gbc = new GridBagConstraints();
- gbc.gridx = 2;
- gbc.gridy = 10;
- gbc.gridwidth = 6;
+ gbc.gridy = 5;
+ gbc.weightx = 1.0;
gbc.anchor = GridBagConstraints.WEST;
gbc.fill = GridBagConstraints.HORIZONTAL;
- gbc.insets = new Insets(0, 0, 0, 10);
- mainMenuView.add(basebandTextField, gbc);
+ gbc.insets = new Insets(10, 0, 0, 0);
+ panel2.add(basebandComboBox, gbc);
sepComboBox = new JComboBox();
final DefaultComboBoxModel defaultComboBoxModel2 = new DefaultComboBoxModel();
defaultComboBoxModel2.addElement("Latest SEP");
@@ -1266,207 +1569,248 @@ static void alertIfNewerFRGUIAvailable(MainMenu mainMenuInstance, String current
sepComboBox.setModel(defaultComboBoxModel2);
gbc = new GridBagConstraints();
gbc.gridx = 1;
- gbc.gridy = 11;
+ gbc.gridy = 6;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ panel2.add(sepComboBox, gbc);
+ basebandTextField = new JTextField();
+ basebandTextField.setEditable(false);
+ basebandTextField.setText("✓ (No file)");
+ gbc = new GridBagConstraints();
+ gbc.gridx = 2;
+ gbc.gridy = 5;
+ gbc.gridwidth = 2;
gbc.anchor = GridBagConstraints.WEST;
gbc.fill = GridBagConstraints.HORIZONTAL;
- mainMenuView.add(sepComboBox, gbc);
+ gbc.insets = new Insets(10, 0, 0, 0);
+ panel2.add(basebandTextField, gbc);
sepTextField = new JTextField();
sepTextField.setEditable(false);
sepTextField.setText("✓ (No file)");
gbc = new GridBagConstraints();
gbc.gridx = 2;
- gbc.gridy = 11;
- gbc.gridwidth = 6;
+ gbc.gridy = 6;
+ gbc.gridwidth = 2;
gbc.anchor = GridBagConstraints.WEST;
gbc.fill = GridBagConstraints.HORIZONTAL;
- gbc.insets = new Insets(0, 0, 0, 10);
- mainMenuView.add(sepTextField, gbc);
- final JSeparator separator2 = new JSeparator();
- gbc = new GridBagConstraints();
- gbc.gridx = 0;
- gbc.gridy = 12;
- gbc.gridwidth = 6;
- gbc.weighty = 0.01;
- gbc.fill = GridBagConstraints.BOTH;
- gbc.ipady = 1;
- mainMenuView.add(separator2, gbc);
- final JSeparator separator3 = new JSeparator();
+ panel2.add(sepTextField, gbc);
+ selectBuildManifestButton = new JButton();
+ selectBuildManifestButton.setEnabled(false);
+ selectBuildManifestButton.setText("Select BuildManifest...");
gbc = new GridBagConstraints();
- gbc.gridx = 0;
- gbc.gridy = 6;
- gbc.gridwidth = 8;
- gbc.weighty = 0.01;
+ gbc.gridx = 4;
+ gbc.gridy = 5;
+ gbc.gridheight = 2;
gbc.fill = GridBagConstraints.BOTH;
- gbc.ipady = 1;
- mainMenuView.add(separator3, gbc);
- final JLabel label6 = new JLabel();
- label6.setText("Arguments");
+ gbc.insets = new Insets(10, 0, 0, 10);
+ panel2.add(selectBuildManifestButton, gbc);
+ nextButtonOptions = new JButton();
+ nextButtonOptions.setText("Next");
gbc = new GridBagConstraints();
- gbc.gridx = 1;
+ gbc.gridx = 4;
gbc.gridy = 7;
- gbc.anchor = GridBagConstraints.WEST;
- mainMenuView.add(label6, gbc);
- startFutureRestoreButton = new JButton();
- Font startFutureRestoreButtonFont = this.$$$getFont$$$(null, Font.BOLD, 16, startFutureRestoreButton.getFont());
- if (startFutureRestoreButtonFont != null) startFutureRestoreButton.setFont(startFutureRestoreButtonFont);
- startFutureRestoreButton.setText("Start FutureRestore");
- gbc = new GridBagConstraints();
- gbc.gridx = 2;
- gbc.gridy = 13;
- gbc.gridwidth = 4;
- gbc.fill = GridBagConstraints.BOTH;
- mainMenuView.add(startFutureRestoreButton, gbc);
- exitRecoveryButton = new JButton();
- exitRecoveryButton.setText("Exit Recovery");
- exitRecoveryButton.setVerticalAlignment(0);
- exitRecoveryButton.setVerticalTextPosition(0);
+ gbc.anchor = GridBagConstraints.NORTHEAST;
+ gbc.insets = new Insets(0, 0, 5, 10);
+ panel2.add(nextButtonOptions, gbc);
+ debugDCheckBox = new JCheckBox();
+ debugDCheckBox.setSelected(true);
+ debugDCheckBox.setText("Extra Logs");
gbc = new GridBagConstraints();
gbc.gridx = 1;
- gbc.gridy = 13;
- gbc.fill = GridBagConstraints.BOTH;
- mainMenuView.add(exitRecoveryButton, gbc);
- final JSeparator separator4 = new JSeparator();
- gbc = new GridBagConstraints();
- gbc.gridx = 7;
- gbc.gridy = 14;
- gbc.weighty = 0.01;
- gbc.fill = GridBagConstraints.BOTH;
- mainMenuView.add(separator4, gbc);
- final JLabel label7 = new JLabel();
- Font label7Font = this.$$$getFont$$$(null, Font.BOLD, -1, label7.getFont());
- if (label7Font != null) label7.setFont(label7Font);
- label7.setText("Current Task");
- gbc = new GridBagConstraints();
- gbc.gridx = 0;
- gbc.gridy = 15;
- gbc.anchor = GridBagConstraints.WEST;
- gbc.insets = new Insets(15, 10, 15, 10);
- mainMenuView.add(label7, gbc);
- logProgressBar = new JProgressBar();
- gbc = new GridBagConstraints();
- gbc.gridx = 0;
- gbc.gridy = 16;
- gbc.gridwidth = 8;
- gbc.fill = GridBagConstraints.HORIZONTAL;
- mainMenuView.add(logProgressBar, gbc);
- settingsButton = new JButton();
- settingsButton.setText("Settings");
- gbc = new GridBagConstraints();
- gbc.gridx = 4;
gbc.gridy = 0;
- gbc.gridwidth = 4;
- gbc.anchor = GridBagConstraints.EAST;
- gbc.insets = new Insets(0, 0, 0, 10);
- mainMenuView.add(settingsButton, gbc);
- downloadFutureRestoreButton = new JButton();
- downloadFutureRestoreButton.setText("Download FutureRestore");
- gbc = new GridBagConstraints();
- gbc.gridx = 5;
- gbc.gridy = 3;
- gbc.gridwidth = 3;
- gbc.fill = GridBagConstraints.HORIZONTAL;
- gbc.insets = new Insets(0, 0, 0, 10);
- mainMenuView.add(downloadFutureRestoreButton, gbc);
- updateUCheckBox = new JCheckBox();
- updateUCheckBox.setText("Preserve Data");
- gbc = new GridBagConstraints();
- gbc.gridx = 3;
- gbc.gridy = 7;
gbc.weightx = 1.0;
gbc.anchor = GridBagConstraints.WEST;
- mainMenuView.add(updateUCheckBox, gbc);
+ gbc.insets = new Insets(10, 0, 0, 10);
+ panel2.add(debugDCheckBox, gbc);
final JLabel label8 = new JLabel();
Font label8Font = this.$$$getFont$$$("Menlo", -1, 10, label8.getFont());
if (label8Font != null) label8.setFont(label8Font);
- label8.setText("(--update)");
+ label8.setText("(--debug)");
gbc = new GridBagConstraints();
- gbc.gridx = 3;
- gbc.gridy = 8;
- gbc.anchor = GridBagConstraints.NORTH;
- mainMenuView.add(label8, gbc);
- waitWCheckBox = new JCheckBox();
- waitWCheckBox.setText("AP Nonce Collision");
+ gbc.gridx = 1;
+ gbc.gridy = 1;
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ gbc.insets = new Insets(0, 25, 10, 0);
+ panel2.add(label8, gbc);
+ updateUCheckBox = new JCheckBox();
+ updateUCheckBox.setText("Preserve Data");
gbc = new GridBagConstraints();
- gbc.gridx = 7;
- gbc.gridy = 7;
+ gbc.gridx = 2;
+ gbc.gridy = 0;
gbc.weightx = 1.0;
gbc.anchor = GridBagConstraints.WEST;
- gbc.insets = new Insets(0, 0, 0, 10);
- mainMenuView.add(waitWCheckBox, gbc);
+ gbc.insets = new Insets(10, 0, 0, 10);
+ panel2.add(updateUCheckBox, gbc);
final JLabel label9 = new JLabel();
Font label9Font = this.$$$getFont$$$("Menlo", -1, 10, label9.getFont());
if (label9Font != null) label9.setFont(label9Font);
- label9.setText("(--wait)");
+ label9.setText("(--update)");
gbc = new GridBagConstraints();
- gbc.gridx = 7;
- gbc.gridy = 8;
- gbc.anchor = GridBagConstraints.NORTH;
- mainMenuView.add(label9, gbc);
- final JSeparator separator5 = new JSeparator();
+ gbc.gridx = 2;
+ gbc.gridy = 1;
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ gbc.insets = new Insets(0, 25, 10, 0);
+ panel2.add(label9, gbc);
+ pwndfuCheckBox = new JCheckBox();
+ pwndfuCheckBox.setText("Pwned Restore");
gbc = new GridBagConstraints();
gbc.gridx = 1;
- gbc.gridy = 9;
- gbc.gridwidth = 7;
- gbc.weighty = 0.01;
- gbc.fill = GridBagConstraints.BOTH;
- gbc.ipady = 1;
- gbc.insets = new Insets(7, 0, 0, 0);
- mainMenuView.add(separator5, gbc);
+ gbc.gridy = 2;
+ gbc.weightx = 1.0;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.insets = new Insets(10, 0, 0, 10);
+ panel2.add(pwndfuCheckBox, gbc);
final JLabel label10 = new JLabel();
Font label10Font = this.$$$getFont$$$("Menlo", -1, 10, label10.getFont());
if (label10Font != null) label10.setFont(label10Font);
- label10.setText("(--debug)");
+ label10.setText("(--use-pwndfu)");
gbc = new GridBagConstraints();
- gbc.gridx = 2;
- gbc.gridy = 8;
- gbc.anchor = GridBagConstraints.NORTH;
- mainMenuView.add(label10, gbc);
- debugDCheckBox = new JCheckBox();
- debugDCheckBox.setSelected(true);
- debugDCheckBox.setText("Extra Logs");
+ gbc.gridx = 1;
+ gbc.gridy = 3;
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ gbc.insets = new Insets(0, 25, 10, 0);
+ panel2.add(label10, gbc);
+ waitWCheckBox = new JCheckBox();
+ waitWCheckBox.setText("AP Nonce Collision");
+ gbc = new GridBagConstraints();
+ gbc.gridx = 3;
+ gbc.gridy = 0;
+ gbc.weightx = 1.0;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.insets = new Insets(10, 0, 0, 10);
+ panel2.add(waitWCheckBox, gbc);
+ final JLabel label11 = new JLabel();
+ Font label11Font = this.$$$getFont$$$("Menlo", -1, 10, label11.getFont());
+ if (label11Font != null) label11.setFont(label11Font);
+ label11.setText("(--wait)");
+ gbc = new GridBagConstraints();
+ gbc.gridx = 3;
+ gbc.gridy = 1;
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ gbc.insets = new Insets(0, 25, 10, 0);
+ panel2.add(label11, gbc);
+ noIbssCheckBox = new JCheckBox();
+ noIbssCheckBox.setEnabled(false);
+ noIbssCheckBox.setSelected(false);
+ noIbssCheckBox.setText("64 Bit Checkm8");
gbc = new GridBagConstraints();
gbc.gridx = 2;
- gbc.gridy = 7;
+ gbc.gridy = 2;
gbc.weightx = 1.0;
gbc.anchor = GridBagConstraints.WEST;
- mainMenuView.add(debugDCheckBox, gbc);
- pwnedRestoreCheckBox = new JCheckBox();
- pwnedRestoreCheckBox.setText("Pwned Restore");
+ gbc.insets = new Insets(10, 0, 0, 10);
+ panel2.add(noIbssCheckBox, gbc);
+ noIbssLabel = new JLabel();
+ noIbssLabel.setEnabled(false);
+ Font noIbssLabelFont = this.$$$getFont$$$("Menlo", -1, 10, noIbssLabel.getFont());
+ if (noIbssLabelFont != null) noIbssLabel.setFont(noIbssLabelFont);
+ noIbssLabel.setText("(--no-ibss)");
gbc = new GridBagConstraints();
- gbc.gridx = 4;
- gbc.gridy = 7;
- gbc.gridwidth = 2;
+ gbc.gridx = 2;
+ gbc.gridy = 3;
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ gbc.insets = new Insets(0, 25, 10, 0);
+ panel2.add(noIbssLabel, gbc);
+ justBootCheckBox = new JCheckBox();
+ justBootCheckBox.setEnabled(false);
+ justBootCheckBox.setSelected(false);
+ justBootCheckBox.setText("Boot from Pwned DFU");
+ gbc = new GridBagConstraints();
+ gbc.gridx = 3;
+ gbc.gridy = 2;
gbc.weightx = 1.0;
gbc.anchor = GridBagConstraints.WEST;
- mainMenuView.add(pwnedRestoreCheckBox, gbc);
- final JLabel label11 = new JLabel();
- Font label11Font = this.$$$getFont$$$("Menlo", -1, 10, label11.getFont());
- if (label11Font != null) label11.setFont(label11Font);
- label11.setText("(--use-pwndfu)");
+ gbc.insets = new Insets(10, 0, 0, 0);
+ panel2.add(justBootCheckBox, gbc);
+ justBootLabel = new JLabel();
+ justBootLabel.setEnabled(false);
+ Font justBootLabelFont = this.$$$getFont$$$("Menlo", -1, 10, justBootLabel.getFont());
+ if (justBootLabelFont != null) justBootLabel.setFont(justBootLabelFont);
+ justBootLabel.setText("(--just-boot \"-v\")");
gbc = new GridBagConstraints();
- gbc.gridx = 4;
- gbc.gridy = 8;
- gbc.gridwidth = 2;
- gbc.anchor = GridBagConstraints.NORTH;
- gbc.insets = new Insets(0, 0, 0, 10);
- mainMenuView.add(label11, gbc);
+ gbc.gridx = 3;
+ gbc.gridy = 3;
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ gbc.insets = new Insets(0, 25, 10, 0);
+ panel2.add(justBootLabel, gbc);
+ final JLabel label12 = new JLabel();
+ Font label12Font = this.$$$getFont$$$(null, -1, -1, label12.getFont());
+ if (label12Font != null) label12.setFont(label12Font);
+ label12.setText("Pwned Args");
+ gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 2;
+ gbc.gridheight = 2;
+ gbc.anchor = GridBagConstraints.EAST;
+ gbc.insets = new Insets(0, 10, 0, 10);
+ panel2.add(label12, gbc);
+ final JPanel panel3 = new JPanel();
+ panel3.setLayout(new GridBagLayout());
+ tabbedPane.addTab("Controls", panel3);
+ final JLabel label13 = new JLabel();
+ Font label13Font = this.$$$getFont$$$(null, Font.BOLD, -1, label13.getFont());
+ if (label13Font != null) label13.setFont(label13Font);
+ label13.setText("Controls");
+ gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 1;
+ gbc.anchor = GridBagConstraints.EAST;
+ gbc.insets = new Insets(10, 10, 0, 10);
+ panel3.add(label13, gbc);
+ exitRecoveryButton = new JButton();
+ exitRecoveryButton.setText("Exit Recovery");
+ exitRecoveryButton.setVerticalAlignment(0);
+ exitRecoveryButton.setVerticalTextPosition(0);
+ gbc = new GridBagConstraints();
+ gbc.gridx = 1;
+ gbc.gridy = 1;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.insets = new Insets(10, 0, 0, 0);
+ panel3.add(exitRecoveryButton, gbc);
+ startFutureRestoreButton = new JButton();
+ Font startFutureRestoreButtonFont = this.$$$getFont$$$(null, Font.BOLD, 16, startFutureRestoreButton.getFont());
+ if (startFutureRestoreButtonFont != null) startFutureRestoreButton.setFont(startFutureRestoreButtonFont);
+ startFutureRestoreButton.setText("Start FutureRestore");
+ gbc = new GridBagConstraints();
+ gbc.gridx = 2;
+ gbc.gridy = 1;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.insets = new Insets(10, 0, 0, 0);
+ panel3.add(startFutureRestoreButton, gbc);
stopFutureRestoreUnsafeButton = new JButton();
stopFutureRestoreUnsafeButton.setText("Stop FutureRestore");
gbc = new GridBagConstraints();
- gbc.gridx = 7;
- gbc.gridy = 15;
- gbc.fill = GridBagConstraints.HORIZONTAL;
- gbc.insets = new Insets(0, 0, 0, 10);
- mainMenuView.add(stopFutureRestoreUnsafeButton, gbc);
- selectBuildManifestButton = new JButton();
- selectBuildManifestButton.setEnabled(false);
- selectBuildManifestButton.setText("Select BuildManifest...");
- gbc = new GridBagConstraints();
- gbc.gridx = 7;
- gbc.gridy = 13;
+ gbc.gridx = 3;
+ gbc.gridy = 1;
gbc.fill = GridBagConstraints.BOTH;
- gbc.insets = new Insets(0, 0, 0, 10);
- mainMenuView.add(selectBuildManifestButton, gbc);
+ gbc.insets = new Insets(10, 0, 0, 10);
+ panel3.add(stopFutureRestoreUnsafeButton, gbc);
+ final JPanel spacer5 = new JPanel();
+ gbc = new GridBagConstraints();
+ gbc.gridx = 2;
+ gbc.gridy = 2;
+ gbc.weighty = 2.0;
+ gbc.fill = GridBagConstraints.VERTICAL;
+ panel3.add(spacer5, gbc);
+ final JPanel spacer6 = new JPanel();
+ gbc = new GridBagConstraints();
+ gbc.gridx = 2;
+ gbc.gridy = 0;
+ gbc.weighty = 2.0;
+ gbc.fill = GridBagConstraints.VERTICAL;
+ panel3.add(spacer6, gbc);
+ final JLabel label14 = new JLabel();
+ Font label14Font = this.$$$getFont$$$(null, Font.BOLD, -1, label14.getFont());
+ if (label14Font != null) label14.setFont(label14Font);
+ label14.setText("Current Task");
+ gbc = new GridBagConstraints();
+ gbc.gridx = 0;
+ gbc.gridy = 3;
+ gbc.anchor = GridBagConstraints.EAST;
+ gbc.insets = new Insets(15, 10, 25, 10);
+ panel3.add(label14, gbc);
currentTaskTextField = new JTextField();
currentTaskTextField.setEditable(false);
Font currentTaskTextFieldFont = this.$$$getFont$$$(null, -1, 18, currentTaskTextField.getFont());
@@ -1474,28 +1818,21 @@ static void alertIfNewerFRGUIAvailable(MainMenu mainMenuInstance, String current
currentTaskTextField.setHorizontalAlignment(0);
gbc = new GridBagConstraints();
gbc.gridx = 1;
- gbc.gridy = 15;
- gbc.gridwidth = 5;
+ gbc.gridy = 3;
+ gbc.gridwidth = 3;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
gbc.anchor = GridBagConstraints.WEST;
gbc.fill = GridBagConstraints.BOTH;
- mainMenuView.add(currentTaskTextField, gbc);
- final JSeparator separator6 = new JSeparator();
- separator6.setOrientation(1);
- gbc = new GridBagConstraints();
- gbc.gridx = 6;
- gbc.gridy = 13;
- gbc.weightx = 0.01;
- gbc.fill = GridBagConstraints.BOTH;
- gbc.ipadx = 1;
- mainMenuView.add(separator6, gbc);
- final JLabel label12 = new JLabel();
- label12.setText("OR");
+ gbc.insets = new Insets(0, 0, 10, 10);
+ panel3.add(currentTaskTextField, gbc);
+ final JPanel spacer7 = new JPanel();
gbc = new GridBagConstraints();
- gbc.gridx = 4;
- gbc.gridy = 3;
- gbc.anchor = GridBagConstraints.WEST;
- gbc.insets = new Insets(0, 5, 0, 5);
- mainMenuView.add(label12, gbc);
+ gbc.gridx = 2;
+ gbc.gridy = 4;
+ gbc.weighty = 2.0;
+ gbc.fill = GridBagConstraints.VERTICAL;
+ panel3.add(spacer7, gbc);
}
/**
diff --git a/src/main/java/SettingsMenu.form b/src/main/java/SettingsMenu.form
index d65fff6..3146bf4 100644
--- a/src/main/java/SettingsMenu.form
+++ b/src/main/java/SettingsMenu.form
@@ -2,7 +2,7 @@