全協業終了対応

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

@@ -352,11 +352,13 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
             // WebView内のAlert Dialogを処理する
             @Override
             public boolean onJsAlert(WebView view, String url, String message, final JsResult result) {
+                if (mChatWebView.getUrl() != null && mChatWebView.getUrl().equals(COLLABORATION_PAGE_URL)) {
+                    mChatWebView.loadUrl("javascript:coview_api.HeartBeatUser(globalUserInfo.loginId);");
+                }
                 if (myAlertDialog != null && myAlertDialog.isShowing()) {
                     result.confirm();
                     return true;
                 }
-
                 if (message.equals("server error Ocurred")) {
                     message = getString(R.string.msg_error_chat_server);
                 } else if (message.equals("Disconnected from the server")) {

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

@@ -310,7 +310,7 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
             public void run() {
                 final ABookAlertDialog nonTargetMeetingContentDialog = AlertDialogUtil.createAlertDialog(OperationRelatedContentActivity.this, R.string.app_name);
                 nonTargetMeetingContentDialog.setCancelable(false);
-                nonTargetMeetingContentDialog.setMessage(isCollaboration? R.string.msg_non_target_meeting_content : R.string.msg_non_target_meeting_content);
+                nonTargetMeetingContentDialog.setMessage(isCollaboration? R.string.msg_non_target_collaboration_content : R.string.msg_non_target_meeting_content);
                 nonTargetMeetingContentDialog.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int whichButton) {

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/view/FullscreenableChromeClient.java

@@ -80,7 +80,7 @@ public class FullscreenableChromeClient extends WebChromeClient {
         } else {
             winParams.flags &= ~bits;
             if (mCustomView != null) {
-                mCustomView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
+                mCustomView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
             }
         }
         win.setAttributes(winParams);