プッシュメッセージのボタンタップイベント改善

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

@@ -124,24 +124,31 @@ public class ShowPushMessageDailogActivity extends ABVUIActivity {
                             isMeetingRoomConnected = MeetingManager.getInstance().isConnected();
                             isMeetingRoomConnected = MeetingManager.getInstance().isConnected();
                             isCollabration = MeetingManager.getInstance().isCollaboration();
                             isCollabration = MeetingManager.getInstance().isCollaboration();
                             Bundle extras = getIntent().getExtras();
                             Bundle extras = getIntent().getExtras();
-                            if (extras != null && !isMeetingRoomConnected) {
+                            if (isMeetingRoomConnected || isCollabration) {
+                                showCannotMoveChatRoomDialog();
+                            } else {
+                                if (extras != null) {
                                     boolean isNewVersion = extras.getBoolean(AppDefType.ChatPushMessageKey.needsDisplayOperationOrOperationRelatedContentScreen);
                                     boolean isNewVersion = extras.getBoolean(AppDefType.ChatPushMessageKey.needsDisplayOperationOrOperationRelatedContentScreen);
                                     if (isNewVersion) {
                                     if (isNewVersion) {
                                         setResult(ABookCommConstants.PUSH_MESSAGE_DLG_RESULT.OK, getIntent());
                                         setResult(ABookCommConstants.PUSH_MESSAGE_DLG_RESULT.OK, getIntent());
                                     } else {
                                     } else {
                                         moveChatRoom(extras);
                                         moveChatRoom(extras);
                                     }
                                     }
-                                finish();
                                 }
                                 }
-                            if (isMeetingRoomConnected || isCollabration) {
-                                showCannotMoveChatRoomDialog();
                             }
                             }
+                            dialog.dismiss();
                         }
                         }
                     });
                     });
                     alertDialog.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
                     alertDialog.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
                         @Override
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
                         public void onClick(DialogInterface dialog, int which) {
                             setResult(ABookCommConstants.PUSH_MESSAGE_DLG_RESULT.CANCEL, getIntent());
                             setResult(ABookCommConstants.PUSH_MESSAGE_DLG_RESULT.CANCEL, getIntent());
+                            dialog.dismiss();
+                        }
+                    });
+                    alertDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+                        @Override
+                        public void onDismiss(DialogInterface dialog) {
                             finish();
                             finish();
                         }
                         }
                     });
                     });