Skip to content

Commit 31188b3

Browse files
author
Alyx Ferrari
committed
iOS-Restrictions-Recovery v0.7.2
1 parent 62d2d5e commit 31188b3

File tree

2 files changed

+20
-9
lines changed

2 files changed

+20
-9
lines changed

‎src/com/emeryferrari/iosrr/Display.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ public class Display {
1010
private Display() {}
1111
private static final Display CLASS_OBJ = new Display();
1212
private static JFrame FRAME = new JFrame(RRConst.FULL_NAME);
13+
private static JLabel AUTHOR = new JLabel("by " + RRConst.AUTHOR);
1314
private static JLabel TITLE = new JLabel(RRConst.TITLE);
1415
private static JLabel DESC = new JLabel(RRConst.DESC);
1516
private static JButton KEY_SALT_BUTTON = new JButton(RRConst.KEY_SALT_BUTTON);
@@ -19,13 +20,15 @@ private Display() {}
1920
private static JButton ITUNES_BACKUP = new JButton(RRConst.ITUNES_BACKUP);
2021
private static JButton KEYCHAIN_DUMPER = new JButton(RRConst.KEYCHAIN_DUMPER);
2122
private static JButton ABOUT = new JButton(RRConst.ABOUT);
23+
private static JLabel iOS_13 = new JLabel(RRConst.iOS_13);
24+
private static JLabel iOS_11 = new JLabel(RRConst.iOS_11);
2225
private static InfoPlist[] plists = null;
2326
private static boolean initialized = false;
2427
public static void createDisplay() {
2528
if (!initialized) {
2629
Display.FRAME.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
2730
Display.FRAME.setSize(550, 400);
28-
Display.FRAME.setLayout(new BoxLayout(FRAME.getContentPane(), BoxLayout.Y_AXIS));
31+
Display.FRAME.getContentPane().setLayout(new BoxLayout(FRAME.getContentPane(), BoxLayout.Y_AXIS));
2932
Display.KEY_SALT_BUTTON.addActionListener(Display.CLASS_OBJ.new KeySaltButtonListener());
3033
Display.FILE_BUTTON.addActionListener(Display.CLASS_OBJ.new FileButtonListener());
3134
Display.SSH_BUTTON.addActionListener(Display.CLASS_OBJ.new SSHButtonListener());
@@ -37,25 +40,29 @@ public static void createDisplay() {
3740
initialized = true;
3841
}
3942
Display.FRAME.getContentPane().add(Display.TITLE);
43+
Display.FRAME.getContentPane().add(Display.AUTHOR);
4044
Display.FRAME.getContentPane().add(Display.DESC);
45+
Display.FRAME.getContentPane().add(Display.ABOUT);
46+
Display.FRAME.getContentPane().add(Display.iOS_11);
4147
Display.FRAME.getContentPane().add(Display.KEY_SALT_BUTTON);
4248
Display.FRAME.getContentPane().add(Display.FILE_BUTTON);
4349
Display.FRAME.getContentPane().add(Display.SSH_BUTTON);
44-
Display.FRAME.getContentPane().add(Display.KEYCHAIN_DUMPER);
4550
Display.FRAME.getContentPane().add(Display.ITUNES_BACKUP);
46-
Display.FRAME.getContentPane().add(Display.ABOUT);
51+
Display.FRAME.getContentPane().add(Display.iOS_13);
52+
Display.FRAME.getContentPane().add(Display.KEYCHAIN_DUMPER);
4753
Display.FRAME.setVisible(true);
4854
}
4955
public class AboutListener implements ActionListener {
5056
public void actionPerformed(ActionEvent ev) {
5157
Display.FRAME.getContentPane().removeAll();
5258
JLabel title = new JLabel(RRConst.FULL_NAME);
53-
JLabel author = new JLabel("<html><body>by Alyx Ferrari<br/></body></html>");
59+
JLabel author = new JLabel("by " + RRConst.AUTHOR);
5460
JLabel slf4j = new JLabel("slf4j Copyright (c) 2004-2017 QOS.ch");
5561
JLabel bcJava = new JLabel("bc-java Copyright (c) 2000-2019 The Legion of the Bouncy Castle Inc.");
5662
JLabel sshj = new JLabel("sshj Copyright (c) 2010-2012 sshj contributors");
5763
JLabel keychainDumper = new JLabel("keychain_dumper was written by ptoomey3 on GitHub");
5864
JLabel backup = new JLabel("The iTunes backup idea was given to me by Reddit users u/Starwarsfan2099 and u/KuroAMK");
65+
JLabel affiliation = new JLabel("This program is in no way affiliated with Apple, Inc.");
5966
JButton back = new JButton("Back");
6067
back.addActionListener(new BackListener());
6168
Display.FRAME.getContentPane().add(title);
@@ -65,6 +72,7 @@ public void actionPerformed(ActionEvent ev) {
6572
Display.FRAME.getContentPane().add(sshj);
6673
Display.FRAME.getContentPane().add(keychainDumper);
6774
Display.FRAME.getContentPane().add(backup);
75+
Display.FRAME.getContentPane().add(affiliation);
6876
Display.FRAME.getContentPane().add(back);
6977
Display.refresh();
7078
}

‎src/com/emeryferrari/iosrr/RRConst.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,20 @@
22
public class RRConst {
33
private RRConst() {}
44
public static final String NAME = "iOS-Restrictions-Recovery";
5-
public static final String VERSION = "v0.7.1";
5+
public static final String VERSION = "v0.7.2";
6+
public static final String AUTHOR = "Alyx Ferrari";
67
public static final String FULL_NAME = NAME + " " + VERSION;
7-
public static final String TITLE = "<html><body><font size=\"6\">" + FULL_NAME + "</font></body></html>";
8-
public static final String DESC = "<html><body>Compatible <strong>only</strong> with <strong>iOS 7.0</strong> through <strong>iOS 13.x</strong></body></html>";
8+
public static final String TITLE = "<html><body><font size=\"5\">" + FULL_NAME + "</font></body></html>";
9+
public static final String DESC = "<html><body>Compatible with iOS 7.0 through iOS 13.x<br/><br/></body></html>";
910
public static final String KEY_SALT_BUTTON = "From key and salt";
1011
public static final String FILE_BUTTON = "From property list file";
11-
public static final String SSH_BUTTON = "From device via SSH (iOS 7.0 through iOS 11.4.1)";
12+
public static final String SSH_BUTTON = "From device via SSH";
1213
public static final String IPROXY_BUTTON = "From device via iproxy over USB";
1314
public static final String ITUNES_BACKUP = "From unencrypted iTunes backup";
1415
public static final String ITUNES_BACKUPS = "iTunes Backups:";
1516
public static final String ITUNES_BACKUP_12 = "From encrypted iTunes backup (iOS 12 only)";
16-
public static final String KEYCHAIN_DUMPER = "From device via SSH (iOS 12.0 through iOS 13.x)";
17+
public static final String KEYCHAIN_DUMPER = "From device via SSH";
1718
public static final String ABOUT = "About/Credits";
19+
public static final String iOS_13 = "<html><body><br/>iOS 12 and iOS 13:</body></html>";
20+
public static final String iOS_11 = "<html><body><br/>iOS 7 through iOS 11:</body></html>";
1821
}

0 commit comments

Comments
 (0)