Merge branch 'squash/socket_kim-ec' into 'develop'

【ABook Communication】通話終了しても通話終了されなく、「参加する」メッセージのままになる。

See merge request !248

public_new/js/common/native-bridge-delegate.js

@@ -224,7 +224,11 @@ NativeBridgeDelegate.finishCollaboration = function (needsAndroid = false) {
   if (deviceInfo.isiOS()) {
   if (deviceInfo.isiOS()) {
     webkit.messageHandlers.finishCollaboration.postMessage({});
     webkit.messageHandlers.finishCollaboration.postMessage({});
   } else if (needsAndroid) {
   } else if (needsAndroid) {
+    try {
       android.finishCollaboration();
       android.finishCollaboration();
+    } catch (error) {
+      console.error(error);
+    }
   }
   }
 };
 };
 
 

public_new/js/views/collaboration/share-event-listener.js

@@ -444,7 +444,7 @@ CoviewBridge.finishCollaboration = function () {
   Common.showLoadingIndicator();
   Common.showLoadingIndicator();
   coview_api.LeaveRoom();
   coview_api.LeaveRoom();
   if (coview_api.getRoomUsers()) {
   if (coview_api.getRoomUsers()) {
-    NativeBridgeDelegate.finishCollaboration();
+    NativeBridgeDelegate.finishCollaboration(true);
   }
   }
   globalUserInfo.isLeaved = true;
   globalUserInfo.isLeaved = true;