diff --git a/app/build.gradle b/app/build.gradle index 8f6bae4..b5e76a1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,7 +13,7 @@ bugsnag { } def versionMajor = 3 -def versionMinor = 0 +def versionMinor = 1 def versionTag = "" android { diff --git a/app/src/main/java/eu/thedarken/rootvalidator/IAPHelper.java b/app/src/main/java/eu/thedarken/rootvalidator/IAPHelper.java index 91e0de2..a1a23f7 100644 --- a/app/src/main/java/eu/thedarken/rootvalidator/IAPHelper.java +++ b/app/src/main/java/eu/thedarken/rootvalidator/IAPHelper.java @@ -25,7 +25,7 @@ @AppComponent.Scope public class IAPHelper implements PurchasesUpdatedListener, BillingClientStateListener { static final String SKU_UPGRADE_DONATE = "upgrade.donate"; - private final BehaviorSubject> upgradesPublisher = BehaviorSubject.createDefault(new ArrayList<>()); + private final BehaviorSubject> upgradesPublisher = BehaviorSubject.create(); private final BillingClient billingClient; public static class Upgrade { diff --git a/app/src/main/java/eu/thedarken/rootvalidator/main/ui/validator/ValidatorFragment.java b/app/src/main/java/eu/thedarken/rootvalidator/main/ui/validator/ValidatorFragment.java index 7422b22..be5d681 100644 --- a/app/src/main/java/eu/thedarken/rootvalidator/main/ui/validator/ValidatorFragment.java +++ b/app/src/main/java/eu/thedarken/rootvalidator/main/ui/validator/ValidatorFragment.java @@ -213,9 +213,9 @@ public void showWorking() { @Override public void showNagBar(boolean show) { - if (getView() == null) return; if (show) { - Snackbar.make(getView(), R.string.donate_description, Snackbar.LENGTH_INDEFINITE) + if (getView() == null) return; + upgradeBar = Snackbar.make(getView(), R.string.donate_description, Snackbar.LENGTH_INDEFINITE) .setAction(R.string.action_donate, v -> presenter.onDonateClicked(getActivity())) .addCallback(new Snackbar.Callback() { @Override @@ -229,8 +229,8 @@ public void onDismissed(Snackbar transientBottomBar, int event) { upgradeBar = null; super.onDismissed(transientBottomBar, event); } - }) - .show(); + }); + upgradeBar.show(); } else { if (upgradeBar != null) upgradeBar.dismiss(); } @@ -238,8 +238,8 @@ public void onDismissed(Snackbar transientBottomBar, int event) { @Override public void showDonate(boolean showDonate) { - if (getActivity() == null) return; this.showDonate = showDonate; + if (getActivity() == null) return; getActivity().invalidateOptionsMenu(); } }