Show purchase dialog when modifying subscription

pull/848/head
Alex Baker 6 years ago
parent a52ceda64d
commit 606d29ee15

@ -1,6 +1,5 @@
package org.tasks.billing; package org.tasks.billing;
import static org.tasks.billing.NameYourPriceDialog.newNameYourPriceDialog;
import static org.tasks.billing.PurchaseDialog.newPurchaseDialog; import static org.tasks.billing.PurchaseDialog.newPurchaseDialog;
import android.os.Bundle; import android.os.Bundle;
@ -12,7 +11,6 @@ import org.tasks.injection.ThemedInjectingAppCompatActivity;
public class PurchaseActivity extends ThemedInjectingAppCompatActivity { public class PurchaseActivity extends ThemedInjectingAppCompatActivity {
private static final String FRAG_TAG_PURCHASE = "frag_tag_purchase"; private static final String FRAG_TAG_PURCHASE = "frag_tag_purchase";
private static final String FRAG_TAG_PRICE = "frag_tag_price";
@Inject Inventory inventory; @Inject Inventory inventory;
@ -21,21 +19,12 @@ public class PurchaseActivity extends ThemedInjectingAppCompatActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
FragmentManager fragmentManager = getSupportFragmentManager(); FragmentManager fragmentManager = getSupportFragmentManager();
if (inventory.hasPro()) { PurchaseDialog dialog = (PurchaseDialog) fragmentManager.findFragmentByTag(FRAG_TAG_PURCHASE);
NameYourPriceDialog dialog = (NameYourPriceDialog) fragmentManager.findFragmentByTag(FRAG_TAG_PRICE); if (dialog == null) {
if (dialog == null) { dialog = newPurchaseDialog();
dialog = newNameYourPriceDialog(); dialog.show(fragmentManager, FRAG_TAG_PURCHASE);
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());
} }
dialog.setOnDismissListener(d -> finish());
} }
@Override @Override

Loading…
Cancel
Save