Merge pull request #521 from opentok/0.18.0

0.18.0

.github/workflows/sample_test.yml

@@ -40,7 +40,8 @@ jobs:
         run: |
           cd samples/${{ matrix.project }}/${{ matrix.platform }}
           if test -f Podfile
-          then 
+          then
+            pod update opentok-react-native
             pod install
             cat Podfile.lock
             xcodebuild clean build -quiet -workspace ${{ matrix.project }}.xcworkspace -scheme ${{ matrix.project }} -destination 'platform=iOS Simulator,name=iPhone 11,OS=14.4'

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.18.0 (Jun 24, 2021)
+- [Update]: update SDKs iOS to 2.20.0 and Android to 2.20.1
+- [Fix]: fix crash in OTPublisherLayout when sessionId is null. Fix: https://github.com/opentok/opentok-react-native/issues/462#issuecomment-752171962
+- [Fix]: Downgrade uuidv4 module to `3.4.0` due to [UUID#375](https://github.com/uuidjs/uuid/issues/375)
+- [Fix]: OTCustomAudioDrive added file in project.pbxproj
+- [Fix]: Update Github Actions 
+
 # 0.17.2 (May 27, 2021)
 - **[Fix]**: Fixed incorrect audio bitrate sanitization [#473](https://github.com/opentok/opentok-react-native/pull/473)
 - **[Fix]**: Fix audio crash on teardown [#495](https://github.com/opentok/opentok-react-native/pull/495)

README.md

@@ -53,7 +53,7 @@ If you've installed this package before, you may need to edit your `Podfile` and
     target '<YourProjectName>' do
 
       # Pods for <YourProject>
-        pod 'OpenTok', '2.18.1'
+        pod 'OpenTok', '2.20.0'
     end
 
 ```

android/build.gradle

@@ -27,5 +27,5 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.facebook.react:react-native:${_reactNativeVersion}"  // From node_modules
-    implementation 'com.opentok.android:opentok-android-sdk:2.18.1'
-}
+    implementation 'com.opentok.android:opentok-android-sdk:2.20.1'
+}

android/src/main/java/com/opentokreactnative/OTPublisherLayout.java

@@ -33,11 +33,14 @@ public void createPublisherView(String publisherId) {
         String zOrder = "";
         Publisher mPublisher = mPublishers.get(publisherId);
         if (mPublisher != null) {
-            if (androidOnTopMap.get(mPublisher.getSession().getSessionId()) != null) {
-                pubOrSub = androidOnTopMap.get(mPublisher.getSession().getSessionId());
-            }
-            if (androidZOrderMap.get(mPublisher.getSession().getSessionId()) != null) {
-                zOrder = androidZOrderMap.get(mPublisher.getSession().getSessionId());
+            String sessionId = mPublisher.getSession().getSessionId();
+            if (sessionId != null) {
+                if (androidOnTopMap.get(sessionId) != null) {
+                    pubOrSub = androidOnTopMap.get(sessionId);
+                }
+                if (androidZOrderMap.get(sessionId) != null) {
+                    zOrder = androidZOrderMap.get(sessionId);
+                }
             }
             mPublisher.setStyle(BaseVideoRenderer.STYLE_VIDEO_SCALE,
                     BaseVideoRenderer.STYLE_VIDEO_FILL);

ios/OpenTokReactNative.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		6EE70BC9267127320011216E /* OTCustomAudioDriver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EE70BC8267127320011216E /* OTCustomAudioDriver.swift */; };
 		9C6F95B920ACE8BE00FEAD68 /* OpenTokReactNative.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C6F95B820ACE8BE00FEAD68 /* OpenTokReactNative.m */; };
 		9C6F95BA20ACE8BE00FEAD68 /* OpenTokReactNative.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9C6F95B720ACE8BE00FEAD68 /* OpenTokReactNative.h */; };
 		9C6F95CE20ACE90E00FEAD68 /* OTSubscriberManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C6F95C220ACE90D00FEAD68 /* OTSubscriberManager.swift */; };
@@ -37,6 +38,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		6EE70BC8267127320011216E /* OTCustomAudioDriver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OTCustomAudioDriver.swift; sourceTree = "<group>"; };
 		9C6F95B420ACE8BE00FEAD68 /* libOpenTokReactNative.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libOpenTokReactNative.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		9C6F95B720ACE8BE00FEAD68 /* OpenTokReactNative.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenTokReactNative.h; sourceTree = "<group>"; };
 		9C6F95B820ACE8BE00FEAD68 /* OpenTokReactNative.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OpenTokReactNative.m; sourceTree = "<group>"; };
@@ -87,6 +89,7 @@
 			isa = PBXGroup;
 			children = (
 				9C86849B218E2B31004679BA /* Utils */,
+				6EE70BC8267127320011216E /* OTCustomAudioDriver.swift */,
 				9C6F95CC20ACE90E00FEAD68 /* OTPublisher.m */,
 				9C6F95C520ACE90E00FEAD68 /* OTPublisherManager.swift */,
 				9C6F95C320ACE90E00FEAD68 /* OTPublisherView.swift */,
@@ -180,6 +183,7 @@
 				9C6F95D320ACE90E00FEAD68 /* OTSubscriberView.swift in Sources */,
 				9C86850F218E3433004679BA /* Utils.swift in Sources */,
 				9C6F95CF20ACE90E00FEAD68 /* OTPublisherView.swift in Sources */,
+				6EE70BC9267127320011216E /* OTCustomAudioDriver.swift in Sources */,
 				9C6F95CE20ACE90E00FEAD68 /* OTSubscriberManager.swift in Sources */,
 				9C6F95B920ACE8BE00FEAD68 /* OpenTokReactNative.m in Sources */,
 				9C6F95D620ACE90E00FEAD68 /* OTPublisher.m in Sources */,

opentok-react-native.podspec

@@ -17,5 +17,5 @@ Pod::Spec.new do |s|
   s.source_files  = "ios/**/*.{h,m,swift}"
 
   s.dependency 'React'
-  s.dependency 'OpenTok','2.18.1'
+  s.dependency 'OpenTok','~> 2.20.0'
 end