Merge remote-tracking branch 'origin/master' into #1631_menu_option_mark

aberenguel · Nov 23, 2024 · 377da1c · 377da1c
2 parents 6cf0260 + 5e26e64
commit 377da1c
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 2 deletions.
diff --git a/iped-app/resources/config/conf/AudioTranscriptConfig.txt b/iped-app/resources/config/conf/AudioTranscriptConfig.txt
@@ -51,7 +51,7 @@ implementationClass = iped.engine.task.transcript.VoskTranscriptTask
 language = auto
 
 # Command to convert audios to wav before transcription. Do not change $INPUT or $OUTPUT params.
-convertCommand = mplayer -benchmark -vo null -vc null -srate 16000 -af format=s16le,channels=1 -ao pcm:fast:file=$OUTPUT $INPUT
+convertCommand = mplayer -benchmark -vo null -vc null -srate 16000 -af format=s16le,resample=16000,channels=1 -ao pcm:fast:file=$OUTPUT $INPUT
 
 # Mime types or supertypes to process. If you want to add videos use ; as separator and update 'convertCommand'.
 mimesToProcess = audio/3gpp; audio/3gpp2; audio/vnd.3gpp.iufp; audio/x-aac; audio/x-aiff; audio/amr; audio/amr-wb; audio/amr-wb+; audio/mp4; audio/ogg; audio/vorbis; audio/x-oggflac; audio/x-oggpcm; audio/opus; audio/speex; audio/qcelp; audio/vnd.wave; audio/x-caf; audio/x-ms-wma; audio/x-opus+ogg; audio/ilbc

diff --git a/iped-app/src/main/java/iped/app/ui/AppMain.java b/iped-app/src/main/java/iped/app/ui/AppMain.java
@@ -32,7 +32,7 @@ public class AppMain {
 
     private static final String BUNDLED_JRE_VERSION = "11.0.13";
 
-    private static final String HOME_JRE_FOLDER = ".iped/jre-" + BUNDLED_JRE_VERSION;
+    public static final String HOME_JRE_FOLDER = ".iped/jre-" + BUNDLED_JRE_VERSION;
 
     File casePath;
 

diff --git a/iped-app/src/main/java/iped/app/ui/splash/SplashScreenManager.java b/iped-app/src/main/java/iped/app/ui/splash/SplashScreenManager.java
@@ -8,7 +8,9 @@
 import java.awt.RenderingHints;
 import java.awt.SplashScreen;
 import java.awt.geom.Rectangle2D;
+import java.io.File;
 
+import iped.app.ui.AppMain;
 import iped.engine.Version;
 import iped.engine.config.ConfigurationManager;
 import iped.engine.config.SplashScreenConfig;
@@ -157,6 +159,30 @@ public void run() {
                     }
                 } catch (IllegalStateException e) {
                     // Splash was already closed, just ignore this exception.
+                } catch (NoClassDefFoundError | UnsatisfiedLinkError e) {
+                    // Maybe JRE is corrupted
+                    e.printStackTrace();
+
+                    // Check if the OS is Windows
+                    String os = System.getProperty("os.name");
+                    if (os != null && os.toLowerCase().startsWith("windows")) {
+
+                        // Check if user home is valid
+                        File userHome = new File(System.getProperty("user.home"));
+                        if (userHome != null && userHome.exists() && userHome.isDirectory()) {
+
+                            // Check if the is a JRE in user home
+                            File userJrePath = new File(userHome, AppMain.HOME_JRE_FOLDER);
+                            if (userJrePath.exists()) {
+
+                                // Warn the user about possibly corrupted JRE
+                                System.err.println("\n\nERROR: User JRE may be corrupted!");
+                                System.err.println("Please, try to delete \"" + userJrePath.getAbsolutePath()
+                                        + "\" folder and run IPED again.");
+                                System.err.println("");
+                            }
+                        }
+                    }
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

diff --git a/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/WhatsAppParser.java b/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/WhatsAppParser.java
@@ -735,6 +735,11 @@ public int compare(WhatsAppContext o1, WhatsAppContext o2) {
                 logger.info("Creating separate report for {}", DB.getPath()); //$NON-NLS-1$
             }
 
+            // sort messages
+            for (Chat chat : dbChatList) {
+                Message.sort(chat.getMessages());
+            }
+
             // create report for main dbs and backups which main db was not found
             createReport(dbChatList, searcher, contacts, handler, extractor, account, tmpDB, context);