Merge branch 'communication/develop_44357' into 'communication/develop'

#44357 コミュニケーションダイアログが、ボタン2回連続タップすると消えなくなる

See merge request !216

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVAuthenticatedActivity.java

@@ -818,6 +818,10 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co
 	 * コミュニケーションメニューダイアログ
 	 */
 	public void showCommunicationMenuDialog() {
+		if (mCommunicationMenuDialog != null) {
+			// すでに作成されている場合はなにもしない
+			return;
+		}
 		mCommunicationMenuDialog = new Dialog(this);
 		mCommunicationMenuDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
 		mCommunicationMenuDialog.setCanceledOnTouchOutside(false);
@@ -846,7 +850,7 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co
 			@Override
 			public void onClick(View view) {
 				ActivityHandlingHelper.getInstance().startMeetingActivity();
-				mCommunicationMenuDialog.dismiss();
+				finishCommunicationMenuDialog();
 			}
 		});
 
@@ -855,7 +859,7 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co
 			@Override
 			public void onClick(View view) {
 				showOperationSelectDialog();
-				mCommunicationMenuDialog.dismiss();
+				finishCommunicationMenuDialog();
 			}
 		});
 
@@ -864,7 +868,7 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co
 			@Override
 			public void onClick(View view) {
 				showPushMessageListDialog();
-				mCommunicationMenuDialog.dismiss();
+				finishCommunicationMenuDialog();
 			}
 		});
 
@@ -883,7 +887,7 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co
 						targetActivityName = OperationRelatedContentActivity.class.getName();
 					}
 					ActivityHandlingHelper.getInstance().startChatWebViewActivity(new Long(0),"", ChatWebViewActivity.class.getName(), targetActivityName);
-					mCommunicationMenuDialog.dismiss();
+					finishCommunicationMenuDialog();
 				}
 			});
 		} else {
@@ -893,13 +897,23 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co
 		mCommunicationMenuDialog.findViewById(R.id.close_btn).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				mCommunicationMenuDialog.dismiss();
+				finishCommunicationMenuDialog();
 			}
 		});
 
 		mCommunicationMenuDialog.show();
 	}
 
+	/**
+	 * コミュニケーションダイアログ閉じる
+	 */
+	private void finishCommunicationMenuDialog() {
+		if (mCommunicationMenuDialog != null) {
+			mCommunicationMenuDialog.dismiss();
+			mCommunicationMenuDialog = null;
+		}
+	}
+
 	private void showOperationSelectDialog() {
 		OperationDao operationDao = AbstractDao.getDao(OperationDao.class);
 		mOperationSelectDialog = new Dialog(this);