Commit 551c127d by Kim Jinsung

ソースコードレビュー指摘反映

parent 135ecff8
......@@ -2643,7 +2643,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
//文書協業接続時、機能制限する(動作再生、音声再生)
if (actionInfoJSON.getActionType() == ActionInfoJSON.VIDEO_ACTION ||
actionInfoJSON.getActionType() == ActionInfoJSON.MUSIC_ACTION) {
if (checkConnectedCollaboration()) {
if (isConnectedCollaboration()) {
return;
}
}
......@@ -3190,7 +3190,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
@Override
public void onClick(View view) {
//文書協業接続中には差し替え動作機能制限
if (checkConnectedCollaboration()) {
if (isConnectedCollaboration()) {
return;
}
if (meetingManager.isSendable()) {
......@@ -3308,7 +3308,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
private void videoOnClick(PageObjectJSON pageObject, int pageidx) {
//文書協業接続中には全画面動画制御
if (checkConnectedCollaboration()) {
if (isConnectedCollaboration()) {
return;
}
if (mPageScrollView.isZooming() == false) {
......@@ -3503,7 +3503,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
@Override
public void onClick(View view) {
//文書協業接続時には音声アクション制限
if (checkConnectedCollaboration()) {
if (isConnectedCollaboration()) {
return;
}
if (meetingManager.isSendable()) {
......@@ -3533,7 +3533,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
@Override
public void onClick(View view) {
//文書協業接続時には音声アクション制限
if (checkConnectedCollaboration()) {
if (isConnectedCollaboration()) {
return;
}
if (meetingManager.isSendable()) {
......@@ -5584,7 +5584,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
* 文書協業接続中の値を返して、接続中にはエラーダイアログ表示
* @return YES:接続中、NO:非接続
* */
public boolean checkConnectedCollaboration() {
public boolean isConnectedCollaboration() {
if (isCollaboration) {
showSimpleAlertDialog(R.string.msg_fail_collaboration_not_action_allow);
}
......
......@@ -346,7 +346,7 @@ public class VideoMountAction {
private void videoOnClick(RelativeLayout contentPageView) {
//文書協業接続中、埋め込み動画制限
if (mActivity.checkConnectedCollaboration()) {
if (mActivity.isConnectedCollaboration()) {
return;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment