github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-03-04 00:13:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: use java package name for loading BuildConfig (#751)

Browse Source
This commit is contained in:
Kristian Heljas 2020-01-17 13:46:45 +02:00 committed by エリス
parent 09256b766f
commit 60e022fedd
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
framework/src/org/apache/cordova/BuildHelper.java
View File

@ -51,7 +51,7 @@ public class BuildHelper {
{ {
try try
{ {
Class<?> clazz = Class.forName(ctx.getPackageName() + ".BuildConfig"); Class<?> clazz = Class.forName(ctx.getClass().getPackage().getName() + ".BuildConfig");
Field field = clazz.getField(key); Field field = clazz.getField(key);
return field.get(null); return field.get(null);
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
@ -62,6 +62,9 @@ public class BuildHelper {
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
LOG.d(TAG, "Illegal Access Exception: Let's print a stack trace."); LOG.d(TAG, "Illegal Access Exception: Let's print a stack trace.");
e.printStackTrace(); e.printStackTrace();
} catch (NullPointerException e) {
LOG.d(TAG, "Null Pointer Exception: Let's print a stack trace.");
e.printStackTrace();
} }
return null; return null;

5
framework/src/org/apache/cordova/CoreAndroid.java
View File

@ -389,7 +389,7 @@ public class CoreAndroid extends CordovaPlugin {
{ {
try try
{ {
Class<?> clazz = Class.forName(ctx.getPackageName() + ".BuildConfig"); Class<?> clazz = Class.forName(ctx.getClass().getPackage().getName() + ".BuildConfig");
Field field = clazz.getField(key); Field field = clazz.getField(key);
return field.get(null); return field.get(null);
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
@ -400,6 +400,9 @@ public class CoreAndroid extends CordovaPlugin {
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
LOG.d(TAG, "Illegal Access Exception: Let's print a stack trace."); LOG.d(TAG, "Illegal Access Exception: Let's print a stack trace.");
e.printStackTrace(); e.printStackTrace();
} catch (NullPointerException e) {
LOG.d(TAG, "Null Pointer Exception: Let's print a stack trace.");
e.printStackTrace();
} }
return null; return null;