Only export Cordova files if they are available

fcaivano · Feb 5, 2018 · ba29e79 · ba29e79
1 parent 1cb151c
commit ba29e79
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/android/capacitor/src/main/java/com/getcapacitor/Bridge.java b/android/capacitor/src/main/java/com/getcapacitor/Bridge.java
@@ -399,9 +399,9 @@ private JSInjector getJSInjector() {
     try {
       String coreJS = JSExport.getCoreJS(context);
       String pluginJS = JSExport.getPluginJS(plugins.values());
-      String cordovaJS = ""; // JSExport.getCordovaJS(context);
-      String cordovaPluginsJS = ""; // JSExport.getCordovaPluginJS(context);
-      String cordovaPluginsFileJS = ""; // JSExport.getCordovaPluginsFileJS(context);
+      String cordovaJS = JSExport.getCordovaJS(context);
+      String cordovaPluginsJS = JSExport.getCordovaPluginJS(context);
+      String cordovaPluginsFileJS = JSExport.getCordovaPluginsFileJS(context);
 
       return new JSInjector(coreJS, pluginJS, cordovaJS, cordovaPluginsJS, cordovaPluginsFileJS);
     } catch(JSExportException ex) {

diff --git a/android/capacitor/src/main/java/com/getcapacitor/JSExport.java b/android/capacitor/src/main/java/com/getcapacitor/JSExport.java
@@ -39,20 +39,24 @@ private static String getJS(Context context, String fileName) throws IOException
     }
   }
 
-  public static String getCordovaJS(Context context) throws JSExportException {
+  public static String getCordovaJS(Context context) {
+    String fileContent = "";
     try {
-      return getJS(context, "public/cordova.js");
+      fileContent = getJS(context, "public/cordova.js");
     } catch(IOException ex) {
-      throw new JSExportException("Unable to load cordova.js. Capacitor will not function!", ex);
+      Log.e(Bridge.TAG, "Unable to read public/cordova.js file, Cordova plugins will not work");
     }
+    return fileContent;
   }
 
-  public static String getCordovaPluginsFileJS(Context context) throws JSExportException {
+  public static String getCordovaPluginsFileJS(Context context) {
+    String fileContent = "";
     try {
-      return getJS(context, "public/cordova_plugins.js");
+      fileContent = getJS(context, "public/cordova_plugins.js");
     } catch(IOException ex) {
-      throw new JSExportException("Unable to load cordova_plugins.js. Capacitor will not function!", ex);
+      Log.e(Bridge.TAG, "Unable to read public/cordova_plugins.js file, Cordova plugins will not work");
     }
+    return fileContent;
   }
 
   public static String getPluginJS(Collection<PluginHandle> plugins) {