Merge pull request #5647 from kevlahnota/newmaster

[Mobile] prevent crash using invalid theme

forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java

@@ -468,18 +468,25 @@ public class FSkin {
             x0 = tempCoords[0];
             y0 = tempCoords[1];
 
-            color = bimPreferredSprite.getData().getBounds().contains(x0, y0) ? getColorFromPixel(bimPreferredSprite.getRGB(x0, y0)) : new Color(0, 0, 0, 0);
+            try {
+                color = bimPreferredSprite.getData().getBounds().contains(x0, y0) ? getColorFromPixel(bimPreferredSprite.getRGB(x0, y0)) : new Color(0, 0, 0, 0);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
     }
 
     public static void drawImage(final Graphics g, final SkinImage skinImage, final int x, final int y) {
-        skinImage.draw(g, x, y);
+        if (skinImage != null)
+            skinImage.draw(g, x, y);
     }
     public static void drawImage(final Graphics g, final SkinImage skinImage, final int x, final int y, final int w, final int h) {
-        skinImage.draw(g, x, y, w, h);
+        if (skinImage != null)
+            skinImage.draw(g, x, y, w, h);
     }
     public static void drawImage(final Graphics g, final SkinImage skinImage, final int dx1, final int dy1, final int dx2, final int dy2, final int sx1, final int sy1, final int sx2, final int sy2) {
-        skinImage.draw(g, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2);
+        if (skinImage != null)
+            skinImage.draw(g, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2);
     }
 
     /**
@@ -558,13 +565,18 @@ public class FSkin {
             newW = (tempCoords.length == 6 ? tempCoords[4] : 0);
             newH = (tempCoords.length == 6 ? tempCoords[5] : 0);
             final BufferedImage img = testPreferredSprite(s0);
-            final BufferedImage bi0 = img.getSubimage(x0, y0, w0, h0);
+            if (img == null)
+                return;
+            try {
+                final BufferedImage bi0 = img.getSubimage(x0, y0, w0, h0);
 
-            if (scale && newW != 0) {
+                if (scale && newW != 0) {
-                setImage(s0, bi0.getScaledInstance(newW, newH, Image.SCALE_SMOOTH));
+                    setImage(s0, bi0.getScaledInstance(newW, newH, Image.SCALE_SMOOTH));
-            }
+                } else {
-            else {
+                    setImage(s0, bi0);
-                setImage(s0, bi0);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
             }
         }
 
@@ -775,8 +787,13 @@ public class FSkin {
             h0 = tempCoords[3];
 
             final BufferedImage img = testPreferredSprite(s0);
-
+            if (img == null)
-            setIcon(s0, new ImageIcon(img.getSubimage(x0, y0, w0, h0)));
+                return;
+            try {
+                setIcon(s0, new ImageIcon(img.getSubimage(x0, y0, w0, h0)));
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
 
         /**
@@ -1055,7 +1072,11 @@ public class FSkin {
         }
 
         private void updateFont() {
-            this.font = baseFont.deriveFont(this.style, this.size);
+            try {
+                this.font = baseFont.deriveFont(this.style, this.size);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
     }
 
@@ -1154,7 +1175,7 @@ public class FSkin {
 
         // Non-default (preferred) skin name and dir.
         preferredName = skinName.toLowerCase().replace(' ', '_');
-        preferredDir = preferredName.equals("default") ? ForgeConstants.DEFAULT_SKINS_DIR : ForgeConstants.CACHE_SKINS_DIR + preferredName + "/";
+        preferredDir = preferredName.equalsIgnoreCase("default") || preferredName.isEmpty() ? ForgeConstants.DEFAULT_SKINS_DIR : ForgeConstants.CACHE_SKINS_DIR + preferredName + "/";
 
         if (onInit) {
             final File f = new File(preferredDir + ForgeConstants.SPLASH_BG_FILE);
@@ -1496,8 +1517,12 @@ public class FSkin {
         h0 = tempCoords[3];
 
         if (s0.equals(FSkinProp.IMG_QUEST_DRAFT_DECK)) {
-            final Color c = getColorFromPixel(bimQuestDraftDeck.getRGB((x0 + w0 / 2), (y0 + h0 / 2)));
+            if (bimQuestDraftDeck != null) {
-            if (c.getAlpha() != 0) { return bimQuestDraftDeck; }
+                final Color c = getColorFromPixel(bimQuestDraftDeck.getRGB((x0 + w0 / 2), (y0 + h0 / 2)));
+                if (c.getAlpha() != 0) { return bimQuestDraftDeck; }
+            } else {
+                return null;
+            }
         }
 
         // Test if requested sub-image in inside bounds of preferred sprite.
@@ -1512,28 +1537,30 @@ public class FSkin {
         int x, y;
         Color c;
 
-        // Center
+        if (bimPreferredSprite != null) {
-        x = (x0 + w0 / 2);
+            // Center
-        y = (y0 + h0 / 2);
+            x = (x0 + w0 / 2);
-        c = getColorFromPixel(bimPreferredSprite.getRGB(x, y));
+            y = (y0 + h0 / 2);
-        if (c.getAlpha() != 0) { return bimPreferredSprite; }
+            c = getColorFromPixel(bimPreferredSprite.getRGB(x, y));
+            if (c.getAlpha() != 0) { return bimPreferredSprite; }
 
-        x += 2;
+            x += 2;
-        y += 2;
+            y += 2;
-        c = getColorFromPixel(bimPreferredSprite.getRGB(x, y));
+            c = getColorFromPixel(bimPreferredSprite.getRGB(x, y));
-        if (c.getAlpha() != 0) { return bimPreferredSprite; }
+            if (c.getAlpha() != 0) { return bimPreferredSprite; }
 
-        x -= 4;
+            x -= 4;
-        c = getColorFromPixel(bimPreferredSprite.getRGB(x, y));
+            c = getColorFromPixel(bimPreferredSprite.getRGB(x, y));
-        if (c.getAlpha() != 0) { return bimPreferredSprite; }
+            if (c.getAlpha() != 0) { return bimPreferredSprite; }
 
-        y -= 4;
+            y -= 4;
-        c = getColorFromPixel(bimPreferredSprite.getRGB(x, y));
+            c = getColorFromPixel(bimPreferredSprite.getRGB(x, y));
-        if (c.getAlpha() != 0) { return bimPreferredSprite; }
+            if (c.getAlpha() != 0) { return bimPreferredSprite; }
 
-        x += 4;
+            x += 4;
-        c = getColorFromPixel(bimPreferredSprite.getRGB(x, y));
+            c = getColorFromPixel(bimPreferredSprite.getRGB(x, y));
-        if (c.getAlpha() != 0) { return bimPreferredSprite; }
+            if (c.getAlpha() != 0) { return bimPreferredSprite; }
+        }
 
         return bimDefaultSprite;
     }
@@ -1569,7 +1596,11 @@ public class FSkin {
                     if (pxTest.getAlpha() == 0) {
                         continue;
                     }
-                    avatars.put(counter++, new SkinImage(bimDefaultAvatars.getSubimage(i, j, 100, 100)));
+                    try {
+                        avatars.put(counter++, new SkinImage(bimDefaultAvatars.getSubimage(i, j, 100, 100)));
+                    } catch (Exception e) {
+                        System.err.println(e.getMessage());
+                    }
                 }
             }
         }
@@ -1580,25 +1611,31 @@ public class FSkin {
         int counter = 0;
         Color pxTest;
 
-        final int pw = bimDefaultSleeve.getWidth();
+        if (bimDefaultSleeve != null) {
-        final int ph = bimDefaultSleeve.getHeight();
+            final int pw = bimDefaultSleeve.getWidth();
+            final int ph = bimDefaultSleeve.getHeight();
 
-        for (int j = 0; j < ph; j += 500) {
+            for (int j = 0; j < ph; j += 500) {
-            for (int i = 0; i < pw; i += 360) {
+                for (int i = 0; i < pw; i += 360) {
-                pxTest = getColorFromPixel(bimDefaultSleeve.getRGB(i + 180, j + 250));
+                    pxTest = getColorFromPixel(bimDefaultSleeve.getRGB(i + 180, j + 250));
-                if (pxTest.getAlpha() == 0) { continue; }
+                    if (pxTest.getAlpha() == 0) {
-                sleeves.put(counter++, new SkinImage(bimDefaultSleeve.getSubimage(i, j, 360, 500)));
+                        continue;
+                    }
+                    sleeves.put(counter++, new SkinImage(bimDefaultSleeve.getSubimage(i, j, 360, 500)));
+                }
             }
         }
-        //2nd set
+        if (bimDefaultSleeve2 != null) {
-        final int aw = bimDefaultSleeve2.getWidth();
+            //2nd set
-        final int ah = bimDefaultSleeve2.getHeight();
+            final int aw = bimDefaultSleeve2.getWidth();
+            final int ah = bimDefaultSleeve2.getHeight();
 
-        for (int j = 0; j < ah; j += 500) {
+            for (int j = 0; j < ah; j += 500) {
-            for (int i = 0; i < aw; i += 360) {
+                for (int i = 0; i < aw; i += 360) {
-                pxTest = getColorFromPixel(bimDefaultSleeve2.getRGB(i + 180, j + 250));
+                    pxTest = getColorFromPixel(bimDefaultSleeve2.getRGB(i + 180, j + 250));
-                if (pxTest.getAlpha() == 0) { continue; }
+                    if (pxTest.getAlpha() == 0) { continue; }
-                sleeves.put(counter++, new SkinImage(bimDefaultSleeve2.getSubimage(i, j, 360, 500)));
+                    sleeves.put(counter++, new SkinImage(bimDefaultSleeve2.getSubimage(i, j, 360, 500)));
+                }
             }
         }
     }

forge-gui-desktop/src/main/java/forge/view/SplashFrame.java

@@ -35,7 +35,7 @@ import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 
-import forge.localinstance.properties.ForgePreferences;
+import forge.gui.GuiBase;
 import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.localinstance.skin.FSkinProp;
 import forge.toolbox.FProgressBar;
@@ -78,8 +78,7 @@ public class SplashFrame extends JFrame {
      */
     public SplashFrame() {
         super();
-        final ForgePreferences prefs = new ForgePreferences();
+        FSkin.loadLight(GuiBase.getForgePrefs().getPref(FPref.UI_SKIN), true);
-        FSkin.loadLight(prefs.getPref(FPref.UI_SKIN), true);
 
         try {
             SwingUtilities.invokeAndWait(new Runnable() {

forge-gui-mobile/src/forge/Forge.java

@@ -105,7 +105,6 @@ public class Forge implements ApplicationListener {
     public static boolean isTabletDevice = false;
     public static String locale = "en-US";
     public Assets assets;
-    private ForgePreferences forgePreferences;
     public static boolean hdbuttons = false;
     public static boolean hdstart = false;
     public static boolean isPortraitMode = false;
@@ -148,9 +147,7 @@ public class Forge implements ApplicationListener {
     }
 
     private ForgePreferences getForgePreferences() {
-        if (forgePreferences == null)
+        return GuiBase.getForgePrefs();
-            forgePreferences = new ForgePreferences();
-        return forgePreferences;
     }
     public static Localizer getLocalizer() {
         if (localizer == null)

forge-gui-mobile/src/forge/assets/Assets.java

@@ -434,7 +434,7 @@ public class Assets implements Disposable {
         }
 
         @SuppressWarnings("unchecked")
-        private int calculateTextureSize(AssetManager assetManager, String fileName, Class type) {
+        private int calculateTextureSize(AssetManager assetManager, String fileName, Class<?> type) {
             if (!Forge.showFPS)
                 return 0;
             Texture texture = (Texture) assetManager.get(fileName, type);
@@ -442,21 +442,7 @@ public class Assets implements Disposable {
             int textureSize = textureData.getWidth() * textureData.getHeight();
             if (Forge.isTextureFilteringEnabled())
                 textureSize = textureSize + (textureSize / 3);
-            switch (textureData.getFormat()) {
+            memoryPerFile.put(fileName, calcTextureDataSize(textureSize, textureData.getFormat()));
-                case RGB565:
-                    textureSize *= 2;
-                    break;
-                case RGB888:
-                    textureSize *= 3;
-                    break;
-                case RGBA4444:
-                    textureSize *= 2;
-                    break;
-                case RGBA8888:
-                    textureSize *= 4;
-                    break;
-            }
-            memoryPerFile.put(fileName, textureSize);
 
             return memoryPerFile.values().stream().mapToInt(Integer::intValue).sum() + calcFonts() + calcCounterFonts()
                     + calculateObjectMaps(generatedCards()) + calculateObjectMaps(fallback_skins()) + calculateObjectMaps(tmxMap());
@@ -492,21 +478,7 @@ public class Assets implements Disposable {
                 int textureSize = textureData.getWidth() * textureData.getHeight();
                 if (Forge.isTextureFilteringEnabled())
                     textureSize = textureSize + (textureSize / 3);
-                switch (textureData.getFormat()) {
+                sum += calcTextureDataSize(textureSize, textureData.getFormat());
-                    case RGB565:
-                        textureSize *= 2;
-                        break;
-                    case RGB888:
-                        textureSize *= 3;
-                        break;
-                    case RGBA4444:
-                        textureSize *= 2;
-                        break;
-                    case RGBA8888:
-                        textureSize *= 4;
-                        break;
-                }
-                sum += textureSize;
             }
             if (objectMap == generatedCards)
                 cGenVal = sum;
@@ -559,6 +531,20 @@ public class Assets implements Disposable {
             return val;
         }
 
+        private int calcTextureDataSize(int textureSize, Pixmap.Format format) {
+            switch (format) {
+                case RGB565:
+                case RGBA4444:
+                    return textureSize * 2;
+                case RGB888:
+                    return textureSize * 3;
+                case RGBA8888:
+                    return textureSize * 4;
+                default: //assume plain RGB888
+                    return textureSize * 3;
+            }
+        }
+
         @SuppressWarnings("unchecked")
         @Override
         public synchronized <T> void load(String fileName, Class<T> type, AssetLoaderParameters<T> parameter) {
@@ -583,10 +569,8 @@ public class Assets implements Disposable {
         public synchronized void unload(String fileName) {
             if (isLoaded(fileName))
                 super.unload(fileName);
-            if (memoryPerFile.containsKey(fileName)) {
+            memoryPerFile.remove(fileName);
-                memoryPerFile.remove(fileName);
+            cardArtCache().clear();
-                cardArtCache().clear();
-            }
         }
 
         @Override

forge-gui-mobile/src/forge/assets/FSkin.java

@@ -16,7 +16,6 @@ import forge.localinstance.properties.ForgeConstants;
 import forge.localinstance.properties.ForgePreferences;
 import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.localinstance.skin.FSkinProp;
-import forge.model.FModel;
 import forge.screens.LoadingOverlay;
 import forge.screens.SplashScreen;
 import forge.screens.TransitionScreen;
@@ -37,13 +36,16 @@ public class FSkin {
         return Forge.getAssets().getTexture(getSkinFile("hd_logo.png"), false);
     }
 
-    public static void changeSkin(final String skinName) {
+    public static void saveSkinName(ForgePreferences prefs, String skinName) {
-        final ForgePreferences prefs = FModel.getPreferences();
-        if (skinName.equals(prefs.getPref(FPref.UI_SKIN))) { return; }
-
-        //save skin preference
         prefs.setPref(FPref.UI_SKIN, skinName);
         prefs.save();
+    }
+
+    public static void changeSkin(final String skinName) {
+        if (skinName.equals(GuiBase.getForgePrefs().getPref(FPref.UI_SKIN))) { return; }
+
+        //save skin preference
+        saveSkinName(GuiBase.getForgePrefs(), skinName);
 
         Forge.setTransitionScreen(new TransitionScreen(() -> FThreads.invokeInBackgroundThread(() -> FThreads.invokeInEdtLater(() -> {
             final LoadingOverlay loader = new LoadingOverlay(Forge.getLocalizer().getMessageorUseDefault("lblRestartInFewSeconds", "Forge will restart after a few seconds..."), true);
@@ -52,24 +54,58 @@ public class FSkin {
                 FSkinFont.deleteCachedFiles(); //delete cached font files so font can be update for new skin
                 FThreads.delayInEDT(2000, () -> {
                     Forge.clearTransitionScreen();
-                    FThreads.invokeInEdtLater(() -> {
+                    FThreads.invokeInEdtLater(() -> Forge.restart(true));
-                        Forge.restart(true);
-                    });
                 });
             });
         })), null, false, true));
     }
-    private static boolean isValidDirectory(FileHandle fileHandle) {
+    public static boolean isThemeValid(FileHandle themeDir, String themeName, boolean silent) {
-        if (fileHandle == null)
+        int missing = 0;
-            return false;
+        if (!themeDir.child("bg_splash.png").exists()) {
-        if (!fileHandle.exists())
+            if (!silent)
-            return false;
+                System.err.println(themeDir + themeName + "/bg_splash.png not found.");
-        if (!fileHandle.isDirectory())
+            missing++;
-            return false;
+        }
-        String[] lists = fileHandle.file().list();
+        if (!themeDir.child("bg_match.jpg").exists()) {
-        if (lists == null)
+            if (!silent)
-            return false;
+                System.err.println(themeDir + themeName + "/bg_match.jpg not found.");
-        return lists.length > 0;
+            missing++;
+        }
+        if (!themeDir.child("bg_texture.jpg").exists()) {
+            if (!silent)
+                System.err.println(themeDir + themeName + "/bg_texture.jpg not found.");
+            missing++;
+        }
+        if (!themeDir.child("sprite_icons.png").exists()) {
+            if (!silent)
+                System.err.println(themeDir + themeName + "/sprite_icons.png not found.");
+            missing++;
+        }
+        if (!themeDir.child("font1.ttf").exists()) {
+            if (!silent)
+                System.err.println(themeDir + themeName + "/font1.ttf not found.");
+            missing++;
+        }
+        return missing == 0;
+    }
+    private static void checkThemeDir(FileHandle themeDir, String themeName) {
+        if (themeDir == null || !themeDir.exists() || !themeDir.isDirectory()) {
+            System.err.println("Skin not found. Defaulting to fallback_skin.");
+            useFallbackDir();
+        } else {
+            if (!isThemeValid(themeDir, themeName, false)) {
+                System.err.println(themeName + " theme is missing some files to work properly.");
+                final FileHandle def = Gdx.files.absolute(ForgeConstants.DEFAULT_SKINS_DIR);
+                if (def.exists() && def.isDirectory() && isThemeValid(def, "", true)) {
+                    FSkinFont.deleteCachedFiles();
+                    //use default skin if valid
+                    preferredDir = def;
+                    saveSkinName(GuiBase.getForgePrefs(), "Default");
+                } else {
+                    useFallbackDir();
+                }
+            }
+        }
     }
     private static void useFallbackDir() {
         preferredDir = GuiBase.isAndroid() ? Gdx.files.internal("fallback_skin") : Gdx.files.classpath("fallback_skin");
@@ -97,12 +133,9 @@ public class FSkin {
         final FileHandle dir = Gdx.files.absolute(ForgeConstants.CACHE_SKINS_DIR);
         if(preferredDir == null)
         {
-            if (!isValidDirectory(dir)) {
+            if (!dir.exists() || !dir.isDirectory()) {
-                final FileHandle def = Gdx.files.absolute(ForgeConstants.DEFAULT_SKINS_DIR);
+                //if skins directory doesn't exist, point to internal assets/skin directory instead for the sake of the splash screen
-                if (def.exists() && def.isDirectory()) //if default skin exists
+                useFallbackDir();
-                    preferredDir = def;
-                else //if skins directory doesn't exist, point to internal assets/skin directory instead for the sake of the splash screen
-                    useFallbackDir();
             } else {
                 if (splashScreen != null) {
                     if (allSkins == null) { //initialize
@@ -123,11 +156,8 @@ public class FSkin {
                 }
             }
         }
-        //check preferredDir
+        //check theme
-        if (!isValidDirectory(preferredDir)) {
+        checkThemeDir(preferredDir, preferredName);
-            useFallbackDir();
-        }
-
 
         FSkinTexture.BG_TEXTURE.load(); //load background texture early for splash screen
 
@@ -543,6 +573,8 @@ public class FSkin {
             String skinName = skinFile.name();
             if (skinName.equalsIgnoreCase(".svn")) { continue; }
             if (skinName.equalsIgnoreCase(".DS_Store")) { continue; }
+            if (!skinFile.isDirectory()) { continue; }
+            if (!isThemeValid(skinFile, skinName, true)) { continue; }
             mySkins.add(skinName);
         }
 

forge-gui/src/main/java/forge/gui/GuiBase.java

@@ -1,6 +1,7 @@
 package forge.gui;
 
 import forge.gui.interfaces.IGuiBase;
+import forge.localinstance.properties.ForgePreferences;
 
 public class GuiBase {
     private static IGuiBase guiInterface;
@@ -14,9 +15,15 @@ public class GuiBase {
     private static int androidAPI = 0;
     private static int deviceRAM = 0;
     private static boolean usingAppDirectory = false;
+    private static ForgePreferences forgePrefs;
 
     public static IGuiBase getInterface() { return guiInterface; }
     public static void setInterface(IGuiBase i0) { guiInterface = i0; }
+    public static ForgePreferences getForgePrefs() {
+        if (forgePrefs == null)
+            forgePrefs = new ForgePreferences();
+        return forgePrefs;
+    }
 
     public static void setIsAndroid(boolean value) { isAndroidport = value; }
     public static boolean isAndroid() { return isAndroidport; }

forge-gui/src/main/java/forge/model/FModel.java

@@ -123,7 +123,7 @@ public final class FModel {
         // Instantiate preferences: quest and regular
         // Preferences are initialized first so that the splash screen can be translated.
         try {
-            preferences = new ForgePreferences();
+            preferences = GuiBase.getForgePrefs();
             if (adjustPrefs != null) {
                 adjustPrefs.apply(preferences);
             }