Merge remote branch 'origin/dev'

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 = -->
         
@@ -317,6 +317,12 @@
               android:clearTaskOnLaunch="true" />
               
     <!-- producteev -->
+    <receiver android:name="com.todoroo.astrid.producteev.ProducteevFilterExposer">
+      <intent-filter>
+        <action android:name="com.todoroo.astrid.REQUEST_FILTERS" />
+        <category android:name="android.intent.category.DEFAULT" />
+      </intent-filter>
+    </receiver>
     <activity android:name="com.todoroo.astrid.producteev.ProducteevPreferences"
               android:icon="@drawable/ic_menu_producteev"
               android:label="@string/producteev_PPr_header">

astrid/default.properties

@@ -10,5 +10,5 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-8
+target=Motorola, Inc.:MILESTONE:7
 apk-configurations=

astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevFilterExposer.java

@@ -0,0 +1,87 @@
+/**
+ * See the file "LICENSE" for the full license governing this code.
+ */
+package com.todoroo.astrid.producteev;
+
+import android.content.BroadcastReceiver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+
+import com.timsu.astrid.R;
+import com.todoroo.andlib.sql.Criterion;
+import com.todoroo.andlib.sql.QueryTemplate;
+import com.todoroo.astrid.api.AstridApiConstants;
+import com.todoroo.astrid.api.Filter;
+import com.todoroo.astrid.api.FilterCategory;
+import com.todoroo.astrid.api.FilterListHeader;
+import com.todoroo.astrid.api.FilterListItem;
+import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria;
+import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
+import com.todoroo.astrid.model.Metadata;
+import com.todoroo.astrid.model.StoreObject;
+import com.todoroo.astrid.producteev.sync.ProducteevDashboard;
+import com.todoroo.astrid.producteev.sync.ProducteevDataService;
+import com.todoroo.astrid.producteev.sync.ProducteevTask;
+
+/**
+ * Exposes filters based on Producteev Dashboards
+ *
+ * @author Arne Jans <arne.jans@gmail.com>
+ *
+ */
+public class ProducteevFilterExposer extends BroadcastReceiver {
+
+    @SuppressWarnings("nls")
+    private Filter filterFromList(Context context, ProducteevDashboard dashboard) {
+        String dashboardTitle = context.getString(R.string.producteev_FEx_dashboard_item).
+            replace("$N", dashboard.getName());
+        String title = context.getString(R.string.producteev_FEx_dashboard_title, dashboard.getName());
+        ContentValues values = new ContentValues();
+        values.put(Metadata.KEY.name, ProducteevTask.METADATA_KEY);
+        values.put(ProducteevTask.DASHBOARD_ID.name, dashboard.getId());
+        values.put(ProducteevTask.ID.name, 0);
+        values.put(ProducteevTask.CREATOR_ID.name, 0);
+        values.put(ProducteevTask.RESPONSIBLE_ID.name, 0);
+        Filter filter = new Filter(dashboardTitle, title, new QueryTemplate().join(
+                ProducteevDataService.METADATA_JOIN).where(Criterion.and(
+                        MetadataCriteria.withKey(ProducteevTask.METADATA_KEY),
+                        TaskCriteria.isActive(),
+                        TaskCriteria.isVisible(),
+                        ProducteevTask.DASHBOARD_ID.eq(dashboard.getId()))),
+                values);
+
+        return filter;
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        // if we aren't logged in, don't expose features
+        if(!ProducteevUtilities.INSTANCE.isLoggedIn())
+            return;
+
+        StoreObject[] dashboards = ProducteevDataService.getInstance().getDashboards();
+
+        // If user does not have any tags, don't show this section at all
+        if(dashboards.length == 0)
+            return;
+
+        Filter[] dashboardFilters = new Filter[dashboards.length];
+        for(int i = 0; i < dashboards.length; i++)
+            dashboardFilters[i] = filterFromList(context, new ProducteevDashboard(dashboards[i]));
+
+        FilterListHeader producteevHeader = new FilterListHeader(context.getString(R.string.producteev_FEx_header));
+        FilterCategory producteevDashboards = new FilterCategory(context.getString(R.string.producteev_FEx_dashboard),
+                dashboardFilters);
+
+        // transmit filter list
+        FilterListItem[] list = new FilterListItem[2];
+        list[0] = producteevHeader;
+        list[1] = producteevDashboards;
+        Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_SEND_FILTERS);
+        broadcastIntent.putExtra(AstridApiConstants.EXTRAS_ADDON, ProducteevUtilities.IDENTIFIER);
+        broadcastIntent.putExtra(AstridApiConstants.EXTRAS_RESPONSE, list);
+        context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ);
+    }
+
+}

astrid/res/values/strings-producteev.xml

@@ -10,6 +10,18 @@
     <!-- task detail showing Producteev responsible information (%s => responsible user) -->
     <string name="producteev_TLA_responsible">R: %s</string>
     
+    <!-- filters header: Producteev -->
+    <string name="producteev_FEx_header">Producteev</string>
+    
+    <!-- filter category for Producteev dashboards -->
+    <string name="producteev_FEx_dashboard">Producteev Workspaces</string>
+    
+    <!-- Producteev dashboard filter name ($N => dashboardname, $C => count) -->
+    <string name="producteev_FEx_dashboard_item">$N</string>
+    
+    <!--  Producteev dashboard filter title (%s => dashboardname) -->
+    <string name="producteev_FEx_dashboard_title">Workspace \'%s\'</string>
+
     <!-- ==================================================== Preferences == -->
 
     <!-- Preferences Title: Producteev -->