Merge branch 'master' into 'master'

[Mobile] Fix annoying overlay between Quest Commander matches

See merge request core-developers/forge!3494

forge-gui-mobile/src/forge/screens/match/winlose/QuestWinLose.java

@@ -18,6 +18,7 @@ package forge.screens.match.winlose;
 
 import forge.game.GameView;
 import forge.quest.QuestWinLoseController;
+import forge.screens.home.HomeScreen;
 
 /**
  * <p>
@@ -44,6 +45,10 @@ public class QuestWinLose extends ControlWinLose {
 
     @Override
     public final void showRewards() {
+        //set loading overlay again
+        if (HomeScreen.instance.getQuestWorld().contains("XandomX")) {
+            HomeScreen.instance.updateQuestWorld(HomeScreen.instance.getQuestWorld().replace("XandomX","Random"));
+        }
         controller.showRewards();
     }
 
@@ -60,4 +65,13 @@ public class QuestWinLose extends ControlWinLose {
         controller.actionOnQuit();
         super.actionOnQuit();
     }
+
+    @Override
+    public void actionOnContinue() {
+        //prevent loading overlay to show on continuing match... TODO: refactor this to a better implementation
+        if (HomeScreen.instance.getQuestWorld().contains("Random")) {
+            HomeScreen.instance.updateQuestWorld(HomeScreen.instance.getQuestWorld().replace("Random","XandomX"));
+        }
+        super.actionOnContinue();
+    }
 }

forge-gui-mobile/src/forge/screens/quest/QuestDuelsScreen.java

@@ -75,7 +75,7 @@ public class QuestDuelsScreen extends QuestLaunchScreen {
             FThreads.invokeInEdtLater(new Runnable() {
                 @Override
                 public void run() {
-                    LoadingOverlay.show("Loading Random Quest", new Runnable() {
+                    LoadingOverlay.show(Localizer.getInstance().getMessage("lblLoadingCurrentQuest"), new Runnable() {
                         @Override
                         public void run() {
                             generateDuels();