diff options
| -rw-r--r-- | src-ambient/incall/CallMethodInfo.java | 12 | ||||
| -rw-r--r-- | src-ambient/incall/CreditBarHelper.java | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src-ambient/incall/CallMethodInfo.java b/src-ambient/incall/CallMethodInfo.java index 29352c6..4fa62a3 100644 --- a/src-ambient/incall/CallMethodInfo.java +++ b/src-ambient/incall/CallMethodInfo.java @@ -322,9 +322,17 @@ public class CallMethodInfo { } } - public boolean usesSubscriptions() { + public boolean showSubscriptions() { + // If the user has > 0 credits, we don't want to show the subscription. List<SubscriptionInfo> subscriptionInfos = this.mProviderCreditInfo.subscriptions; - return subscriptionInfos != null && !subscriptionInfos.isEmpty(); + CreditBalance creditBalance = this.mProviderCreditInfo.balance; + + boolean hasSubscriptions = subscriptionInfos != null && !subscriptionInfos.isEmpty(); + + boolean hasCredits = creditBalance != null && creditBalance.currencyCode != null + && creditBalance.balance > 0; + + return !hasCredits && hasSubscriptions; } public int getCurrencyAmount() { diff --git a/src-ambient/incall/CreditBarHelper.java b/src-ambient/incall/CreditBarHelper.java index 62116c1..2a55eb6 100644 --- a/src-ambient/incall/CreditBarHelper.java +++ b/src-ambient/incall/CreditBarHelper.java @@ -74,7 +74,7 @@ public class CreditBarHelper { } else { if (cmi.mIsAuthenticated) { button = cmi.mManageCreditIntent; - if (cmi.usesSubscriptions()) { + if (cmi.showSubscriptions()) { buttonText = cmi.mSubscriptionButtonText; } else { if (cmi.getCurrencyAmount() <= cmi.mCreditWarn) { |