Ticket #2338: bugReport.patch

src/main/java/org/sophie2/main/func/help/bugreport/BugReportLogic.java

@@ -213 +213 @@
                         // BoundValidation validation = bugReportForm.emailField().get().validation().get();
                         // if (validation.equals(BoundValidation.SUCCESS)) {
                         BugReport bugReport = bugReportForm.bugReport().get();
-                        if (! ("".equals(bugReport.email().get()) || "".equals(bugReport.userExplanation().get())) ) {
-                                try {
-                                        sendReport(bugReport);
-                                        closeBugReportForm(bugReportForm);
-                                } catch (Exception e) {
-                                        SophieLog.error("Error sending report.", e);
-                                        DialogUtils.showErrorDialog(null,
-                                                        "The bug report could not be sent",     "Error");
-                                }
+                        if ("".equals(bugReport.email().get())) {
+                                DialogUtils.showErrorDialog(bugReportForm.swingComponent().get(),
+                                                "Valid e-mail address is mandatory.", "Error");
+                                return false;
+                        }
+                        if ("".equals(bugReport.userExplanation().get())) {
+                                DialogUtils.showErrorDialog(bugReportForm.swingComponent().get(),
+                                                "User explanation is mandatory.", "Error");
+                                return false;
+                        }
+                        try {
+                                sendReport(bugReport);
+                                closeBugReportForm(bugReportForm);
+                        } catch (Exception e) {
+                                SophieLog.error("Error sending report.", e);
+                                DialogUtils.showErrorDialog(null,
+                                                "The bug report could not be sent",     "Error");
+                        }
 
-                                return true;
-                        } 
-                        DialogUtils.showErrorDialog(bugReportForm.swingComponent().get(),
-                                        "Valid e-mail address is mandatory.", "Error");
-                        return false;
+                        return true;
+                        
                 }
 
                 private void sendReport(BugReport bugReport) throws IOException {