Merge branch 'communication/feature/プッシュメッセージのボタン表示が異なる問題対応' into 'communication/develop'

チャットのプッシュメッセージではない場合も遷移、キャンセルボタンが表示される問題対応

See merge request !163

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

@@ -113,6 +113,9 @@ public class ShowPushMessageDailogActivity extends ABVUIActivity {
                 alertDialog.show();
             } else {
                 final ABookAlertDialog alertDialog = AlertDialogUtil.createAlertDialog(ShowPushMessageDailogActivity.this, getRString(R.string.app_name), getIntent().getExtras().getString(PushMessageKey.message));
+                Bundle extras = getIntent().getExtras();
+                Long roomId = extras.getLong(AppDefType.ChatPushMessageKey.roomId, 0);
+                if (roomId != 0) {
                     alertDialog.setPositiveButton(R.string.move, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
@@ -156,10 +159,13 @@ public class ShowPushMessageDailogActivity extends ABVUIActivity {
                             finish();
                         }
                     });
+                } else {
+                    alertDialog.setPositiveButton(R.string.ok, null);
+                }
                 alertDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
                     @Override
                     public void onDismiss(DialogInterface dialog) {
-
+                        finish();
                     }
                 });
                 alertDialog.show();