Working in Android and iOS now

jesusprubio · jesusprubio · commit c38ca0a97a5f · 2015-06-23T17:19:55.000+02:00
diff --git a/README.md b/README.md
@@ -8,35 +8,22 @@ Google's [AppRTC](https://apprtc.appspot.com/) adapted to [Cordova](http://cordo
 This project takes the [HTML5 version](https://github.com/webrtc/apprtc/tree/master/src/web_app) of the *AppRTC* application and runs it in Cordova iOS (iPhone, iPad...) by using the [cordova-plugin-iosrtc](https://github.com/eface2face/cordova-plugin-iosrtc) to provide the [WebRTC W3C JavaScript APIs](http://www.w3.org/TR/webrtc/).
 
 
-## Building
+## Building & usage
 
 - Get the source code:
 ```bash
 git clone https://github.com/eface2face/iOSRTCApp
 cd iOSRTCApp
 ```
-- Change the Android WebView engine by the [Crosswalk](https://crosswalk-project.org/) one using [the proper plugin](https://github.com/crosswalk-project/cordova-plugin-crosswalk-webview):
-```bash
-cordova plugin add https://github.com/crosswalk-project/cordova-plugin-crosswalk-webview --save
-```
-- Then install this plugin:
-```bash
-cordova plugin add com.eface2face.iosrtc --save
-```
-- Add both platforms:
+- Add both platforms, all needed plugins are installed automatically because of being included in the "config.xml" file:
 ```bash
 cordova platform add ios android
 ```
 - Run as usual:
 ```bash
 cordova run android --device
-cordova run ios --device
 ```
-
-
-## Usage
-
-Once running, enter the same room as one already created via web browser at https://apprtc.appspot.com/, and enjoy!
+- Once running, enter the same room as one already created via web browser at https://apprtc.appspot.com/, and enjoy!
 
 
 ## Changes to the original AppRTC HTML5 code
diff --git a/config.xml b/config.xml
@@ -12,6 +12,9 @@
     <preference name="Orientation" value="portrait" />
     <preference name="EnableViewportScale" value="true" />
     <preference name="StatusBarOverlaysWebView" value="false" />
+    <!-- TODO: Needed for now: http://stackoverflow.com/a/30992364 -->
+    <!-- <plugin name="cordova-plugin-whitelist" version="1" /> -->
+    <plugin name="cordova-plugin-whitelist" version="1.0.0" />
     <access origin="*" />
     <allow-intent href="http://*/*" />
     <allow-intent href="https://*/*" />
@@ -29,4 +32,5 @@
     <plugin name="com.eface2face.iosrtc" spec="^1.2.8" />
     <plugin name="cordova-plugin-crosswalk-webview" spec="https://github.com/crosswalk-project/cordova-plugin-crosswalk-webview" />
     <plugin name="cordova-plugin-device" spec="^1.0.1" />
+    <plugin name="cordova-plugin-camera" spec="https://github.com/eface2face/cordova-plugin-camera" />
 </widget>
diff --git a/www/appwindow.html b/www/appwindow.html
@@ -10,6 +10,9 @@
 <head>
 
   <meta charset="utf-8">
+  <!-- <meta http-equiv="Content-Security-Policy" content="default-src 'self' data: gap: https://ssl.gstatic.com 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *"> -->
+  <meta http-equiv="Content-Security-Policy" content="default-src 'self' 'unsafe-inline' data: gap: https://ssl.gstatic.com 'unsafe-eval';
+                                                      style-src 'self' 'unsafe-inline'; media-src *; connect-src *">
   <meta name="description" content="WebRTC reference app">
   <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, maximum-scale=1">
   <meta itemprop="description" content="Video chat using the reference WebRTC application">
@@ -155,20 +158,19 @@ <h1>AppRTC</h1>
           window.updateVideos = function () {};
         }
 
-        // Wait a bit since we are adding more stuff into the DOM.
+        // TODO: Wait a bit since we are adding more stuff into the DOM.
         setTimeout(function () {
           // Avoid iOS WebSocket crash:
           //   https://github.com/eface2face/cordova-plugin-iosrtc/issues/12
           // Also looad the original AppRTC JS scripts once Cordova is ready (so the iosrtc plugin
           // has polluted the window namespace with WebRTC class/functions).
           ["js/ios-websocket-hack.js", "js/apprtc.debug.js", "js/appwindow.js"].forEach(function (path) {
-            setTimeout(function () {
-              var script = document.createElement("script");
+            var script = document.createElement("script");
 
-              script.type = "text/javascript";
-              script.src = path;
-              document.getElementsByTagName("head")[0].appendChild(script);
-            });
+            script.type = "text/javascript";
+            script.src = path;
+            script.async = false;
+            document.getElementsByTagName("head")[0].appendChild(script);
           });
         }, 1000);
       });  // End of ondeviceready.
