Remove isPremiumUser, wasLoggedIn

astrid/src/main/java/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java

@@ -5,18 +5,17 @@
  */
 package com.todoroo.astrid.actfm.sync;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.text.TextUtils;
 
-import org.tasks.R;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.dao.RemoteModelDao;
-import com.todoroo.astrid.data.RemoteModel;
 import com.todoroo.astrid.sync.SyncProviderUtilities;
 import com.todoroo.astrid.utility.AstridPreferences;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.tasks.R;
+
 /**
  * Methods for working with GTasks preferences
  *
@@ -46,10 +45,7 @@ public class ActFmPreferenceService extends SyncProviderUtilities {
 
     @Override
     public boolean shouldShowToast() {
-        if(Preferences.getBoolean(AstridPreferences.P_FIRST_TASK, true)) {
+        return !Preferences.getBoolean(AstridPreferences.P_FIRST_TASK, true) && super.shouldShowToast();
-            return false;
-        }
-        return super.shouldShowToast();
     }
 
     // --- user management
@@ -64,13 +60,6 @@ public class ActFmPreferenceService extends SyncProviderUtilities {
         }
     }
 
-    /**
-     * @return true if the user is now or has ever been logged in
-     */
-    public boolean wasLoggedIn() {
-        return RemoteModel.isValidUuid(userId());
-    }
-
     /**
      * @return get user id
      */
