Merge pull request #4 from zelcash/AcadiaReindex

Acadia reindex
zelcash · Dec 25, 2018 · bba0093 · bba0093
2 parents 8b35ba0 + 5edf51c
commit bba0093
Show file tree

Hide file tree

Showing 6 changed files with 214 additions and 39 deletions.
diff --git a/src/java/com/cabecinha84/zelcashui/AppLock.java b/src/java/com/cabecinha84/zelcashui/AppLock.java
@@ -8,6 +8,7 @@
 
 import com.vaklinov.zcashui.Log;
 import com.vaklinov.zcashui.OSUtil;
+import com.vaklinov.zcashui.ZCashClientCaller;
 
 
 public class AppLock {
@@ -40,6 +41,15 @@ public static void unlock() {
                 lock.release();
                 channel.close();
                 f.delete();
+                try {
+                	//if daemon is running for any reason we try to stop it here because wallet is closing.
+	                ZCashClientCaller initialClientCallerA = new ZCashClientCaller(OSUtil.getProgramDirectory());
+	                initialClientCallerA.stopDaemon();
+                }
+                catch (Exception ex) {
+                	Log.warning("Error stopping daemon due to: {0} {1}",
+        					ex.getClass().getName(), ex.getMessage());
+                }
             }
         } catch(IOException e) {
         	Log.warning("Error ounlocking wallet lock due to: {0} {1}",

diff --git a/src/java/com/cabecinha84/zelcashui/ZelCashUIEditDialog.java b/src/java/com/cabecinha84/zelcashui/ZelCashUIEditDialog.java
@@ -261,8 +261,7 @@ public void actionPerformed(ActionEvent e)
 				tierThreeColor.setBackground(color3);
 				textColorTextField.setForeground(colorText);
 				messageSentTextField.setForeground(colorMessageSent);
-				messageReceivedTextField.setForeground(colorMessageReceived);
-				ZelCashUIEditDialog.this.saveZelCashUISettings();			
+				messageReceivedTextField.setForeground(colorMessageReceived);			
 				saveSettings();
 				whiteThemeButton.setSelected(false);
 				whiteThemeButton.setFocusable(false);
@@ -291,8 +290,7 @@ public void actionPerformed(ActionEvent e)
 				tierThreeColor.setBackground(color3);
 				textColorTextField.setForeground(colorText);
 				messageSentTextField.setForeground(colorMessageSent);
-				messageReceivedTextField.setForeground(colorMessageReceived);
-				ZelCashUIEditDialog.this.saveZelCashUISettings();			
+				messageReceivedTextField.setForeground(colorMessageReceived);		
 				saveSettings();
 				orangeThemeButton.setSelected(false);
 				orangeThemeButton.setFocusable(false);
@@ -321,8 +319,7 @@ public void actionPerformed(ActionEvent e)
 				tierThreeColor.setBackground(color3);
 				textColorTextField.setForeground(colorText);
 				messageSentTextField.setForeground(colorMessageSent);
-				messageReceivedTextField.setForeground(colorMessageReceived);
-				ZelCashUIEditDialog.this.saveZelCashUISettings();			
+				messageReceivedTextField.setForeground(colorMessageReceived);			
 				saveSettings();
 				greenThemeButton.setSelected(false);
 				greenThemeButton.setFocusable(false);
@@ -352,7 +349,6 @@ public void actionPerformed(ActionEvent e)
 				textColorTextField.setForeground(colorText);
 				messageSentTextField.setForeground(colorMessageSent);
 				messageReceivedTextField.setForeground(colorMessageReceived);
-				ZelCashUIEditDialog.this.saveZelCashUISettings();			
 				saveSettings();
 				redThemeButton.setSelected(false);
 				redThemeButton.setFocusable(false);
@@ -382,7 +378,6 @@ public void actionPerformed(ActionEvent e)
 				textColorTextField.setForeground(colorText);
 				messageSentTextField.setForeground(colorMessageSent);
 				messageReceivedTextField.setForeground(colorMessageReceived);
-				ZelCashUIEditDialog.this.saveZelCashUISettings();
 				saveSettings();
 				blueThemeButton.setSelected(false);
 				blueThemeButton.setFocusable(false);
@@ -412,7 +407,6 @@ public void actionPerformed(ActionEvent e)
 				textColorTextField.setForeground(colorText);
 				messageSentTextField.setForeground(colorMessageSent);
 				messageReceivedTextField.setForeground(colorMessageReceived);
-				ZelCashUIEditDialog.this.saveZelCashUISettings();
 				saveSettings();
 				greyThemeButton.setSelected(false);
 				greyThemeButton.setFocusable(false);

diff --git a/src/java/com/vaklinov/zcashui/StartupProgressDialog.java b/src/java/com/vaklinov/zcashui/StartupProgressDialog.java
@@ -30,7 +30,7 @@
 public class StartupProgressDialog extends ZelCashJFrame {
 
 
-    private static final int POLL_PERIOD = 1500;
+    private static final int POLL_PERIOD = 2000;
     private static final int STARTUP_ERROR_CODE = -28;
 
     private BorderLayout borderLayout1 = new BorderLayout();
@@ -111,7 +111,7 @@ public void waitForStartup() throws IOException,
         }
 
         final Process daemonProcess = 
-        	shouldStartZCashd ? clientCaller.startDaemon() : null;
+        	shouldStartZCashd ? clientCaller.startDaemon(false) : null;
 
         Thread.sleep(POLL_PERIOD); // just a little extra
 

diff --git a/src/java/com/vaklinov/zcashui/ZCashClientCaller.java b/src/java/com/vaklinov/zcashui/ZCashClientCaller.java
@@ -146,19 +146,31 @@ public ZCashClientCaller(String installDir)
 	}
 
 
-	public synchronized Process startDaemon() 
+	public synchronized Process startDaemon(boolean reindex) 
 		throws IOException, InterruptedException 
 	{
 		String exportDir = OSUtil.getUserHomeDirectory().getCanonicalPath();
-
+		if (reindex == true) {
 	    CommandExecutor starter = new CommandExecutor(
 	        new String[] 
+	        {
+	        	zcashd.getCanonicalPath(), 
+	        	"-exportdir=" + wrapStringParameter(exportDir),
+				"-reindex"
+	        });
+
+	    return starter.startChildProcess();
+		} else {
+			CommandExecutor starter = new CommandExecutor(
+	        new String[] 
 	        {
 	        	zcashd.getCanonicalPath(), 
 	        	"-exportdir=" + wrapStringParameter(exportDir)
 	        });
 
 	    return starter.startChildProcess();
+		}
+
 	}