Handling OEM + isPowerPack

astrid/plugin-src/com/todoroo/astrid/timers/TimerActionExposer.java

@@ -14,6 +14,7 @@ import com.todoroo.astrid.api.TaskAction;
 import com.todoroo.astrid.api.TaskDecoration;
 import com.todoroo.astrid.core.PluginServices;
 import com.todoroo.astrid.model.Task;
+import com.todoroo.astrid.service.AddonService;
 
 /**
  * Exposes {@link TaskDecoration} for timers
@@ -31,6 +32,9 @@ public class TimerActionExposer extends BroadcastReceiver {
         if(taskId == -1)
             return;
 
+        if(!AddonService.isPowerPack())
+            return;
+
         Task task = PluginServices.getTaskService().fetchById(taskId, Task.ID, Task.TIMER_START,
                 Task.ELAPSED_SECONDS);
 

astrid/src-legacy/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java

@@ -31,7 +31,6 @@ import com.timsu.astrid.data.task.TaskModelForXml;
 import com.todoroo.astrid.backup.BackupDateUtilities;
 
 @SuppressWarnings("nls")
-@Deprecated
 public class LegacyTasksXmlExporter {
 
     private TaskController taskController;

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

@@ -27,14 +27,14 @@ import java.util.List;
 
 import android.app.AlertDialog;
 import android.app.DatePickerDialog;
-import android.app.DatePickerDialog.OnDateSetListener;
 import android.app.TabActivity;
+import android.app.DatePickerDialog.OnDateSetListener;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.DialogInterface.OnCancelListener;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.DialogInterface.OnCancelListener;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -43,8 +43,8 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.DatePicker;
@@ -57,6 +57,7 @@ import android.widget.TabHost;
 import android.widget.TimePicker;
 import android.widget.Toast;
 import android.widget.ToggleButton;
+import android.widget.AdapterView.OnItemSelectedListener;
 
 import com.flurry.android.FlurryAgent;
 import com.timsu.astrid.R;
@@ -72,12 +73,13 @@ import com.todoroo.astrid.dao.Database;
 import com.todoroo.astrid.gcal.GCalControlSet;
 import com.todoroo.astrid.model.Task;
 import com.todoroo.astrid.repeats.RepeatControlSet;
+import com.todoroo.astrid.service.AddonService;
 import com.todoroo.astrid.service.StartupService;
 import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.tags.TagsControlSet;
 import com.todoroo.astrid.ui.DeadlineTimePickerDialog;
-import com.todoroo.astrid.ui.DeadlineTimePickerDialog.OnDeadlineTimeSetListener;
 import com.todoroo.astrid.ui.TimeDurationControlSet;
+import com.todoroo.astrid.ui.DeadlineTimePickerDialog.OnDeadlineTimeSetListener;
 import com.todoroo.astrid.ui.TimeDurationControlSet.TimeDurationType;
 import com.todoroo.astrid.utility.Constants;
 
@@ -211,13 +213,19 @@ public final class TaskEditActivity extends TabActivity {
         controls.add(new RepeatControlSet(this, extrasAddons));
 
         LinearLayout addonsAddons = (LinearLayout) findViewById(R.id.tab_addons_addons);
-        controls.add(new GCalControlSet(this, addonsAddons));
-        controls.add(new TimeDurationTaskEditControlSet(Task.ESTIMATED_SECONDS,
-                R.id.estimatedDuration, 0, R.string.DLG_hour_minutes,
-                TimeDurationType.HOURS_MINUTES));
-        controls.add(new TimeDurationTaskEditControlSet(Task.ELAPSED_SECONDS, R.id.elapsedDuration,
-                0, R.string.DLG_hour_minutes,
-                TimeDurationType.HOURS_MINUTES));
+        if(AddonService.isPowerPack()) {
+            controls.add(new GCalControlSet(this, addonsAddons));
+            controls.add(new TimeDurationTaskEditControlSet(Task.ESTIMATED_SECONDS,
+                    R.id.estimatedDuration, 0, R.string.DLG_hour_minutes,
+                    TimeDurationType.HOURS_MINUTES));
+            controls.add(new TimeDurationTaskEditControlSet(Task.ELAPSED_SECONDS, R.id.elapsedDuration,
+                    0, R.string.DLG_hour_minutes,
+                    TimeDurationType.HOURS_MINUTES));
+        } else {
+            Button button = new Button(this);
+            addonsAddons.addView(button);
+
+        }
 
         // read data
         populateFields();

astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java

@@ -3,8 +3,8 @@ package com.todoroo.astrid.service;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Map.Entry;
 import java.util.StringTokenizer;
+import java.util.Map.Entry;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
@@ -13,8 +13,8 @@ import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteDatabase.CursorFactory;
 import android.database.sqlite.SQLiteOpenHelper;
+import android.database.sqlite.SQLiteDatabase.CursorFactory;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -44,7 +44,6 @@ import com.todoroo.astrid.rmilk.data.MilkTask;
 import com.todoroo.astrid.tags.TagService;
 import com.todoroo.astrid.utility.Preferences;
 
-@SuppressWarnings("deprecation")
 public class Astrid2To3UpgradeHelper {
 
     @Autowired

astrid/src/com/todoroo/astrid/service/UpgradeService.java

@@ -22,12 +22,11 @@ public final class UpgradeService {
         if(from < 1)
             return;
 
+        if(from == 135)
+            AddonService.recordOem();
+
         if(from < 136)
             new Astrid2To3UpgradeHelper().upgrade2To3();
-        else if(from < 137) {
-            // TODO upgrade recurrence
-        }
-
 
         // display changelog
         showChangeLog(from);