From 553153391872df5c4f3b7357be9c4611321103be Mon Sep 17 00:00:00 2001
From: Richard MacGregor <rmacgregor@cyngn.com>
Date: Tue, 9 Feb 2016 18:00:34 -0800
Subject: Fix Subscription button text

Subscriptions use wrong button text

Ticket CD-338

Change-Id: I2d3f9c0534a34a0d1654a009ccd1d4a0f9fd082f
---
 src-ambient/incall/CallMethodInfo.java | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src-ambient/incall/CallMethodInfo.java b/src-ambient/incall/CallMethodInfo.java
index 63f24a8..b68e74d 100644
--- a/src-ambient/incall/CallMethodInfo.java
+++ b/src-ambient/incall/CallMethodInfo.java
@@ -72,6 +72,8 @@ public class CallMethodInfo {
     public float mCreditWarn = 0.0f;
     public PendingIntent mLoginIntent;
 
+    private int mCurrencyAmount;
+
     private static CallMethodInfo sEmergencyCallMethod;
 
     @Override
@@ -166,10 +168,6 @@ public class CallMethodInfo {
         }
     }
 
-    private boolean isSubscription;
-    private boolean isCredits;
-    private int mCurrencyAmmount;
-
     public String getCreditsDescriptionText(Resources r) {
         String ret = null;
         CreditInfo ci =  this.mProviderCreditInfo;
@@ -182,11 +180,11 @@ public class CallMethodInfo {
         } else {
             CreditBalance balance = ci.balance;
             if (balance != null) {
-                mCurrencyAmmount = (int) balance.balance;
+                mCurrencyAmount = (int) balance.balance;
                 try {
                     if (balance.currencyCode != null) {
                         Currency currencyCode = Currency.getInstance(balance.currencyCode);
-                        BigDecimal availableCredit = BigDecimal.valueOf(mCurrencyAmmount,
+                        BigDecimal availableCredit = BigDecimal.valueOf(mCurrencyAmount,
                                 currencyCode.getDefaultFractionDigits());
 
 
@@ -212,14 +210,11 @@ public class CallMethodInfo {
     }
 
     public boolean usesSubscriptions() {
-        return isSubscription;
-    }
-
-    public boolean usesCurrency() {
-        return isCredits;
+        List<SubscriptionInfo> subscriptionInfos = this.mProviderCreditInfo.subscriptions;
+        return subscriptionInfos != null && !subscriptionInfos.isEmpty();
     }
 
     public int getCurrencyAmount() {
-        return mCurrencyAmmount;
+        return mCurrencyAmount;
     }
 }
-- 
cgit v1.2.3