This is an automated email from the ASF dual-hosted git repository.
erisu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
The following commit(s) were added to refs/heads/master by this push:
new 60e022f feat: use java package name for loading BuildConfig (#751)
60e022f is described below
commit 60e022feddfae0c585cafe500e74ab5d52381e74
Author: Kristian Heljas <[email protected]>
AuthorDate: Fri Jan 17 13:46:45 2020 +0200
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 6d9daa4..94fe961 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 3945cdd..6ebdecb 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;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
