Merge branch 'communication/develop' of…

Merge branch 'communication/develop' of https://gitlab.agentec.jp/abook_android/abook_check into communication/feature/43045

# Conflicts:
#	ABVJE_Res_Default_Android/res/values-ja/strings.xml
#	ABVJE_Res_Default_Android/res/values-ko/strings.xml
#	ABVJE_Res_Default_Android/res/values/strings.xml

ABVJE_Res_Default_Android/res/values-ja/strings.xml

@@ -1483,6 +1483,8 @@
     <string name="msg_confirm_share_image">キャプチャーした写真を共有しますか？</string>
     <string name="msg_confirm_share_image">キャプチャーした写真を共有しますか？</string>
     <string name="msg_invite_collaboration">協業に招待されました。</string>
     <string name="msg_invite_collaboration">協業に招待されました。</string>
     <string name="msg_wait_for_host">ホストが文書を選択中です</string>
     <string name="msg_wait_for_host">ホストが文書を選択中です</string>
+    <string name="msg_rejected_by_host">ホストの変更依頼は拒否されました。</string>
+
     <!-- 連続作業 -->
     <!-- 連続作業 -->
     <string name="msg_error_all_process_delete">全削除の送信に失敗しました。</string>
     <string name="msg_error_all_process_delete">全削除の送信に失敗しました。</string>
     <string name="msg_ozd_file_could_not_opened">帳票ファイルを開くことができませんでした。</string>
     <string name="msg_ozd_file_could_not_opened">帳票ファイルを開くことができませんでした。</string>

ABVJE_Res_Default_Android/res/values-ko/strings.xml

@@ -1491,4 +1491,5 @@
     <string name="msg_confirm_share_image">캡쳐한 사진을 공유 하시겠습니까?</string>
     <string name="msg_confirm_share_image">캡쳐한 사진을 공유 하시겠습니까?</string>
     <string name="msg_invite_collaboration">협업에 초대되셨습니다.</string>
     <string name="msg_invite_collaboration">협업에 초대되셨습니다.</string>
     <string name="msg_wait_for_host">호스트가 문서를 선택중입니다.</string>
     <string name="msg_wait_for_host">호스트가 문서를 선택중입니다.</string>
+    <string name="msg_rejected_by_host">호스트가 요청을 거절하셨습니다.</string>
 </resources>
 </resources>
\ No newline at end of file

ABVJE_Res_Default_Android/res/values/strings.xml

@@ -1487,5 +1487,6 @@
     <string name="msg_confirm_send_host_change">Do you want to receive host permissions?</string>
     <string name="msg_confirm_send_host_change">Do you want to receive host permissions?</string>
     <string name="msg_confirm_share_image">Do you want to share captured image?</string>
     <string name="msg_confirm_share_image">Do you want to share captured image?</string>
     <string name="msg_invite_collaboration">You are invited to collaboration.</string>
     <string name="msg_invite_collaboration">You are invited to collaboration.</string>
-    <string name="msg_wait_for_host">Wait for host select</string>
+    <string name="msg_wait_for_host">Please wait for selecting document by host</string>
+    <string name="msg_rejected_by_host">Rejected host request.</string>
 </resources>
 </resources>

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebViewActivity.java

@@ -383,6 +383,11 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
                     mChatWebView.loadUrl("javascript:$('#userNameCardInCollaboration').modal('hide');");
                     mChatWebView.loadUrl("javascript:$('#userNameCardInCollaboration').modal('hide');");
                     result.confirm();
                     result.confirm();
                     return true;
                     return true;
+                } else if (message.contains("REJECT for owner user")) {
+                    mChatWebView.loadUrl("javascript:$('#userNameCardInCollaboration').modal('hide');");
+                    mChatWebView.loadUrl("javascript:$('#hostRequestModal').modal('hide');");
+                    mChatWebView.loadUrl("javascript:$('#userNameCardInCollaboration').modal('hide');");
+                    message = getString(R.string.msg_rejected_by_host);
                 }
                 }
 
 
                 final String tempMessage = message;
                 final String tempMessage = message;

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationRelatedContentActivity.java

@@ -508,11 +508,7 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
                     }
                     }
                 }
                 }
                 if (isCollaboration) {
                 if (isCollaboration) {
-                    if (isCollaborationOwner) {
-                        mAllSaveButton.setVisibility(visible);
-                    } else {
-                        mAllSaveButton.setVisibility(View.GONE);
-                    }
+                    mAllSaveButton.setVisibility(isCollaborationOwner ? visible : View.GONE);
                 } else {
                 } else {
                     mAllSaveButton.setVisibility(visible);
                     mAllSaveButton.setVisibility(visible);
                 }
                 }