mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-12 16:06:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4984 from wschaeferB/5281-PreventZeroDaysWithinSetting

Browse Source 
5281 prevent user from setting 0 days within as a condition
This commit is contained in:
esaunders 2019-07-03 17:27:38 -04:00 committed by GitHub
commit dd5db93bda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Core/src/org/sleuthkit/autopsy/logicalimager/configuration/EditNonFullPathsRulePanel.java
View File

@ -710,9 +710,9 @@ final class EditNonFullPathsRulePanel extends javax.swing.JPanel {
return (extensionsCheckbox.isSelected() && !StringUtils.isBlank(extensionsTextField.getText()) && !validateExtensions(extensionsTextField).isEmpty()) return (extensionsCheckbox.isSelected() && !StringUtils.isBlank(extensionsTextField.getText()) && !validateExtensions(extensionsTextField).isEmpty())
|| (fileNamesCheckbox.isSelected() && !StringUtils.isBlank(fileNamesTextArea.getText())) || (fileNamesCheckbox.isSelected() && !StringUtils.isBlank(fileNamesTextArea.getText()))
|| (folderNamesCheckbox.isSelected() && !StringUtils.isBlank(folderNamesTextArea.getText())) || (folderNamesCheckbox.isSelected() && !StringUtils.isBlank(folderNamesTextArea.getText()))
|| (minSizeCheckbox.isSelected() && !StringUtils.isBlank(minSizeTextField.getText()) && isNonZeroLong(minSizeTextField.getText())) || (minSizeCheckbox.isSelected() && !StringUtils.isBlank(minSizeTextField.getText()) && isNonZeroLong(minSizeTextField.getValue()))
|| (maxSizeCheckbox.isSelected() && !StringUtils.isBlank(maxSizeTextField.getText()) && isNonZeroLong(maxSizeTextField.getText())) || (maxSizeCheckbox.isSelected() && !StringUtils.isBlank(maxSizeTextField.getText()) && isNonZeroLong(maxSizeTextField.getValue()))
|| (modifiedWithinCheckbox.isSelected() && !StringUtils.isBlank(modifiedWithinTextField.getText())); || (modifiedWithinCheckbox.isSelected() && !StringUtils.isBlank(modifiedWithinTextField.getText()) && isNonZeroLong(modifiedWithinTextField.getValue()));
} catch (IOException ex) { } catch (IOException ex) {
logger.log(Level.WARNING, "Invalid contents of extensionsTextField", ex); logger.log(Level.WARNING, "Invalid contents of extensionsTextField", ex);
return false; return false;
@ -722,14 +722,16 @@ final class EditNonFullPathsRulePanel extends javax.swing.JPanel {
/** /**
* Check that value could be a non zero long * Check that value could be a non zero long
* *
* @param numberString the string to check * @param numberObject the object to check
* *
* @return true if the value is a non-zero long * @return true if the value is a non-zero long
*/ */
private boolean isNonZeroLong(String numberString) { private boolean isNonZeroLong(Object numberObject) {
Long value = 0L; Long value = 0L;
try { try {
value = Long.parseLong(numberString); if (numberObject instanceof Number) {
value = ((Number) numberObject).longValue();
}
} catch (NumberFormatException ignored) { } catch (NumberFormatException ignored) {
//The string was not a number, this method will return false becaue the value is still 0L //The string was not a number, this method will return false becaue the value is still 0L
} }