From 7bc8bf6c9c055ae0ee79721c12efe2f4fbed1840 Mon Sep 17 00:00:00 2001
From: elcnesh <elcnesh@cardforge.org>
Date: Sun, 7 Sep 2014 09:50:18 +0000
Subject: [PATCH] Merged changes from trunk to GuiRefactoring: 27198-27235
 (mobile and android projects)

---
 forge-gui-android/pom.xml                              | 2 +-
 forge-gui-mobile/src/forge/Forge.java                  | 2 +-
 forge-gui-mobile/src/forge/card/CardImageRenderer.java | 3 +--
 forge-gui-mobile/src/forge/screens/match/FControl.java | 5 +----
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml
index 9ca97584ed1..1bd1901474c 100644
--- a/forge-gui-android/pom.xml
+++ b/forge-gui-android/pom.xml
@@ -7,7 +7,7 @@
         <packaging.type>jar</packaging.type>
         <build.min.memory>-Xms128m</build.min.memory>
         <build.max.memory>-Xmx2048m</build.max.memory>
-        <alpha-version>1.5.26.003</alpha-version>
+        <alpha-version>1.5.26.004</alpha-version>
     </properties>
 
     <parent>
diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
index b75ce0b2a77..dd427d79b4b 100644
--- a/forge-gui-mobile/src/forge/Forge.java
+++ b/forge-gui-mobile/src/forge/Forge.java
@@ -37,7 +37,7 @@ import forge.util.FileUtil;
 import forge.util.Utils;
 
 public class Forge implements ApplicationListener {
-    public static final String CURRENT_VERSION = "1.5.26.003";
+    public static final String CURRENT_VERSION = "1.5.26.004";
 
     private static final ApplicationListener app = new Forge();
     private static Clipboard clipboard;
diff --git a/forge-gui-mobile/src/forge/card/CardImageRenderer.java b/forge-gui-mobile/src/forge/card/CardImageRenderer.java
index 34940f7ea5a..97b7f63f287 100644
--- a/forge-gui-mobile/src/forge/card/CardImageRenderer.java
+++ b/forge-gui-mobile/src/forge/card/CardImageRenderer.java
@@ -255,8 +255,7 @@ public class CardImageRenderer {
             g.drawImage(image, x + (w - iconSize) / 2, y + (h - iconSize) / 2, iconSize, iconSize);
         }
         else {
-            if (card.getRules() == null) { return; } //this can happen with certain tokens
-            String text = card.getRules().getOracleText();
+            String text = card.getOracleText();
             if (StringUtils.isEmpty(text)) { return; }
 
             text = text.replace("\\n", "\n"); //replace new line placeholders with actual new line characters
diff --git a/forge-gui-mobile/src/forge/screens/match/FControl.java b/forge-gui-mobile/src/forge/screens/match/FControl.java
index 3da28684821..81ced4aa171 100644
--- a/forge-gui-mobile/src/forge/screens/match/FControl.java
+++ b/forge-gui-mobile/src/forge/screens/match/FControl.java
@@ -216,10 +216,7 @@ public class FControl {
         Player p = getCurrentPlayer();
 
         if (p != null) {
-            p.getController().autoPassUntil(PhaseType.CLEANUP);
-            if (!inputProxy.passPriority()) {
-                p.getController().autoPassCancel();
-            }
+            inputProxy.passPriority(p, PhaseType.CLEANUP);
         }
     }