external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert Android 8 codes to support older Android phones.

Browse Source 
Hope I didn't miss any. :)
(tested with Android Marshmallow phone with 2gb RAM and mediatek cpu)
This commit is contained in:
Anthony Calosa
2019-09-07 22:54:53 +08:00
parent c1d5cfa27e
commit a0b71d60a1
30 changed files with 81 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-desktop/src/main/java/forge/gui/ImportSourceAnalyzer.java
View File

@@ -446,7 +446,7 @@ public class ImportSourceAnalyzer {
analyzeListedDir(root, ForgeConstants.CACHE_ICON_PICS_DIR, new ListedAnalyzer() {
@Override
public String map(final String filename) {
return iconFileNames.getOrDefault(filename, null);
return iconFileNames.containsKey(filename) ? iconFileNames.get(filename) : null;
}
@Override
@@ -618,7 +618,7 @@ public class ImportSourceAnalyzer {
analyzeListedDir(root, targetDir, new ListedAnalyzer() {
@Override
public String map(final String filename) {
return fileDb.getOrDefault(filename, null);
return fileDb.containsKey(filename) ? fileDb.get(filename) : null;
}
@Override

6
forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java
View File

@@ -857,7 +857,11 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel implem
@SuppressWarnings("unchecked")
public void addFilter(final ItemFilter<? extends T> filter) {
final Class<? extends ItemFilter<? extends T>> filterClass = (Class<? extends ItemFilter<? extends T>>) filter.getClass();
List<ItemFilter<? extends T>> classFilters = this.filters.computeIfAbsent(filterClass, k -> new ArrayList<>());
List<ItemFilter<? extends T>> classFilters = this.filters.get(filterClass);
if (classFilters == null) {
classFilters = new ArrayList<>();
this.filters.put(filterClass, classFilters);
}
if (classFilters.size() > 0) {
//if filter with the same class already exists, try to merge if allowed
//NOTE: can always use first filter for these checks since if

2
forge-gui-desktop/src/main/java/forge/sound/AltSoundSystem.java
View File

@@ -36,7 +36,7 @@ class AsyncSoundRegistry {
}
public synchronized static int getNumIterations(String soundName) {
return soundsPlayed.getOrDefault(soundName, 0);
return soundsPlayed.containsKey(soundName) ? soundsPlayed.get(soundName) : 0;
}
}