Add a button to reset keystore

imilka · imilka · commit 7249e8af0dde · 2014-06-03T18:51:29.000+04:00
diff --git a/src/processing/mode/android/AndroidKeyStore.java b/src/processing/mode/android/AndroidKeyStore.java
@@ -66,6 +66,15 @@ public static void generateKeyStore(String password,
     if(getKeyStore() == null) throw new Exception();
   }
 
+  public static boolean resetKeyStore() {
+    File keyStore = getKeyStore();
+    if(keyStore == null) return true;
+
+    File keyStoreBackup = new File(processing.app.Base.getSketchbookFolder(), "keystore/" + KEYSTORE_FILE_NAME + "-" + AndroidMode.getDateStamp());
+    if(!keyStore.renameTo(keyStoreBackup)) return false;
+    return true;
+  }
+
   private static String parseDnameField(String content) {
     if(content == null || content.length() == 0) return "Unknown";
     else return content;
diff --git a/src/processing/mode/android/KeyStoreManager.java b/src/processing/mode/android/KeyStoreManager.java
@@ -21,6 +21,7 @@ public class KeyStoreManager extends JFrame {
       "http://developer.android.com/tools/publishing/app-signing.html#cert";
 
   File keyStore;
+  AndroidEditor editor;
 
   JPasswordField passwordField;
   JPasswordField repeatPasswordField;
@@ -34,8 +35,15 @@ public class KeyStoreManager extends JFrame {
 
   public KeyStoreManager(final AndroidEditor editor) {
     super("Android keystore manager");
+    this.editor = editor;
 
+    createLayout();
+  }
+
+  private void createLayout() {
     Container outer = getContentPane();
+    outer.removeAll();
+
     Box pain = Box.createVerticalBox();
     pain.setBorder(new EmptyBorder(13, 13, 13, 13));
     outer.add(pain);
@@ -86,13 +94,44 @@ public void actionPerformed(ActionEvent e) {
     });
     cancelButton.setEnabled(true);
 
+    JButton resetKeystoreButton = new JButton("Reset password");
+    dim = new Dimension(Preferences.BUTTON_WIDTH*2,
+        okButton.getPreferredSize().height);
+    resetKeystoreButton.setPreferredSize(dim);
+    resetKeystoreButton.addActionListener(new ActionListener() {
+      public void actionPerformed(ActionEvent e) {
+        setVisible(false);
+        int result = Base.showYesNoQuestion(editor, "Android keystore",
+            "Are you sure you want to reset the password?", "<html><body>We will have to reset the keystore to do this, " +
+            "which means you won't be able to upload an update for your app signed with the new keystore to Google Play.<br/><br/>" +
+            "We will make a backup for the old keystore.</body></html>");
+
+        if(result == JOptionPane.NO_OPTION) {
+          setVisible(true);
+        } else {
+          if(!AndroidKeyStore.resetKeyStore()) {
+            Base.showWarning("Android keystore", "Failed to remove keystore");
+            setVisible(true);
+          } else {
+            keyStore = null;
+            createLayout();
+          }
+        }
+      }
+    });
+    resetKeystoreButton.setEnabled(true);
+
     // think different, biznatchios!
     if (Base.isMacOS()) {
       buttons.add(cancelButton);
+
+      if(keyStore != null) buttons.add(resetKeystoreButton);
 //      buttons.add(Box.createHorizontalStrut(8));
       buttons.add(okButton);
     } else {
       buttons.add(okButton);
+
+      if(keyStore != null) buttons.add(resetKeystoreButton);
 //      buttons.add(Box.createHorizontalStrut(8));
       buttons.add(cancelButton);
     }
