Release 0.9.6.1

CHANGELOG.md

@@ -1,3 +1,25 @@
+## 0.9.6.1 [2016-03-15]
+
+### Release Notes
+
+This release adds support for cordova-ios 4.x, reduces plugin size, and fixes an issue with iOS push notifications for Ad Hoc builds.
+
+### Breaking Changes
+
+- iOS simulator build is not supported - i386 slice is removed from iOS WebRTC library
+- Push plugin dependency must be specified manually in the application - see 'Push notifications' section in README
+
+### Features
+
+- Added support for cordova-ios 4.x
+- Significantly reduced plugin size
+- Updated WebRTC lib: Android - m49
+
+### Bugfixes
+
+- Fixed iOS push issue for Ad Hoc builds
+
+
 ## 0.9.6 [2016-02-11]
 
 ### Release Notes

README.md

@@ -65,15 +65,24 @@ The complete source code is available in the [demo repo](https://github.com/bit6
 
 Push Notification support is required for receiving incoming calls and messages.
 
-Bit6 depends on [PushNotification](https://github.com/Telerik-Verified-Plugins/PushNotification) plugin which will be installed automatically.
+To enable this functionality please add one of these push plugins to your project:
+
+* [Telerik Push Plugin](https://github.com/Telerik-Verified-Plugins/PushNotification) (Recommended)
+* [Legacy PhoneGap Push Plugin](https://github.com/phonegap-build/PushPlugin)
+
+```bash
+cordova plugin add https://github.com/Telerik-Verified-Plugins/PushNotification
+```
+
+Then complete platform-specific configuration:
 
 * __iOS APNs__
     1. Generate APNS certificate in iTunes Connect.
-    2. Export it and convert to PEM files (key and certificate).
-    3. Add the files to your app in [Bit6 Dashboard](https://dashboard.bit6.com).
+    2. Export it into a p12 file.
+    3. Add the file to your app in [Bit6 Dashboard](https://dashboard.bit6.com).
 * __Android GCM__
-    1. Get the project id and server key from [Google Dev Console](http://developer.android.com/google/gcm/gs.html).
-    2. Add project id and server key for your app in [Bit6 Dashboard](https://dashboard.bit6.com).
+    1. Get the project number and server key from [Google Dev Console](http://developer.android.com/google/gcm/gs.html).
+    2. Add project number and server key for your app in [Bit6 Dashboard](https://dashboard.bit6.com).
 
 ### Building with Xcode 7
 Please disable Bitcode support when building your Cordova app with Xcode.

plugin.xml

@@ -2,7 +2,7 @@
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="com.bit6.sdk"
-    version="0.9.6">
+    version="0.9.6.1">
 
     <name>Bit6</name>
     <description>Add voice and video calling, text and media messaging to your app</description>
@@ -13,7 +13,7 @@
         <engine name="cordova-ios" version=">=3.0.0" />
     </engines>
 
-    <dependency id="com.phonegap.plugins.PushPlugin" url="https://github.com/Telerik-Verified-Plugins/PushNotification" /> 
+    <dependency id="cordova-plugin-device"/>
 
     <js-module src="www/phonertc.js" name="PhoneRTC">
     </js-module>

src/ios/PhoneRTCPlugin.m

@@ -6,16 +6,13 @@
 
 @implementation PhoneRTCPlugin
 
-- (instancetype)initWithWebView:(UIWebView*)webView
+- (void) pluginInitialize
 {
-    self = [super initWithWebView :webView];
-    if (self) {
-        self.peerConnectionFactory = [[RTCPeerConnectionFactory alloc] init];
-        [RTCPeerConnectionFactory initializeSSL];
-        self.sessions = [[NSMutableDictionary alloc] init];
-        self.remoteVideoViews = [[NSMutableArray alloc] init];
-    }
-    return self;
+    [super pluginInitialize];
+    self.peerConnectionFactory = [[RTCPeerConnectionFactory alloc] init];
+    [RTCPeerConnectionFactory initializeSSL];
+    self.sessions = [[NSMutableDictionary alloc] init];
+    self.remoteVideoViews = [[NSMutableArray alloc] init];
 }
 
 - (void) createSessionObject:(CDVInvokedUrlCommand*)command
@@ -353,15 +350,26 @@ -(void) onSessionDisconnect:(NSString*) sessionKey
 
 -(void) isApnsProduction: (CDVInvokedUrlCommand*)command
 {
-   BOOL apnsProduction = false;
-   if (![[NSBundle mainBundle] pathForResource:@"embedded" ofType:@"mobileprovision"]) {
-      apnsProduction = true;
-   }
-
-   CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsBool:apnsProduction];
-   [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    static BOOL isDevelopment = NO;
+#if TARGET_IPHONE_SIMULATOR
+    isDevelopment = YES;
+#else
+    NSData *data = [NSData dataWithContentsOfFile:[NSBundle.mainBundle pathForResource:@"embedded" ofType:@"mobileprovision"]];
+    if (data) {
+        const char *bytes = [data bytes];
+        NSMutableString *profile = [[NSMutableString alloc] initWithCapacity:data.length];
+        for (NSUInteger i = 0; i < data.length; i++) {
+            [profile appendFormat:@"%c", bytes[i]];
+        }
+        NSString *cleared = [[profile componentsSeparatedByCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet] componentsJoinedByString:@""];
+        isDevelopment = [cleared rangeOfString:@"<key>get-task-allow</key><true/>"].length > 0;
+    }
+#endif
+    CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsBool: !isDevelopment];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
 
+
 @end
 
 @implementation VideoTrackViewPair