From 451d2a271e8f7acb88aa867a7bffa02e8baf6b15 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 3 Mar 2019 11:38:19 -0800
Subject: [PATCH] use constant APPLICATION_ID instead of method call

---
 .../app/src/main/java/org/eehouse/android/xw4/DictUtils.java  | 2 +-
 .../main/java/org/eehouse/android/xw4/GamesListDelegate.java  | 2 +-
 .../java/org/eehouse/android/xw4/UpdateCheckReceiver.java     | 2 +-
 .../app/src/main/java/org/eehouse/android/xw4/Utils.java      | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictUtils.java
index cd46b0106..f0696a49a 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictUtils.java
@@ -621,7 +621,7 @@ public class DictUtils {
             File storage = Environment.getExternalStorageDirectory();
             if ( null != storage ) {
                 String packdir = String.format( "Android/data/%s/files/",
-                                                context.getPackageName() );
+                                                BuildConfig.APPLICATION_ID );
                 result = new File( storage.getPath(), packdir );
                 if ( !result.exists() ) {
                     result.mkdirs();
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
index 9d75ba46d..e83c88e6b 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
@@ -1580,7 +1580,7 @@ public class GamesListDelegate extends ListDelegateBase
 
         case R.id.games_menu_rateme:
             String str = String.format( "market://details?id=%s",
-                                        m_activity.getPackageName() );
+                                        BuildConfig.APPLICATION_ID );
             try {
                 startActivity( new Intent( Intent.ACTION_VIEW, Uri.parse( str ) ) );
             } catch ( android.content.ActivityNotFoundException anf ) {
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/UpdateCheckReceiver.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/UpdateCheckReceiver.java
index a10652688..4e4d715b0 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/UpdateCheckReceiver.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/UpdateCheckReceiver.java
@@ -113,7 +113,7 @@ public class UpdateCheckReceiver extends BroadcastReceiver {
     {
         JSONObject params = new JSONObject();
         PackageManager pm = context.getPackageManager();
-        String packageName = context.getPackageName();
+        String packageName = BuildConfig.APPLICATION_ID;
         int versionCode;
         try {
             versionCode = pm.getPackageInfo( packageName, 0 ).versionCode;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Utils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Utils.java
index 7596ffe82..a7c9d382c 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Utils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Utils.java
@@ -514,7 +514,7 @@ public class Utils {
         if ( null == s_appVersion ) {
             try {
                 int version = context.getPackageManager()
-                    .getPackageInfo(context.getPackageName(), 0)
+                    .getPackageInfo(BuildConfig.APPLICATION_ID, 0)
                     .versionCode;
                 s_appVersion = new Integer( version );
             } catch ( Exception e ) {
@@ -558,7 +558,7 @@ public class Utils {
     public static boolean isGooglePlayApp( Context context )
     {
         PackageManager pm = context.getPackageManager();
-        String packageName = context.getPackageName();
+        String packageName = BuildConfig.APPLICATION_ID;
         String installer = pm.getInstallerPackageName( packageName );
         boolean result = "com.google.android.feedback".equals( installer )
             || "com.android.vending".equals( installer );