summaryrefslogtreecommitdiff
path: root/app/src/main/java
diff options
context:
space:
mode:
authorH. Lehmann <ByteHamster@users.noreply.github.com>2020-04-09 12:35:18 +0200
committerGitHub <noreply@github.com>2020-04-09 12:35:18 +0200
commitfc92802dfe856e4a4881fcd331ac2544851705aa (patch)
tree565df9f30af78c8a1a6c21dfcf2c7f980fe6398a /app/src/main/java
parentb8470cc2ce0c3b10bec27fb812cb244722c51c73 (diff)
parent9f91a2ab86d589c1ddead132c245a5e5a751b95f (diff)
downloadAntennaPod-fc92802dfe856e4a4881fcd331ac2544851705aa.zip
Merge pull request #4024 from ByteHamster/onlinefeedview-error-cancel
Fixed error dialog not closing activity sometimes
Diffstat (limited to 'app/src/main/java')
-rw-r--r--app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
index 821defd86..fd4e31074 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
@@ -535,14 +535,14 @@ public class OnlineFeedViewActivity extends AppCompatActivity {
} else {
builder.setMessage(R.string.error_msg_prefix);
}
- builder.setNeutralButton(android.R.string.ok,
+ builder.setPositiveButton(android.R.string.ok,
(dialog, which) -> dialog.cancel()
);
- builder.setOnCancelListener(dialog -> {
+ builder.setOnDismissListener(dialog -> {
setResult(RESULT_ERROR);
finish();
});
- if(dialog != null && dialog.isShowing()) {
+ if (dialog != null && dialog.isShowing()) {
dialog.dismiss();
}
dialog = builder.show();