From 34a580c82588e630afdca9a7215a64918b21a259 Mon Sep 17 00:00:00 2001
From: Andy Balaam <andybalaam@artificialworlds.net>
Date: Sat, 14 Jan 2017 18:29:03 +0000
Subject: [PATCH] Fix crash in free version caused by use of incorrect
 application ID.

---
 .../java/rabbitescape/ui/android/AndroidUiDriver.java         | 4 +++-
 .../src/main/java/rabbitescape/ui/android/AbilityButton.java  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/rabbit-escape-ui-android/app/src/androidTest/java/rabbitescape/ui/android/AndroidUiDriver.java b/rabbit-escape-ui-android/app/src/androidTest/java/rabbitescape/ui/android/AndroidUiDriver.java
index e168210c..4fc6a530 100644
--- a/rabbit-escape-ui-android/app/src/androidTest/java/rabbitescape/ui/android/AndroidUiDriver.java
+++ b/rabbit-escape-ui-android/app/src/androidTest/java/rabbitescape/ui/android/AndroidUiDriver.java
@@ -21,6 +21,8 @@
 import rabbitescape.engine.Token;
 import rabbitescape.engine.menu.MenuItem;
 
+import static net.artificialworlds.rabbitescape.BuildConfig.APPLICATION_ID;
+
 class AndroidUiDriver
 {
     private static class Holder<T>
@@ -48,7 +50,7 @@ public AndroidUiDriver( ActivityInstrumentationTestCase2<AndroidMenuActivity> te
         monitor( testCase, AndroidAboutActivity.class );
 
         testCase.launchActivity(
-            "net.artificialworlds.rabbitescape", AndroidMenuActivity.class, null
+            APPLICATION_ID, AndroidMenuActivity.class, null
         );
     }
 
diff --git a/rabbit-escape-ui-android/app/src/main/java/rabbitescape/ui/android/AbilityButton.java b/rabbit-escape-ui-android/app/src/main/java/rabbitescape/ui/android/AbilityButton.java
index e892a366..097b97f9 100644
--- a/rabbit-escape-ui-android/app/src/main/java/rabbitescape/ui/android/AbilityButton.java
+++ b/rabbit-escape-ui-android/app/src/main/java/rabbitescape/ui/android/AbilityButton.java
@@ -11,6 +11,8 @@
 import android.widget.ImageButton;
 import android.widget.RadioGroup;
 
+import static net.artificialworlds.rabbitescape.BuildConfig.APPLICATION_ID;
+
 public class AbilityButton extends Button
 {
     private class OnClickListener implements ImageButton.OnClickListener
@@ -66,7 +68,7 @@ private void setImage( Resources resources )
             resources.getIdentifier(
                 "ability_" + ability,
                 "drawable",
-                "net.artificialworlds.rabbitescape"
+                APPLICATION_ID
             )
         );