会議室接続失敗時に「会議室入室に失敗しました。」ダイアログ表示を「協業に参加することができませんでした。」に変更

ABVJE_Res_Default_Android/res/values-ja/strings.xml

@@ -1501,4 +1501,6 @@
     <string name="msg_eroor_network_offline">接続しているネットワークがありません。</string>
     <string name="msg_eroor_network_offline">接続しているネットワークがありません。</string>
     <string name="msg_error_connection_error_meeting_room">会議室サーバに接続できませんでした。</string>
     <string name="msg_error_connection_error_meeting_room">会議室サーバに接続できませんでした。</string>
     <string name="msg_fail_collaboration_not_action_allow">文書協業中には利用できない機能です。</string>
     <string name="msg_fail_collaboration_not_action_allow">文書協業中には利用できない機能です。</string>
+    <string name="msg_fail_collaboration_join_error">協業に参加することができませんでした。</string>
+
 </resources>
 </resources>

ABVJE_Res_Default_Android/res/values-ko/strings.xml

@@ -1506,4 +1506,5 @@
     <string name="msg_eroor_network_offline">연결된 네트워크가 없습니다.</string>
     <string name="msg_eroor_network_offline">연결된 네트워크가 없습니다.</string>
     <string name="msg_error_connection_error_meeting_room">회의실 서버에 연결할 수 없습니다.</string>
     <string name="msg_error_connection_error_meeting_room">회의실 서버에 연결할 수 없습니다.</string>
     <string name="msg_fail_collaboration_not_action_allow">문서협업 중에는 이용할 수 없는 기능입니다.</string>
     <string name="msg_fail_collaboration_not_action_allow">문서협업 중에는 이용할 수 없는 기능입니다.</string>
+    <string name="msg_fail_collaboration_join_error">협업에 참여하실수 없습니다.</string>
 </resources>
 </resources>
\ No newline at end of file

ABVJE_Res_Default_Android/res/values/strings.xml

@@ -1502,4 +1502,5 @@
     <string name="msg_eroor_network_offline">There is no network connected.</string>
     <string name="msg_eroor_network_offline">There is no network connected.</string>
     <string name="msg_error_connection_error_meeting_room">Could not connect to the meeting room server.</string>
     <string name="msg_error_connection_error_meeting_room">Could not connect to the meeting room server.</string>
     <string name="msg_fail_collaboration_not_action_allow">This function cannot be used during document collaboration.</string>
     <string name="msg_fail_collaboration_not_action_allow">This function cannot be used during document collaboration.</string>
+    <string name="msg_fail_collaboration_join_error">Could not connect to the collaboration.</string>
 </resources>
 </resources>

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java

@@ -1002,8 +1002,21 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
             if (data.startsWith("onClose:1000")) {
             if (data.startsWith("onClose:1000")) {
                 saveMeetingInfo(null, null, null, false);
                 saveMeetingInfo(null, null, null, false);
             } else if (contentViewActivity == null && data.endsWith(";" + MeetingManager.STATUS_PEND)) { // 初期接続の失敗では再接続アラートダイアログは出さない
             } else if (contentViewActivity == null && data.endsWith(";" + MeetingManager.STATUS_PEND)) { // 初期接続の失敗では再接続アラートダイアログは出さない
+                ChatWebViewActivity chatWebViewActivity = getChatWebViewActivity();
+                if (chatWebViewActivity == null) {
                     showEnterFailedAlert();
                     showEnterFailedAlert();
                 } else {
                 } else {
+                    chatWebViewActivity.finishPIPMode();
+                    handler.postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            ABookAlertDialog alertDialog = AlertDialogUtil.createAlertDialog(getCurrentActivity(), mContext.getString(R.string.error), mContext.getString(R.string.msg_fail_collaboration_join_error));
+                            alertDialog.setPositiveButton(R.string.ok, null);
+                            alertDialog.show();
+                        }
+                    }, 1000);
+                }
+            } else {
                 reflectContentView = false;
                 reflectContentView = false;
                 lastDisconnect = System.currentTimeMillis();
                 lastDisconnect = System.currentTimeMillis();
                 if ((contentViewActivity != null) && ABVActivity.isVisible()) { // Wifi以外の理由で接続が突然切れた場合
                 if ((contentViewActivity != null) && ABVActivity.isVisible()) { // Wifi以外の理由で接続が突然切れた場合