Fixed creation of temp file and permissions requirements for admin

Author: MrSnou

HowToRun.md

@@ -4,7 +4,7 @@ The application is distributed as a **standalone EXE** built with `jpackage`.
 
 ### ✔ Requirements
 Nothing except:
-- Windows 10/11
+- Windows 10/11 (Currently on win 10 System Logs are not working - TODO)
 - Local user profile
 - Windows PowerShell (built-in on Windows 10/11)
 

src/main/java/com/project/system_log_analyzer/SystemLogAnalyzerApp.java

@@ -1,7 +1,6 @@
 package com.project.system_log_analyzer;
 
 import com.project.system_log_analyzer.config.SpringConfig;
-import com.project.system_log_analyzer.system.WindowsElevationManager;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
@@ -15,6 +14,8 @@
 
 public class SystemLogAnalyzerApp extends Application {
 
+    private boolean app_Log = false;
+
     private AnnotationConfigApplicationContext springContext;
 
     private static Boolean elevatedFlag = false; // Admin permissions
@@ -23,15 +24,19 @@ public class SystemLogAnalyzerApp extends Application {
     public void init() {
         springContext = new AnnotationConfigApplicationContext(SpringConfig.class);
 
-        // debug
-        PrintStream out = null;
-        try {
-            out = new PrintStream(new FileOutputStream("app.log", true), true);
-        } catch (FileNotFoundException e) {
-            throw new RuntimeException(e);
+        if (app_Log) { // debug app.log in main directory
+            PrintStream out = null;
+            try {
+                out = new PrintStream(new FileOutputStream("app.log", true), true);
+            } catch (FileNotFoundException e) {
+                throw new RuntimeException(e);
+            }
+            System.setOut(out);
+            System.setErr(out);
         }
-        System.setOut(out);
-        System.setErr(out);
+
+
+
     }
 
     @Override

src/main/java/com/project/system_log_analyzer/config/SpringConfig.java

@@ -1,6 +1,8 @@
 package com.project.system_log_analyzer.config;
 
 
+import com.project.system_log_analyzer.SystemLogAnalyzerApp;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 

src/main/java/com/project/system_log_analyzer/config/appConfig.java

@@ -11,6 +11,15 @@ public class appConfig {
     private boolean csvSecurity;
     private boolean noLogs;
     private boolean saveInExeDir;
+    private boolean relaunch;
+
+    public boolean isRelaunch() {
+        return relaunch;
+    }
+
+    public void setRelaunch(boolean relaunch) {
+        this.relaunch = relaunch;
+    }
 
     public boolean isNoLogs() {
         return noLogs;

src/main/java/com/project/system_log_analyzer/controller/WelcomeViewFXController.java

@@ -137,10 +137,18 @@ private void securityButtonON(ActionEvent event) throws IOException {
 
             boolean relaunchStarted = WindowsElevationManager.relaunchAsAdmin("--elevated");
 
-            if (relaunchStarted) Platform.exit();
+            if (relaunchStarted) {
+                appConfig.setRelaunch(true);
+                Platform.exit();
+            } else {
+                appConfig.setCsvSecurity(false);
+                securityButton.setSelected(false);
+                securityLabel.setText("(Requires Admin Permission)");
+            }
 
         } else {
             appConfig.setCsvSecurity(false);
+            securityButton.setSelected(false);
             securityLabel.setText("(Requires Admin Permission)");
         }
     }
@@ -212,8 +220,8 @@ private void saveInAppDirectoryBoxOn(ActionEvent event) throws IOException {
             logFilesDirButton.setDisable(true);
             reportDirButton.setDisable(true);
 
-            new File(logs).mkdirs();
-            new File(reports).mkdirs();
+            //new File(logs).mkdirs();
+            //new File(reports).mkdirs();
 
             appConfig.setLogsDir(logs);
             appConfig.setReportDir(reports);

src/main/java/com/project/system_log_analyzer/io/WindowsEventExporter.java

@@ -21,7 +21,7 @@ public class WindowsEventExporter {
     public enum LogType {
         APPLICATION("Application"),
         SYSTEM("System"),
-        SECURITY("Security"); // TODO - Test in real environment (.exe/.jar)
+        SECURITY("Security");
 
         private final String logName;
         LogType(String logName) {
@@ -53,7 +53,7 @@ public Path exportToCsv(LogType type) { // Method responsible for exporting logs
             if (!exportedDir.exists()) exportedDir.mkdirs();
 
             String timestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd_HHmmss"));
-            Path outputFile = Path.of(exportedDir.getAbsolutePath(), "Security_" + timestamp + ".csv");
+            Path outputFile = Path.of(exportedDir.getAbsolutePath(), type.getLogName() + "_" + timestamp + ".csv");
 
             // Powershell command
             String command = String.format(

src/main/java/com/project/system_log_analyzer/system/AppShutdownHandler.java

@@ -9,7 +9,6 @@
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -22,6 +21,7 @@ public class AppShutdownHandler {
     private FileLoggerService fileLoggerService;
     private FileReportExporter reportExporter;
     private appConfig appConfig;
+    private Boolean elevatedFlag;
 
     @Autowired
     public AppShutdownHandler(FileLoggerService fileLoggerService, FileReportExporter reportExporter, appConfig config) {
@@ -48,18 +48,24 @@ public void onShutdown() {
             } catch (Exception e) {
                 System.err.println("Failed to delete temp directory: " + e.getMessage());
             }
-
             return;
         }
 
-        try {
-            System.out.println("AppShutdownHandler - Application is shutting down! Flushing logs and exporting report...");
-            fileLoggerService.flushLogToMainFile();
-            System.out.println("AppShutdownHandler - Shutdown tasks completed successfully.");
-        } catch (Exception e) {
-            System.err.println("AppShutdownHandler - Error during shutdown tasks: " + e.getMessage());
-            e.printStackTrace();
+        if (appConfig.isRelaunch() || appConfig.getLogsDir() == null || appConfig.getLogsDir().isBlank()) {
+            System.out.println("Skipping flush — elevated admin relaunch or before Spring Injection");
+            return;
+        } else {
+            try {
+                System.out.println("AppShutdownHandler - Application is shutting down! Flushing logs and exporting report...");
+                fileLoggerService.flushLogToMainFile();
+                System.out.println("AppShutdownHandler - Shutdown tasks completed successfully.");
+            } catch (Exception e) {
+                System.err.println("AppShutdownHandler - Error during shutdown tasks: " + e.getMessage());
+                e.printStackTrace();
+            }
         }
+
+
     }
     // Method for correct deletion of temp files when noLogs is selected
     private void deleteDirectoryRecursively(Path path) throws IOException {