文書協業ではコンテンツリンクが開けないように修正。

ABVJE_Res_Default_Android/res/values-ja/strings.xml

@@ -495,6 +495,7 @@
     <string name="content_link_update">資料名「%1$s」は更新状態となります。\n更新しますか？</string>
     <string name="content_link_update">資料名「%1$s」は更新状態となります。\n更新しますか？</string>
     <string name="msg_non_target_meeting_content">遠隔支援中には対象外の資料なので、開けません。</string>
     <string name="msg_non_target_meeting_content">遠隔支援中には対象外の資料なので、開けません。</string>
     <string name="msg_non_target_collaboration_content">協業中は閲覧できない資料です。</string>
     <string name="msg_non_target_collaboration_content">協業中は閲覧できない資料です。</string>
+    <string name="msg_non_target_document_collaboration_content">文書協業では利用できない機能です。</string>
     <string name="msg_help_operation_list_list_view">リスト表示に変更できます。</string>
     <string name="msg_help_operation_list_list_view">リスト表示に変更できます。</string>
     <string name="msg_help_operation_list_panel_view">パネル表示に変更できます。</string>
     <string name="msg_help_operation_list_panel_view">パネル表示に変更できます。</string>
     <string name="msg_help_operation_list_filter">表示する作業の種類を選択できます。</string>
     <string name="msg_help_operation_list_filter">表示する作業の種類を選択できます。</string>

ABVJE_Res_Default_Android/res/values-ko/strings.xml

@@ -498,6 +498,7 @@
     <string name="content_link_update">자료명[%1$s]는 업데이트 가능한 상태입니다.\n업데이트 하시겠습니까?</string>
     <string name="content_link_update">자료명[%1$s]는 업데이트 가능한 상태입니다.\n업데이트 하시겠습니까?</string>
     <string name="msg_non_target_meeting_content">원격 지원 접속 중에는 열람할 수 없는 자료입니다.</string>
     <string name="msg_non_target_meeting_content">원격 지원 접속 중에는 열람할 수 없는 자료입니다.</string>
     <string name="msg_non_target_collaboration_content">협업중에는 열람할 수 없는 자료입니다.</string>
     <string name="msg_non_target_collaboration_content">협업중에는 열람할 수 없는 자료입니다.</string>
+    <string name="msg_non_target_document_collaboration_content">문서협업중에는 이용하실수 없는 기능입니다.</string>
     <string name="msg_help_operation_list_list_view">리스트 표시로 변경 가능합니다.</string>
     <string name="msg_help_operation_list_list_view">리스트 표시로 변경 가능합니다.</string>
     <string name="msg_help_operation_list_panel_view">패널 표시로 변경 가능합니다.</string>
     <string name="msg_help_operation_list_panel_view">패널 표시로 변경 가능합니다.</string>
     <string name="msg_help_operation_list_filter">표시할 작업의 종류를 선택 가능합니다.</string>
     <string name="msg_help_operation_list_filter">표시할 작업의 종류를 선택 가능합니다.</string>

ABVJE_Res_Default_Android/res/values/strings.xml

@@ -502,6 +502,7 @@
     <string name="content_link_update">The document name [%1$s] will be updated. \nDo you want to update it?</string>
     <string name="content_link_update">The document name [%1$s] will be updated. \nDo you want to update it?</string>
     <string name="msg_non_target_meeting_content">It is the document that can not be read during distance support connection.</string>
     <string name="msg_non_target_meeting_content">It is the document that can not be read during distance support connection.</string>
     <string name="msg_non_target_collaboration_content">It is the document that can not be read during collaboration.</string>
     <string name="msg_non_target_collaboration_content">It is the document that can not be read during collaboration.</string>
+    <string name="msg_non_target_document_collaboration_content">This is a function that cannot be used in document collaboration.</string>
     <string name="msg_help_operation_list_list_view">You can change to list display.</string>
     <string name="msg_help_operation_list_list_view">You can change to list display.</string>
     <string name="msg_help_operation_list_panel_view">You can change to panel display.</string>
     <string name="msg_help_operation_list_panel_view">You can change to panel display.</string>
     <string name="msg_help_operation_list_filter">You can select the type of work to be displayed.</string>
     <string name="msg_help_operation_list_filter">You can select the type of work to be displayed.</string>

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ContentViewActivity.java

@@ -138,6 +138,7 @@ import jp.agentec.abook.abv.ui.common.view.ABVEditText;
 import jp.agentec.abook.abv.ui.common.view.ABVPopupListWindow;
 import jp.agentec.abook.abv.ui.common.view.ABVPopupListWindow;
 import jp.agentec.abook.abv.ui.common.vo.Size;
 import jp.agentec.abook.abv.ui.common.vo.Size;
 import jp.agentec.abook.abv.ui.home.activity.ChatWebViewActivity;
 import jp.agentec.abook.abv.ui.home.activity.ChatWebViewActivity;
+import jp.agentec.abook.abv.ui.home.activity.OperationRelatedContentActivity;
 import jp.agentec.abook.abv.ui.home.helper.ABookCheckWebViewHelper;
 import jp.agentec.abook.abv.ui.home.helper.ABookCheckWebViewHelper;
 import jp.agentec.abook.abv.ui.home.helper.ActivityHandlingHelper;
 import jp.agentec.abook.abv.ui.home.helper.ActivityHandlingHelper;
 import jp.agentec.abook.abv.ui.Interface.MovePageInterface;
 import jp.agentec.abook.abv.ui.Interface.MovePageInterface;
@@ -2683,8 +2684,20 @@ public class ContentViewActivity extends ABVContentViewActivity {
 			break;
 			break;
 		case ActionInfoJSON.CONTENTLINK_ACTION:
 		case ActionInfoJSON.CONTENTLINK_ACTION:
 			//コンテンツリンクに紐づいたAction Buttonのイベント
 			//コンテンツリンクに紐づいたAction Buttonのイベント
+			if (meetingManager.isCollaboration()) {
+				final ABookAlertDialog nonTargetMeetingContentDialog = AlertDialogUtil.createAlertDialog(ContentViewActivity.this, R.string.app_name);
+				nonTargetMeetingContentDialog.setCancelable(false);
+				nonTargetMeetingContentDialog.setMessage(isCollaboration? R.string.msg_non_target_document_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) {
+						nonTargetMeetingContentDialog.dismiss();
+					}
+				});
+				nonTargetMeetingContentDialog.show();
+				break;
+			}
 			long linkContentId = actionInfoJSON.getContentId();
 			long linkContentId = actionInfoJSON.getContentId();
-
 			//　プロジェクト関連資料なのかをチェック
 			//　プロジェクト関連資料なのかをチェック
 			if (ActivityHandlingHelper.getInstance().isExistCommonContent(getContentId())) {
 			if (ActivityHandlingHelper.getInstance().isExistCommonContent(getContentId())) {
 				if (!ActivityHandlingHelper.getInstance().isExistCommonContent(linkContentId)) {
 				if (!ActivityHandlingHelper.getInstance().isExistCommonContent(linkContentId)) {