From 9ace9de527e66bcee69237a048da9a29a079762f Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Fri, 13 Jul 2012 14:14:03 -0700
Subject: [PATCH] Don't prompt for login at billing screen

---
 astrid/res/values/strings-premium.xml              |  2 ++
 .../todoroo/astrid/billing/BillingActivity.java    | 14 +++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/astrid/res/values/strings-premium.xml b/astrid/res/values/strings-premium.xml
index eef2c8b2a..932f500cf 100644
--- a/astrid/res/values/strings-premium.xml
+++ b/astrid/res/values/strings-premium.xml
@@ -74,4 +74,6 @@
     <string name="premium_description_4">Save voice notes at audio files</string>
     <string name="premium_description_5">Preview upcoming features</string>
     <string name="premium_description_6">Support the Astrid Team!</string>
+    <string name="premium_already_subscribed">You are already subscribed to Astrid Premium!</string>
+    <string name="premium_login_prompt">You need to have an Astrid.com account in order to subscribe to premium. Please log in or sign up.</string>
 </resources>
diff --git a/astrid/src/com/todoroo/astrid/billing/BillingActivity.java b/astrid/src/com/todoroo/astrid/billing/BillingActivity.java
index a28dbef50..2e850bdf5 100644
--- a/astrid/src/com/todoroo/astrid/billing/BillingActivity.java
+++ b/astrid/src/com/todoroo/astrid/billing/BillingActivity.java
@@ -19,6 +19,7 @@ import android.widget.Toast;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
+import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.billing.BillingConstants.PurchaseState;
@@ -59,12 +60,15 @@ public class BillingActivity extends Activity {
 
         ResponseHandler.register(purchaseObserver);
 
-        if (!actFmPreferenceService.isLoggedIn()) {
-            // Handle
-        } else if (ActFmPreferenceService.isPremiumUser()) {
-            // Handle
-        } else if (!billingService.checkBillingSupported(BillingConstants.ITEM_TYPE_SUBSCRIPTION)) {
+        if (!billingService.checkBillingSupported(BillingConstants.ITEM_TYPE_SUBSCRIPTION)) {
             showDialog(DIALOG_SUBSCRIPTIONS_NOT_SUPPORTED_ID);
+        } else if (ActFmPreferenceService.isPremiumUser()) {
+            DialogUtilities.okDialog(this, getString(R.string.premium_already_subscribed), new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    finish();
+                }
+            });
         }
     }