Changeset 1426 for trunk/src/org/expeditee/items/ItemUtils.java

Timestamp:

07/31/19 15:51:04 (5 years ago)

Author:

bln4

Message:

Implemented surrogates for images. When you add an encryption label to a picture, the default is a on-the-fly generated image of noise. This generated image has the same size specifications as the primary image.

File:

• trunk/src/org/expeditee/items/ItemUtils.java (modified) (1 diff)

trunk/src/org/expeditee/items/ItemUtils.java

@@ -400 +400 @@
                         }
                         fileName = path;
-
-                        // try images subdirectory
-                        File file = null;
-
-                        for (String dir : FolderSettings.ImageDirs.getAbsoluteDirs()) {
-                                file = new File(dir + path);
-                                if (file.exists() && !file.isDirectory()) {
-                                        break;
-                                }
-                        }
-
-                        if (file == null || !file.exists() || file.isDirectory()) {
+                        
+                        if (!fileName.equals(Picture.REDACTED_IMAGE_NAME)) {
+                                // try images subdirectory
+                                File file = null;
+
+                                for (String dir : FolderSettings.ImageDirs.getAbsoluteDirs()) {
+                                        file = new File(dir + path);
+                                        if (file.exists() && !file.isDirectory()) {
+                                                break;
+                                        }
+                                }
+
+                                if (file == null || !file.exists() || file.isDirectory()) {
+                                        file = new File(path);
+                                }
+
+                                // try relative path
+                                if (!file.exists() || file.isDirectory()) {
+                                        URL picture = new Object().getClass().getResource(path);
+
+                                        // decode to remove %20 in windows folder names
+                                        if (picture != null) {
+                                                try {
+                                                        path = URLDecoder.decode(picture.getFile(), "UTF-8");
+                                                } catch (UnsupportedEncodingException e) {
+                                                        // TODO Auto-generated catch block
+                                                        e.printStackTrace();
+                                                }
+                                        }
+
+                                } else {
+                                        path = file.getPath();
+                                }
+
+                                // if the image isn't found by now, try remote servers
                                 file = new File(path);
-                        }
-
-                        // try relative path
-                        if (!file.exists() || file.isDirectory()) {
-                                URL picture = new Object().getClass().getResource(path);
-
-                                // decode to remove %20 in windows folder names
-                                if (picture != null) {
-                                        try {
-                                                path = URLDecoder.decode(picture.getFile(), "UTF-8");
-                                        } catch (UnsupportedEncodingException e) {
-                                                // TODO Auto-generated catch block
-                                                e.printStackTrace();
-                                        }
-                                }
-
-                        } else {
-                                path = file.getPath();
-                        }
-
-                        // if the image isn't found by now, try remote servers
-                        file = new File(path);
-                        if (!file.exists() || file.isDirectory()) {
-                        if(tryRemote && FrameShare.getInstance().loadImage(fileName, null)) {
-                                // call CreatePicture again, but with tryRemote set to false so we won't get into an infinite loop
-                                // if something goes wrong with finding the downloaded image
-                                return CreatePicture(source, false);
-                        }
-                                return null;
-                        }
-
+                                if (!file.exists() || file.isDirectory()) {
+                                if(tryRemote && FrameShare.getInstance().loadImage(fileName, null)) {
+                                        // call CreatePicture again, but with tryRemote set to false so we won't get into an infinite loop
+                                        // if something goes wrong with finding the downloaded image
+                                        return CreatePicture(source, false);
+                                }
+                                        return null;
+                                }
+                        }
                 } catch (Exception e) {
                         return null;