From 606d29ee155973a5d05e8b767aecc50a9b51772b Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 23 Jul 2019 15:31:23 -0500 Subject: [PATCH] Show purchase dialog when modifying subscription --- .../org/tasks/billing/PurchaseActivity.java | 21 +++++-------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/org/tasks/billing/PurchaseActivity.java b/app/src/main/java/org/tasks/billing/PurchaseActivity.java index 46df4f6db..2955fdea9 100644 --- a/app/src/main/java/org/tasks/billing/PurchaseActivity.java +++ b/app/src/main/java/org/tasks/billing/PurchaseActivity.java @@ -1,6 +1,5 @@ package org.tasks.billing; -import static org.tasks.billing.NameYourPriceDialog.newNameYourPriceDialog; import static org.tasks.billing.PurchaseDialog.newPurchaseDialog; import android.os.Bundle; @@ -12,7 +11,6 @@ import org.tasks.injection.ThemedInjectingAppCompatActivity; public class PurchaseActivity extends ThemedInjectingAppCompatActivity { private static final String FRAG_TAG_PURCHASE = "frag_tag_purchase"; - private static final String FRAG_TAG_PRICE = "frag_tag_price"; @Inject Inventory inventory; @@ -21,21 +19,12 @@ public class PurchaseActivity extends ThemedInjectingAppCompatActivity { super.onCreate(savedInstanceState); FragmentManager fragmentManager = getSupportFragmentManager(); - if (inventory.hasPro()) { - NameYourPriceDialog dialog = (NameYourPriceDialog) fragmentManager.findFragmentByTag(FRAG_TAG_PRICE); - if (dialog == null) { - dialog = newNameYourPriceDialog(); - dialog.show(fragmentManager, FRAG_TAG_PRICE); - } - dialog.setOnDismissListener(d -> finish()); - } else { - PurchaseDialog dialog = (PurchaseDialog) fragmentManager.findFragmentByTag(FRAG_TAG_PURCHASE); - if (dialog == null) { - dialog = newPurchaseDialog(); - dialog.show(fragmentManager, FRAG_TAG_PURCHASE); - } - dialog.setOnDismissListener(d -> finish()); + PurchaseDialog dialog = (PurchaseDialog) fragmentManager.findFragmentByTag(FRAG_TAG_PURCHASE); + if (dialog == null) { + dialog = newPurchaseDialog(); + dialog.show(fragmentManager, FRAG_TAG_PURCHASE); } + dialog.setOnDismissListener(d -> finish()); } @Override