Merge branch 'develop' into debug/console_logs

public_new/js/common/common.js

@@ -169,6 +169,7 @@ Common.startCollaboration = function (collaborationType) {
       deviceInfo.androidVersion < ANDROID_SDK_VERSION.O
       deviceInfo.androidVersion < ANDROID_SDK_VERSION.O
     ) {
     ) {
       alert(getLocalizedString("not_support_version"));
       alert(getLocalizedString("not_support_version"));
+      Common.dismissLoadingIndicator();
       return;
       return;
     }
     }
   }
   }

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

@@ -149,7 +149,7 @@ NativeBridgeDelegate.saveSelectedUserList = function (selectedUserList) {
 NativeBridgeDelegate.startPIPMode = function () {
 NativeBridgeDelegate.startPIPMode = function () {
   console.debug("call Native Delegate - startPIPMode");
   console.debug("call Native Delegate - startPIPMode");
   if (typeof android != "undefined") {
   if (typeof android != "undefined") {
-    android.startPipMode();
+    android.startPIPMode();
   } else if (deviceInfo.isiOS()) {
   } else if (deviceInfo.isiOS()) {
     webkit.messageHandlers.startPipMode.postMessage({});
     webkit.messageHandlers.startPipMode.postMessage({});
   }
   }
@@ -415,7 +415,11 @@ NativeBridgeDelegate.changeCollaboration = function (
 NativeBridgeDelegate.showLoadingIndicator = function () {
 NativeBridgeDelegate.showLoadingIndicator = function () {
   console.debug("call Native Delegate - showLoadingIndicator");
   console.debug("call Native Delegate - showLoadingIndicator");
   if (deviceInfo.isiOS()) {
   if (deviceInfo.isiOS()) {
-    webkit.messageHandlers.showLoadingIndicator.postMessage({});
+    try {
+      webkit.messageHandlers.showLoadingIndicator.postMessage({});
+    } catch (e) {
+      console.error("failed to display loading indicator with error: " + e);
+    }
   } else if (deviceInfo.isAndroid()) {
   } else if (deviceInfo.isAndroid()) {
     android.showLoadingIndicator();
     android.showLoadingIndicator();
   }
   }