From f5bf7a4581f6447a6ea18b4a2cee08a28dd61f77 Mon Sep 17 00:00:00 2001 From: Nigol Date: Tue, 27 Jul 2021 20:42:19 -0400 Subject: [PATCH] Fixed Net Decks Archive not working on Mobile when in the Deck Manager (cherry picked from commit 8585d49e246d4c936f1ddbad2b39f5c1381f64dc) --- .../src/forge/deck/FDeckChooser.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/forge-gui-mobile/src/forge/deck/FDeckChooser.java b/forge-gui-mobile/src/forge/deck/FDeckChooser.java index d79d4bc7cbd..2100fc14530 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckChooser.java +++ b/forge-gui-mobile/src/forge/deck/FDeckChooser.java @@ -633,6 +633,9 @@ public class FDeckChooser extends FScreen { @Override public void run() { GameType gameType = lstDecks.getGameType(); + if (gameType == GameType.DeckManager) { + gameType = GameType.Constructed; + } final NetDeckArchiveStandard category = NetDeckArchiveStandard.selectAndLoad(gameType); FThreads.invokeInEdtLater(new Runnable() { @@ -659,6 +662,9 @@ public class FDeckChooser extends FScreen { @Override public void run() { GameType gameType = lstDecks.getGameType(); + if (gameType == GameType.DeckManager) { + gameType = GameType.Constructed; + } final NetDeckArchivePioneer category = NetDeckArchivePioneer.selectAndLoad(gameType); FThreads.invokeInEdtLater(new Runnable() { @@ -685,6 +691,9 @@ public class FDeckChooser extends FScreen { @Override public void run() { GameType gameType = lstDecks.getGameType(); + if (gameType == GameType.DeckManager) { + gameType = GameType.Constructed; + } final NetDeckArchiveModern category = NetDeckArchiveModern.selectAndLoad(gameType); FThreads.invokeInEdtLater(new Runnable() { @@ -711,6 +720,9 @@ public class FDeckChooser extends FScreen { @Override public void run() { GameType gameType = lstDecks.getGameType(); + if (gameType == GameType.DeckManager) { + gameType = GameType.Constructed; + } final NetDeckArchivePauper category = NetDeckArchivePauper.selectAndLoad(gameType); FThreads.invokeInEdtLater(new Runnable() { @@ -737,6 +749,9 @@ public class FDeckChooser extends FScreen { @Override public void run() { GameType gameType = lstDecks.getGameType(); + if (gameType == GameType.DeckManager) { + gameType = GameType.Constructed; + } final NetDeckArchiveLegacy category = NetDeckArchiveLegacy.selectAndLoad(gameType); FThreads.invokeInEdtLater(new Runnable() { @@ -763,6 +778,9 @@ public class FDeckChooser extends FScreen { @Override public void run() { GameType gameType = lstDecks.getGameType(); + if (gameType == GameType.DeckManager) { + gameType = GameType.Constructed; + } final NetDeckArchiveVintage category = NetDeckArchiveVintage.selectAndLoad(gameType); FThreads.invokeInEdtLater(new Runnable() { @@ -789,6 +807,9 @@ public class FDeckChooser extends FScreen { @Override public void run() { GameType gameType = lstDecks.getGameType(); + if (gameType == GameType.DeckManager) { + gameType = GameType.Constructed; + } final NetDeckArchiveBlock category = NetDeckArchiveBlock.selectAndLoad(gameType); FThreads.invokeInEdtLater(new Runnable() {