会議室の司会者でWebView表示時、履歴ボタン非表示

WebViewで昇格申請しても、司会者でOKボタンタップ時、エラー修正

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

@@ -1278,7 +1278,7 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
             public void onClick(DialogInterface dialog, int whichButton) { // 許可する場合
                 try {
                     // 承認する前にマーキングモード終了メッセージを送信
-                    if (((ContentViewActivity)contentViewActivity).isMarkingStatus()) {
+                    if (contentViewActivity instanceof ContentViewActivity && ((ContentViewActivity)contentViewActivity).isMarkingStatus()) {
                         JSONObject jsonMarkingInvisible = new JSONObject();
                         jsonMarkingInvisible.put(MeetingManager.MARKING_ACTION, MeetingManager.MARKING_ACTION_END);
                         meetingManager.sendWs(MeetingManager.CMD_MARKING, contentViewActivity.getContentId(), contentViewActivity.getCurrentPageNumber(), null, jsonMarkingInvisible);

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

@@ -607,12 +607,8 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
             }
         } else {
             closeButton.setVisibility(View.VISIBLE);
-            if (objectId == -1) {
-                historyListBtn.setVisibility(View.VISIBLE);
-            } else {
-                historyListBtn.setVisibility(View.GONE);
-                subMenuBtn.setVisibility(View.GONE);
-            }
+            historyListBtn.setVisibility(View.GONE);
+            subMenuBtn.setVisibility(View.GONE);
             mBtnRemoteStart.setVisibility(View.GONE);
             if (meetingManager.isSendable()) { // 会議室退室ボタン表示
                 exitMeetingBtn.setVisibility(View.VISIBLE);

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

@@ -649,12 +649,9 @@ public class HTMLXWalkWebViewActivity extends ParentWebViewActivity {
             }
         } else {
             closeButton.setVisibility(View.VISIBLE);
-            if (objectId == -1) {
-                historyListBtn.setVisibility(View.VISIBLE);
-            } else {
-                historyListBtn.setVisibility(View.GONE);
-                subMenuBtn.setVisibility(View.GONE);
-            }
+            historyListBtn.setVisibility(View.GONE);
+            subMenuBtn.setVisibility(View.GONE);
+
             mBtnRemoteStart.setVisibility(View.GONE);
             if (meetingManager.isSendable()) { // 会議室退室ボタン表示
                 exitMeetingBtn.setVisibility(View.VISIBLE);