Merge branch 'master' into 'master'

cleanup

See merge request core-developers/forge!4379

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

@@ -215,7 +215,7 @@ public class GuiMobile implements IGuiBase {
     public void showCardList(final String title, final String message, final List<PaperCard> list) {
         final Deck deck = new Deck(title + " - " + message);
         deck.getMain().addAllFlat(list);
-        FDeckViewer.show(deck, true); //TODO: limit this to Android only?
+        FDeckViewer.show(deck, true);
     }
 
     @Override

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

@@ -73,7 +73,6 @@ public class ImageCache {
     private static final LoadingCache<String, Texture> cache = CacheBuilder.newBuilder()
             .maximumSize(Forge.cacheSize)
             .expireAfterAccess(15, TimeUnit.MINUTES)
-            .softValues()
             .removalListener(new RemovalListener<String, Texture>() {
                 @Override
                 public void onRemoval(RemovalNotification<String, Texture> removalNotification) {

forge-gui-mobile/src/forge/deck/FDeckViewer.java

@@ -116,13 +116,10 @@ public class FDeckViewer extends FScreen {
     public static void show(final Deck deck0) {
         show(deck0, false);
     }
-    public static void show(final Deck deck0, boolean disposeTexture) {
+    public static void show(final Deck deck0, boolean noPreload) {
         if (deck0 == null) { return; }
 
-        if (disposeTexture) {
-            /*this is called on Quest shoplist, quest rewards, quest unlock sets*/
-            ImageCache.disposeTexture();
-        } else {
+        if (!noPreload){
             /*preload deck to cache*/
             ImageCache.preloadCache(deck0);
         }