From 9a5e500d334f9828ad8e0023ff36a0bcada23a12 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Wed, 29 Aug 2012 16:12:33 -0700
Subject: [PATCH] Fixed bugs with logout button

---
 .../com/todoroo/astrid/actfm/ActFmPreferences.java        | 3 +--
 .../todoroo/astrid/actfm/sync/ActFmPreferenceService.java | 6 ++++++
 .../todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java    | 1 +
 astrid/res/xml/preferences_actfm.xml                      | 8 ++++----
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmPreferences.java b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmPreferences.java
index 4ee1c59e0..cc258ed7e 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmPreferences.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmPreferences.java
@@ -163,8 +163,7 @@ public class ActFmPreferences extends SyncProviderPreferences {
                 }
             });
             if(!loggedIn) {
-                PreferenceCategory category = (PreferenceCategory) findPreference(r.getString(R.string.sync_SPr_group_status));
-                category.removePreference(preference);
+                getPreferenceScreen().removePreference(preference);
             }
 
         } else {
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java
index daef2187c..1a8d32564 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java
@@ -164,6 +164,12 @@ public class ActFmPreferenceService extends SyncProviderUtilities {
         return Preferences.getBoolean(PREF_PREMIUM, false);
     }
 
+    public static void premiumLogout() {
+        Preferences.setBoolean(BillingConstants.PREF_NEEDS_SERVER_UPDATE, false);
+        Preferences.setBoolean(PREF_LOCAL_PREMIUM, false);
+        Preferences.setBoolean(PREF_PREMIUM, false);
+    }
+
     @Override
     public String getLoggedInUserName() {
         return Preferences.getStringValue(PREF_NAME);
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
index 2a2fce453..92c970a16 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
@@ -126,6 +126,7 @@ public class ActFmSyncV2Provider extends SyncV2Provider {
     public void signOut() {
         actFmPreferenceService.setToken(null);
         actFmPreferenceService.clearLastSyncDate();
+        ActFmPreferenceService.premiumLogout();
         C2DMReceiver.unregister();
     }
 
diff --git a/astrid/res/xml/preferences_actfm.xml b/astrid/res/xml/preferences_actfm.xml
index 926ebc7d7..5e71c9ac1 100644
--- a/astrid/res/xml/preferences_actfm.xml
+++ b/astrid/res/xml/preferences_actfm.xml
@@ -49,11 +49,11 @@
             android:textSize="24sp"
             android:gravity="center"/>
         
-        <com.todoroo.astrid.ui.MultilinePreference
-            android:key="@string/sync_SPr_forget_key"
-            android:title="@string/sync_SPr_forget"
-            android:summary="@string/sync_SPr_forget_description" />
             
     </PreferenceCategory>
+    <com.todoroo.astrid.ui.MultilinePreference
+        android:key="@string/sync_SPr_forget_key"
+        android:title="@string/sync_SPr_forget"
+        android:summary="@string/sync_SPr_forget_description" />
             
 </PreferenceScreen>  
\ No newline at end of file