Merge branch 'features/1.4.202_45376' into 'features/1.4.202'

#45376 【exFrame Android 1.4.2】プッシュ通知後に、フリーズする

See merge request !249

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

@@ -116,7 +116,13 @@ public class ShowPushMessageDailogActivity extends ABVUIActivity {
                 Bundle extras = getIntent().getExtras();
                 Bundle extras = getIntent().getExtras();
                 Long roomId = extras.getLong(AppDefType.ChatPushMessageKey.roomId, 0);
                 Long roomId = extras.getLong(AppDefType.ChatPushMessageKey.roomId, 0);
                 if (roomId == 0) {
                 if (roomId == 0) {
-                    alertDialog.setPositiveButton(R.string.ok, null);
+                    alertDialog.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            setResult(ABookCommConstants.PUSH_MESSAGE_DLG_RESULT.CANCEL, getIntent());
+                            dialog.dismiss();
+                        }
+                    });
                 } else {
                 } else {
                     alertDialog.setPositiveButton(R.string.move, new DialogInterface.OnClickListener() {
                     alertDialog.setPositiveButton(R.string.move, new DialogInterface.OnClickListener() {
                         @Override
                         @Override
@@ -146,13 +152,13 @@ public class ShowPushMessageDailogActivity extends ABVUIActivity {
                             dialog.dismiss();
                             dialog.dismiss();
                         }
                         }
                     });
                     });
-                    alertDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
-                        @Override
-                        public void onDismiss(DialogInterface dialog) {
-                            finish();
-                        }
-                    });
                 }
                 }
+                alertDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+                    @Override
+                    public void onDismiss(DialogInterface dialog) {
+                        finish();
+                    }
+                });
                 alertDialog.show();
                 alertDialog.show();
             }
             }
         }
         }