diff --git a/framework/src/org/apache/cordova/Config.java b/framework/src/org/apache/cordova/Config.java index 3ef35a5e..76eda1b9 100644 --- a/framework/src/org/apache/cordova/Config.java +++ b/framework/src/org/apache/cordova/Config.java @@ -72,7 +72,7 @@ public class Config { return; } - int id = action.getResources().getIdentifier("config", "xml", action.getPackageName()); + int id = action.getResources().getIdentifier("config", "xml", action.getClass().getPackage().getName()); if (id == 0) { id = action.getResources().getIdentifier("cordova", "xml", action.getPackageName()); LOG.i("CordovaLog", "config.xml missing, reverting to cordova.xml"); @@ -123,7 +123,7 @@ public class Config { { value = "splash"; } - resource = action.getResources().getIdentifier(value, "drawable", action.getPackageName()); + resource = action.getResources().getIdentifier(value, "drawable", action.getClass().getPackage().getName()); action.getIntent().putExtra(name, resource); } diff --git a/framework/src/org/apache/cordova/PluginManager.java b/framework/src/org/apache/cordova/PluginManager.java index 2db9d56e..5249f504 100755 --- a/framework/src/org/apache/cordova/PluginManager.java +++ b/framework/src/org/apache/cordova/PluginManager.java @@ -107,12 +107,7 @@ public class PluginManager { * Load plugins from res/xml/config.xml */ public void loadPlugins() { - int id = this.ctx.getActivity().getResources().getIdentifier("config", "xml", this.ctx.getActivity().getPackageName()); - if(id == 0) - { - id = this.ctx.getActivity().getResources().getIdentifier("plugins", "xml", this.ctx.getActivity().getPackageName()); - LOG.i(TAG, "Using plugins.xml instead of config.xml. plugins.xml will eventually be deprecated"); - } + int id = this.ctx.getActivity().getResources().getIdentifier("config", "xml", this.ctx.getActivity().getClass().getPackage().getName()); if (id == 0) { this.pluginConfigurationMissing(); //We have the error, we need to exit without crashing!