diff --git a/forge-gui-mobile/src/forge/screens/match/MatchController.java b/forge-gui-mobile/src/forge/screens/match/MatchController.java index d29b07d772f..74219ed7072 100644 --- a/forge-gui-mobile/src/forge/screens/match/MatchController.java +++ b/forge-gui-mobile/src/forge/screens/match/MatchController.java @@ -6,11 +6,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; + import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import com.google.common.base.Function; import com.google.common.collect.Iterables; + import forge.Forge; import forge.Graphics; import forge.GuiBase; @@ -444,7 +446,10 @@ public class MatchController extends AbstractGuiGame { } @Override - public boolean confirm(final CardView c, final String question, final boolean defaultIsYes, final String[] options) { + public boolean confirm(final CardView c, final String question, final boolean defaultIsYes, String[] options) { + if (options == null) { + options = new String[] { "Yes", "No" }; + } return FOptionPane.showCardOptionDialog(c, question, "", SOptionPane.INFORMATION_ICON, options, defaultIsYes ? 1 : 0) == 1; } diff --git a/forge-gui/src/main/java/forge/match/AbstractGuiGame.java b/forge-gui/src/main/java/forge/match/AbstractGuiGame.java index e4ebb069575..234d2498861 100644 --- a/forge-gui/src/main/java/forge/match/AbstractGuiGame.java +++ b/forge-gui/src/main/java/forge/match/AbstractGuiGame.java @@ -589,13 +589,11 @@ public abstract class AbstractGuiGame implements IGuiGame, IMayViewCards { return showInputDialog(message, title, null, "", null); } - @Override public String showInputDialog(final String message, final String title, final FSkinProp icon) { return showInputDialog(message, title, icon, "", null); } - @Override public String showInputDialog(final String message, final String title, final FSkinProp icon, final String initialInput) { return showInputDialog(message, title, icon, initialInput, null);