From 60e022feddfae0c585cafe500e74ab5d52381e74 Mon Sep 17 00:00:00 2001
From: Kristian Heljas <kristian@kristian.ee>
Date: Fri, 17 Jan 2020 13:46:45 +0200
Subject: [PATCH] feat: use java package name for loading BuildConfig (#751)

---
 framework/src/org/apache/cordova/BuildHelper.java | 5 ++++-
 framework/src/org/apache/cordova/CoreAndroid.java | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/framework/src/org/apache/cordova/BuildHelper.java b/framework/src/org/apache/cordova/BuildHelper.java
index 6d9daa47..94fe9612 100644
--- a/framework/src/org/apache/cordova/BuildHelper.java
+++ b/framework/src/org/apache/cordova/BuildHelper.java
@@ -51,7 +51,7 @@ public class BuildHelper {
     {
         try
         {
-            Class<?> clazz = Class.forName(ctx.getPackageName() + ".BuildConfig");
+            Class<?> clazz = Class.forName(ctx.getClass().getPackage().getName() + ".BuildConfig");
             Field field = clazz.getField(key);
             return field.get(null);
         } catch (ClassNotFoundException e) {
@@ -62,6 +62,9 @@ public class BuildHelper {
         } catch (IllegalAccessException e) {
             LOG.d(TAG, "Illegal Access Exception: Let's print a stack trace.");
             e.printStackTrace();
+        } catch (NullPointerException e) {
+            LOG.d(TAG, "Null Pointer Exception: Let's print a stack trace.");
+            e.printStackTrace();
         }
 
         return null;
diff --git a/framework/src/org/apache/cordova/CoreAndroid.java b/framework/src/org/apache/cordova/CoreAndroid.java
index 3945cdd6..6ebdecb3 100755
--- a/framework/src/org/apache/cordova/CoreAndroid.java
+++ b/framework/src/org/apache/cordova/CoreAndroid.java
@@ -389,7 +389,7 @@ public class CoreAndroid extends CordovaPlugin {
     {
         try
         {
-            Class<?> clazz = Class.forName(ctx.getPackageName() + ".BuildConfig");
+            Class<?> clazz = Class.forName(ctx.getClass().getPackage().getName() + ".BuildConfig");
             Field field = clazz.getField(key);
             return field.get(null);
         } catch (ClassNotFoundException e) {
@@ -400,6 +400,9 @@ public class CoreAndroid extends CordovaPlugin {
         } catch (IllegalAccessException e) {
             LOG.d(TAG, "Illegal Access Exception: Let's print a stack trace.");
             e.printStackTrace();
+        } catch (NullPointerException e) {
+            LOG.d(TAG, "Null Pointer Exception: Let's print a stack trace.");
+            e.printStackTrace();
         }
 
         return null;