Merge branch…

Merge branch 'communication/feature/42975_メンバー側がホスト変更依頼をした時に、メンバー側に余計なアラートが表示される' into 'communication/develop'

#42975_ホストリクエストロジック修正。

See merge request !169

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

@@ -163,6 +163,9 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
 
 
     private CommunicationLogic communicationLogic = AbstractLogic.getLogic(CommunicationLogic.class);
     private CommunicationLogic communicationLogic = AbstractLogic.getLogic(CommunicationLogic.class);
     private int mCollaborationType;
     private int mCollaborationType;
+
+    private int mHostRequestFlg = 0;
+
     @Override
     @Override
     protected void onCreate(Bundle savedInstanceState) {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
@@ -426,6 +429,13 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
                     message = getString(R.string.msg_error_already_exist_same_room);
                     message = getString(R.string.msg_error_already_exist_same_room);
                 } else if (message.equals("방장 권한을 전달 받으시겠습니까?")){
                 } else if (message.equals("방장 권한을 전달 받으시겠습니까?")){
                     message = getString(R.string.msg_confirm_send_host_change);
                     message = getString(R.string.msg_confirm_send_host_change);
+                    if (mHostRequestFlg == 1) {
+                        mChatWebView.loadUrl("javascript:penOff();");
+                        mChatWebView.loadUrl("javascript:$('#hostRequestModal').modal('hide');");
+                        mChatWebView.loadUrl("javascript:$('#userNameCardInCollaboration').modal('hide');");
+                        result.confirm();
+                        return true;
+                    }
                 } else if (message.equals("캡쳐한 사진을 공유 하시겠습니까?")) {
                 } else if (message.equals("캡쳐한 사진을 공유 하시겠습니까?")) {
                     message = getString(R.string.msg_confirm_share_image);
                     message = getString(R.string.msg_confirm_share_image);
                 }
                 }
@@ -1583,6 +1593,16 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
                 encodedVideo.delete();
                 encodedVideo.delete();
             }
             }
         }
         }
+
+        @JavascriptInterface
+        public void setHostRequestFlg(int hostRequestFlg) {
+            mHostRequestFlg = hostRequestFlg;
+        }
+
+        @JavascriptInterface
+        public int getHostRequestFlg() {
+            return mHostRequestFlg;
+        }
     }
     }
 
 
     /**
     /**