@@ -98,12 +87,6 @@ public class ActFmPreferenceService extends SyncProviderUtilities {
     /** Act.fm current user last name */
     public static final String PREF_LAST_NAME = IDENTIFIER + "_last_name"; //$NON-NLS-1$
 
-    /** Act.fm current user premium status */
-    public static final String PREF_PREMIUM = IDENTIFIER + "_premium"; //$NON-NLS-1$
-
-    /** Local knowledge of current premium status */
-    public static final String PREF_LOCAL_PREMIUM = IDENTIFIER + "_local_premium"; //$NON-NLS-1$
-
     /** Act.fm current user picture */
     public static final String PREF_PICTURE = IDENTIFIER + "_picture"; //$NON-NLS-1$
 
@@ -127,19 +110,12 @@ public class ActFmPreferenceService extends SyncProviderUtilities {
         return user;
     }
 
-    public synchronized static void reloadThisUser() {
-        if (user == null) {
-            return;
-        }
-        populateUser();
-    }
-
     private static void populateUser() {
         try {
             user.put("name", Preferences.getStringValue(PREF_NAME));
             user.put("first_name", Preferences.getStringValue(PREF_FIRST_NAME));
             user.put("last_name", Preferences.getStringValue(PREF_LAST_NAME));
-            user.put("premium", isPremiumUser());
+            user.put("premium", true);
             user.put("email", Preferences.getStringValue(PREF_EMAIL));
             user.put("picture", Preferences.getStringValue(PREF_PICTURE));
             user.put("id", ActFmPreferenceService.userId());
@@ -148,10 +124,6 @@ public class ActFmPreferenceService extends SyncProviderUtilities {
         }
     }
 
-    public static boolean isPremiumUser() {
-        return true;
-    }
-
     @Override
     public String getLoggedInUserName() {
         String name = Preferences.getStringValue(PREF_NAME);
@@ -175,29 +147,4 @@ public class ActFmPreferenceService extends SyncProviderUtilities {
         }
         return name;
     }
-
-    public static String thisUserName() {
-        JSONObject thisUser = thisUser();
-
-        String name = thisUser.optString("name");
-        if (!(TextUtils.isEmpty(name) || "null".equals(name))) {
-            return name;
-        }
-        String firstName = thisUser.optString("first_name");
-        boolean firstNameEmpty = TextUtils.isEmpty(firstName) || "null".equals(firstName);
-        String lastName = thisUser.optString("last_name");
-        boolean lastNameEmpty = TextUtils.isEmpty(lastName) || "null".equals(lastName);
-        if (firstNameEmpty && lastNameEmpty) {
-            return thisUser.optString("email");
-        }
-        StringBuilder nameBuilder = new StringBuilder();
-        if (!firstNameEmpty) {
-            nameBuilder.append(firstName).append(" ");
-        }
-        if (!lastNameEmpty) {
-            nameBuilder.append(lastName);
-        }
-        return nameBuilder.toString().trim();
-    }
-
 }

astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java

@@ -147,8 +147,6 @@ public class EditPreferences extends TodorooPreferenceActivity {
 
         addPreferenceListeners();
 
-        disablePremiumPrefs();
-
         PreferenceScreen appearance = (PreferenceScreen) screen.getPreference(APPEARANCE_PREFERENCE);
         if (!AndroidUtilities.isTabletSized(this)) {
             appearance.removePreference(screen.findPreference(getString(R.string.p_force_phone_layout)));
@@ -193,12 +191,6 @@ public class EditPreferences extends TodorooPreferenceActivity {
         return false;
     }
 
-    private void disablePremiumPrefs() {
-        boolean hasPowerPack = addOnService.hasPowerPack();
-        findPreference(getString(R.string.p_files_dir)).setEnabled(ActFmPreferenceService.isPremiumUser());
-        findPreference(getString(R.string.p_voiceRemindersEnabled)).setEnabled(hasPowerPack);
-    }
-
     private void showBeastMode() {
         Intent intent = new Intent(this, BeastModePreferences.class);
         intent.setAction(AstridApiConstants.ACTION_SETTINGS);

astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java

@@ -13,7 +13,6 @@ import android.widget.TextView;
 import com.actionbarsherlock.app.ActionBar;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.Preferences;
-import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.service.ThemeService;
 
 import org.tasks.R;
@@ -52,11 +51,7 @@ public class TaskEditActivity extends AstridActivity {
 	    ActionBar actionBar = getSupportActionBar();
 	    if (actionBar != null) {
 	        TextView title = ((TextView) actionBar.getCustomView().findViewById(R.id.title));
-	        if (ActFmPreferenceService.isPremiumUser()) {
             title.setText(""); //$NON-NLS-1$
-            } else {
-                title.setText(isNewTask ? R.string.TEA_new_task : R.string.TAd_contextEditTask);
-            }
         }
 	}
 

astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java

@@ -1027,10 +1027,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
     }
 
     private void createNewFileAttachment(String path, String fileName, String fileType) {
-        if (!ActFmPreferenceService.isPremiumUser()) {
-            return;
-        }
-
         TaskAttachment attachment = TaskAttachment.createNewAttachment(model.getUuid(), path, fileName, fileType);
         taskAttachmentDao.createNew(attachment);
         filesControlSet.refreshMetadata();

astrid/src/main/java/com/todoroo/astrid/dao/RemoteModelDao.java

@@ -50,8 +50,6 @@ public class RemoteModelDao<RTYPE extends RemoteModel> extends DatabaseDao<RTYPE
                 int newValue = 0;
                 if (PluginServices.getActFmPreferenceService().isLoggedIn()) {
                     newValue = OUTSTANDING_ENTRY_FLAG_ENQUEUE_MESSAGES | OUTSTANDING_ENTRY_FLAG_RECORD_OUTSTANDING;
-                } else if (PluginServices.getActFmPreferenceService().wasLoggedIn()) {
-                    newValue = OUTSTANDING_ENTRY_FLAG_RECORD_OUTSTANDING;
                 }
                 outstandingEntryFlag = newValue;
             }

astrid/src/main/java/com/todoroo/astrid/files/FilesControlSet.java

@@ -5,13 +5,6 @@
  */
 package com.todoroo.astrid.files;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.ArrayList;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
@@ -31,7 +24,6 @@ import android.widget.LinearLayout.LayoutParams;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import org.tasks.R;
 import com.todoroo.aacenc.RecognizerApi;
 import com.todoroo.aacenc.RecognizerApi.PlaybackExceptionHandler;
 import com.todoroo.andlib.data.TodorooCursor;
@@ -42,7 +34,6 @@ import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
-import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.dao.TaskAttachmentDao;
 import com.todoroo.astrid.data.RemoteModel;
 import com.todoroo.astrid.data.SyncFlags;
@@ -52,6 +43,15 @@ import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.ui.PopupControlSet;
 import com.todoroo.astrid.utility.Constants;
 
+import org.tasks.R;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+
 public class FilesControlSet extends PopupControlSet {
 
     @Autowired
@@ -164,7 +164,6 @@ public class FilesControlSet extends PopupControlSet {
 
             setupFileClickListener(name, m);
 
-            if (ActFmPreferenceService.isPremiumUser()) {
             clearFile.setVisibility(View.VISIBLE);
             clearFile.setOnClickListener(new OnClickListener() {
                 @Override
@@ -193,7 +192,6 @@ public class FilesControlSet extends PopupControlSet {
             });
         }
     }
-    }
 
     private void setupFileClickListener(View view, final TaskAttachment m) {
         final String filePath = m.containsNonNullValue(TaskAttachment.FILE_PATH) ? m.getValue(TaskAttachment.FILE_PATH) : null;

astrid/src/main/java/com/todoroo/astrid/service/UpdateMessageService.java

@@ -5,15 +5,6 @@
  */
 package com.todoroo.astrid.service;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Intent;
@@ -33,7 +24,6 @@ import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.LinearLayout.LayoutParams;
 
-import org.tasks.R;
 import com.todoroo.andlib.data.Property.StringProperty;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
@@ -49,6 +39,16 @@ import com.todoroo.astrid.data.StoreObject;
 import com.todoroo.astrid.gtasks.GtasksPreferenceService;
 import com.todoroo.astrid.utility.Constants;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.tasks.R;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
 /**
  * Notifies users when there are server updates
  *
@@ -353,7 +353,7 @@ public class UpdateMessageService {
                     "language=" + Locale.getDefault().getISO3Language() + "&" +
                     "market=" + Constants.MARKET_STRATEGY.strategyId() + "&" +
                     "actfm=" + (actFmPreferenceService.isLoggedIn() ? "1" : "0") + "&" +
-                    "premium=" + (ActFmPreferenceService.isPremiumUser() ? "1" : "0");
+                    "premium=1";
             String result = restClient.get(url); //$NON-NLS-1$
             if(TextUtils.isEmpty(result)) {
                 return null;

astrid/src/main/java/com/todoroo/astrid/voice/VoiceRecognizer.java

@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.voice;
 
-import java.io.IOException;
-import java.util.List;
-
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
@@ -20,15 +17,18 @@ import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.Toast;
 
-import org.tasks.R;
 import com.todoroo.aacenc.ContextManager;
 import com.todoroo.aacenc.RecognizerApi;
 import com.todoroo.aacenc.RecognizerApi.RecognizerApiListener;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.Preferences;
-import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.utility.Constants;
 
+import org.tasks.R;
+
+import java.io.IOException;
+import java.util.List;
+
 @TargetApi(8)
 public class VoiceRecognizer {
 
@@ -36,8 +36,7 @@ public class VoiceRecognizer {
     protected VoiceInputAssistant voiceInputAssistant;
 
     public static boolean speechRecordingAvailable(Context context) {
-        return ActFmPreferenceService.isPremiumUser() &&
+        return AndroidUtilities.getSdkVersion() >= 8 &&
-                AndroidUtilities.getSdkVersion() >= 8 &&
                 SpeechRecognizer.isRecognitionAvailable(context);
     }