From b25e6c21abe2097a99ba665655e867b9d0506918 Mon Sep 17 00:00:00 2001
From: Arne Jans <arne.jans@gmail.com>
Date: Fri, 13 Aug 2010 03:15:47 +0200
Subject: [PATCH] Changed manifest, so Astrid works on 2.1-phones. Fixed
 Task-assignment- and dashboard-spinner on TaskEditActivity. Changes arent
 pushed to the server, dont know how. Here are 2 bugs left: responsible person
 and dashboard isnt saved with task (see Producteev-tasks and notes I gave
 you), and the responsible-spinner is too small, I dont know why....

---
 astrid/AndroidManifest.xml                             |  2 +-
 .../astrid/producteev/ProducteevControlSet.java        |  9 ++++-----
 .../astrid/producteev/sync/ProducteevDashboard.java    |  8 ++++++--
 .../todoroo/astrid/producteev/sync/ProducteevUser.java |  2 +-
 astrid/res/layout/producteev_control.xml               |  2 +-
 .../com/todoroo/astrid/activity/TaskEditActivity.java  |  2 +-
 .../src/com/todoroo/astrid/service/AddOnService.java   | 10 +++++++++-
 7 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index 1f665b0b3..ad004d1c5 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -53,7 +53,7 @@
   <supports-screens />
   
   <application android:icon="@drawable/icon" 
-               android:label="@string/app_name">
+               android:label="@string/app_name" android:debuggable="true">
     
     <!-- ====================================================== Activities = -->
         
diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevControlSet.java b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevControlSet.java
index 114650f89..aa852321c 100644
--- a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevControlSet.java
@@ -38,11 +38,11 @@ public class ProducteevControlSet implements TaskEditControlSet {
     @Autowired
     private ExceptionService exceptionService;
 
-    private Activity activity;
+    private final Activity activity;
 
     private Task myTask;
-    private Spinner responsibleSelector;
-    private Spinner dashboardSelector;
+    private final Spinner responsibleSelector;
+    private final Spinner dashboardSelector;
 
     private ArrayList<ProducteevUser> users = null;
     private ArrayList<ProducteevDashboard> dashboards = null;
@@ -101,7 +101,7 @@ public class ProducteevControlSet implements TaskEditControlSet {
             //dashboard to not sync as first spinner-entry
             dashboards.add(new ProducteevDashboard(ProducteevUtilities.DASHBOARD_NO_SYNC, activity.getString(R.string.producteev_no_dashboard),null));
             for (int i=1;i<dashboardsData.length+1;i++) {
-                ProducteevDashboard dashboard = new ProducteevDashboard(dashboardsData[i]);
+                ProducteevDashboard dashboard = new ProducteevDashboard(dashboardsData[i-1]);
                 dashboards.add(dashboard);
                 if(dashboard.getId() == dashboardId) {
                     ownerDashboard = dashboard;
@@ -123,7 +123,6 @@ public class ProducteevControlSet implements TaskEditControlSet {
                 return;
             }
 
-            responsibleSelector.setEnabled(true);
             // Fill the responsible-spinner and set the current responsible
             users = ownerDashboard.getUsers();
             long responsibleId = metadata.getValue(ProducteevTask.RESPONSIBLE_ID);
diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevDashboard.java b/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevDashboard.java
index 9690b6476..63cca91d4 100644
--- a/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevDashboard.java
+++ b/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevDashboard.java
@@ -31,9 +31,9 @@ public class ProducteevDashboard {
             StoreObject.VALUE2.name);
 
     // data class-part
-    private long id;
+    private final long id;
 
-    private String name;
+    private final String name;
 
     private ArrayList<ProducteevUser> users = null;
 
@@ -51,6 +51,10 @@ public class ProducteevDashboard {
     public ProducteevDashboard(long id, String name, String usercsv) {
         this.id = id;
         this.name = name;
+
+        if (usercsv == null)
+            return;
+
         StringTokenizer tokenizer = new StringTokenizer(usercsv, ";");
         int usercount = tokenizer.countTokens();
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevUser.java b/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevUser.java
index a116f1017..adcdae80d 100644
--- a/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevUser.java
+++ b/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevUser.java
@@ -63,7 +63,7 @@ public long getId() {
 
 @Override
 public String toString() {
-    String displayString = null;
+    String displayString = "";
     boolean hasFirstname = false;
     boolean hasLastname = false;
     if (firstname != null && firstname.length() > 0) {
diff --git a/astrid/res/layout/producteev_control.xml b/astrid/res/layout/producteev_control.xml
index 58e9c107d..c10d3e95c 100644
--- a/astrid/res/layout/producteev_control.xml
+++ b/astrid/res/layout/producteev_control.xml
@@ -18,7 +18,7 @@
         android:id="@+id/producteev_TEA_task_assign"
         android:prompt="@string/producteev_TEA_task_assign_label"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content" />      
         
       <TextView
         android:layout_width="wrap_content"
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index a3ff18f6e..f3b8c5ec1 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -219,7 +219,7 @@ public final class TaskEditActivity extends TabActivity {
         controls.add(new RepeatControlSet(this, extrasAddons));
 
         LinearLayout addonsAddons = (LinearLayout) findViewById(R.id.tab_addons_addons);
-        AddOn producteevAddon = addOnService.getAddOn(Constants.PACKAGE, "Producteev");
+        AddOn producteevAddon = addOnService.getAddOn(AddOnService.PRODUCTEEV_PACKAGE, "Producteev");
         if (addOnService.isInstalled(producteevAddon) && ProducteevUtilities.INSTANCE.isLoggedIn()) {
             controls.add(new ProducteevControlSet(this, addonsAddons));
         }
diff --git a/astrid/src/com/todoroo/astrid/service/AddOnService.java b/astrid/src/com/todoroo/astrid/service/AddOnService.java
index 52a99910a..bce741857 100644
--- a/astrid/src/com/todoroo/astrid/service/AddOnService.java
+++ b/astrid/src/com/todoroo/astrid/service/AddOnService.java
@@ -42,6 +42,9 @@ 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";
 
@@ -152,6 +155,9 @@ public class AddOnService {
      * @return
      */
     public boolean isInstalled(AddOn addOn) {
+        // it isnt installed if it is null...
+        if (addOn == null)
+            return false;
         return isInstalled(addOn.getPackageName(), addOn.isInternal());
     }
 
@@ -165,6 +171,8 @@ public class AddOnService {
             return true;
         if(LOCALE_PACKAGE.equals(packageName))
             return true;
+        if(PRODUCTEEV_PACKAGE.equals(packageName))
+            return true;
 
         Context context = ContextManager.getContext();
         PackageInfo packageInfo;
@@ -231,7 +239,7 @@ public class AddOnService {
 
         list[3] = new AddOn(true, true, "Producteev", null,
                 "Synchronize with Producteev service. Also changes Astrid's importance levels to stars.",
-                Constants.PACKAGE, "http://www.producteev.com",
+                PRODUCTEEV_PACKAGE, "http://www.producteev.com",
                 ((BitmapDrawable)r.getDrawable(R.drawable.icon_producteev)).getBitmap());
 
         return list;