diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java index 740963d60..36748afd1 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java @@ -75,7 +75,6 @@ import com.todoroo.astrid.alarms.AlarmControlSet; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.dao.Database; import com.todoroo.astrid.gcal.GCalControlSet; -import com.todoroo.astrid.model.AddOn; import com.todoroo.astrid.model.Task; import com.todoroo.astrid.producteev.ProducteevControlSet; import com.todoroo.astrid.producteev.ProducteevUtilities; @@ -252,8 +251,7 @@ public final class TaskEditActivity extends TabActivity { LinearLayout addonsAddons = (LinearLayout) findViewById(R.id.tab_addons_addons); try { - AddOn producteevAddon = addOnService.getAddOn(AddOnService.PRODUCTEEV_PACKAGE, "Producteev"); //$NON-NLS-1$ - if (addOnService.isInstalled(producteevAddon) && ProducteevUtilities.INSTANCE.isLoggedIn()) { + if(ProducteevUtilities.INSTANCE.isLoggedIn()) { controls.add(new ProducteevControlSet(this, addonsAddons)); ((TextView)findViewById(R.id.notes)).setHint(R.string.producteev_TEA_notes); ((TextView)findViewById(R.id.notes_label)).setHint(R.string.producteev_TEA_notes); diff --git a/astrid/src/com/todoroo/astrid/service/AddOnService.java b/astrid/src/com/todoroo/astrid/service/AddOnService.java index d002293d8..cd70f8c49 100644 --- a/astrid/src/com/todoroo/astrid/service/AddOnService.java +++ b/astrid/src/com/todoroo/astrid/service/AddOnService.java @@ -42,9 +42,6 @@ public class AddOnService { /** Astrid Locale package */ public static final String LOCALE_PACKAGE = "com.todoroo.astrid.locale"; - /** Astrid Producteev package */ - public static final String PRODUCTEEV_PACKAGE = "com.todoroo.astrid.producteev"; - /** Astrid Power Pack label */ public static final String POWER_PACK_LABEL = "Astrid Power Pack"; @@ -171,7 +168,7 @@ public class AddOnService { return true; if(LOCALE_PACKAGE.equals(packageName)) return true; - if(PRODUCTEEV_PACKAGE.equals(packageName)) + if(Constants.PACKAGE.equals(packageName)) return true; Context context = ContextManager.getContext(); @@ -234,7 +231,7 @@ public class AddOnService { list[2] = new AddOn(true, true, "Producteev", null, "Synchronize with Producteev service. Also changes Astrid's importance levels to stars.", - PRODUCTEEV_PACKAGE, "http://www.producteev.com", + Constants.PACKAGE, "http://www.producteev.com", ((BitmapDrawable)r.getDrawable(R.drawable.icon_producteev)).getBitmap()); list[3] = new AddOn(true, true, "Remember the Milk", null,