Commit cbd17702 by Kim Peace

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

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

See merge request !248
parents a3c8e7ed 7cdff7a7
...@@ -224,7 +224,11 @@ NativeBridgeDelegate.finishCollaboration = function (needsAndroid = false) { ...@@ -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);
}
} }
}; };
......
...@@ -444,7 +444,7 @@ CoviewBridge.finishCollaboration = function () { ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment