Merge pull request #2762 from sepinf-inc/#2761_FixPipeInBookmarks

Fix the rendering of bookmark names containing "|" character (#2761)

Author: lfcnassif

iped-app/src/main/java/iped/app/ui/BaseTableModel.java

@@ -88,7 +88,7 @@ public Object getValueAt(int row, int col) {
 
             case 2:
                 // Item Bookmarks
-                return Util.concatStrings(App.get().appCase.getMultiBookmarks().getBookmarkList(App.get().appCase.getItemId(results.getLuceneIds()[row])));
+                return Util.concatStrings(App.get().appCase.getMultiBookmarks().getBookmarkList(App.get().appCase.getItemId(results.getLuceneIds()[row])), true);
 
             case 3:
                 // Item Name

iped-app/src/main/java/iped/app/ui/GalleryCellEditor.java

@@ -101,7 +101,7 @@ public Component getTableCellEditorComponent(JTable table, Object value, boolean
         IMultiBookmarks bookmarks = App.get().appCase.getMultiBookmarks();
         check.setSelected(bookmarks.isChecked(cellValue.id));
         cLabel.setText(cellValue.name);
-        String itemBookmarksStr = Util.concatStrings(bookmarks.getBookmarkList(cellValue.id));
+        String itemBookmarksStr = Util.concatStrings(bookmarks.getBookmarkList(cellValue.id), true);
         cLabel.setToolTipText(itemBookmarksStr.isEmpty() ? null : itemBookmarksStr);
         cLabel.setIcon(BookmarkIcon.getIcon(bookmarks, itemBookmarksStr));
 

iped-app/src/main/java/iped/app/ui/GalleryCellRenderer.java

@@ -104,7 +104,7 @@ public Component getTableCellRendererComponent(JTable table, Object value, boole
         IMultiBookmarks bookmarks = App.get().appCase.getMultiBookmarks();
         check.setSelected(bookmarks.isChecked(cellValue.id));
         cLabel.setText(cellValue.name);
-        String itemBookmarksStr = Util.concatStrings(bookmarks.getBookmarkList(cellValue.id));
+        String itemBookmarksStr = Util.concatStrings(bookmarks.getBookmarkList(cellValue.id), true);
         cLabel.setToolTipText(itemBookmarksStr.isEmpty() ? null : itemBookmarksStr);
         cLabel.setIcon(BookmarkIcon.getIcon(bookmarks, itemBookmarksStr));
 

iped-app/src/main/java/iped/app/ui/ResultTableModel.java

@@ -254,7 +254,7 @@ public Object getValueAt(int row, int col) {
             }
 
             if (field.equals(BOOKMARK_COL)) {
-                return Util.concatStrings(app.appCase.getMultiBookmarks().getBookmarkList(app.ipedResult.getItem(row)));
+                return Util.concatStrings(app.appCase.getMultiBookmarks().getBookmarkList(app.ipedResult.getItem(row)), true);
             }
 
             if (item instanceof TimeItemId) {

iped-app/src/main/java/iped/app/ui/bookmarks/BookmarkCellRenderer.java

@@ -74,6 +74,9 @@ public void setBookmarks(IMultiBookmarks bookmarks, String str) {
             } else {
                 names = str.split(" \\| ");
             }
+            for (int i = 0; i < names.length; i++) {
+                names[i] = names[i].replace("||", "|");
+            }
             lastStr = str;
         }
         if (colors == null || colors.length < names.length) {

iped-app/src/main/java/iped/app/ui/bookmarks/BookmarkIcon.java

@@ -49,12 +49,14 @@ public static Icon getIcon(IMultiBookmarks bookmarks, String str) {
             return null;
         }
         if (str.indexOf(" | ") < 0) {
+            str = str.replace("||", "|");
             return getIcon(bookmarks.getBookmarkColor(str));
         }
         // Multiple bookmarks
         String[] bookmarkNames = str.split(" \\| ");
         List<Color> l = new ArrayList<Color>(bookmarkNames.length);
         for (String name : bookmarkNames) {
+            name = name.replace("||", "|");
             l.add(bookmarks.getBookmarkColor(name));
         }
         synchronized (iconPerColorList) {

iped-engine/src/main/java/iped/engine/util/Util.java

@@ -303,12 +303,19 @@ public static Object readObject(String filePath) throws IOException, ClassNotFou
     }
 
     public static String concatStrings(List<String> strings) {
+        return concatStrings(strings, false);
+    }
+
+    public static String concatStrings(List<String> strings, boolean escape) {
         if (strings == null) {
             return null;
         }
         if (strings.isEmpty()) {
             return "";
         }
+        if (escape) {
+            strings.replaceAll(s -> s.replace("|", "||"));
+        }
         if (strings.size() == 1) {
             return strings.get(0);
         }