archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixing widget not starting, fixing bug with custom filter activity and decorations not loading correctly

Browse Source
pull/14/head
Tim Su 14 years ago
parent 457059cd91
commit ee303ab1f4
5 changed files with 18 additions and 46 deletions
Show Stats Download Patch File Download Diff File

29
astrid/AndroidManifest.xml
Unescape Escape View File

@ -120,18 +120,10 @@
<!-- Activity that configures widget -->
<activity android:name="com.todoroo.astrid.widget.WidgetConfigActivity"
android:theme="@style/Theme">
</activity>
<!-- Activity to configure Power Pack widget -->
<activity android:name="com.todoroo.astrid.widget.ConfigurePowerWidgetActivity">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
</intent-filter>
</activity>
<activity android:name="com.todoroo.astrid.widget.ConfigurePowerWidget42Activity">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
</intent-filter>
</activity>
</activity>
<!-- ======================================================= Receivers = -->
@ -144,25 +136,6 @@
<meta-data android:name="android.appwidget.provider"
android:resource="@xml/widget_provider_info" />
</receiver>
<!-- receiver android:name="com.todoroo.astrid.widget.PowerWidget"
android:label="@string/PPW_widget_44_label"
android:icon="@drawable/icon_pp" >
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
</intent-filter>
<meta-data android:name="android.appwidget.provider"
android:resource="@xml/power_widget_44_provider_info" />
</receiver>
<receiver android:name="com.todoroo.astrid.widget.PowerWidget42"
android:label="@string/PPW_widget_42_label"
android:icon="@drawable/icon_pp" >
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
</intent-filter>
<meta-data android:name="android.appwidget.provider"
android:resource="@xml/power_widget_42_provider_info" />
</receiver -->
<receiver android:name="com.todoroo.astrid.service.GlobalEventReceiver">
<intent-filter>

5
astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java
Unescape Escape View File

@ -344,7 +344,7 @@ public class CustomFilterActivity extends ListActivity {
CriterionInstance instance = adapter.getItem(i);
String value = instance.getValueFromCriterion();
if(value == null && instance.criterion.sql != null && instance.criterion.sql.contains("?"))
continue;
value = "";
String title = instance.getTitleFromCriterion();
@ -415,7 +415,7 @@ public class CustomFilterActivity extends ListActivity {
CriterionInstance instance = adapter.getItem(i);
String value = instance.getValueFromCriterion();
if(value == null && instance.criterion.sql != null && instance.criterion.sql.contains("?"))
continue;
value = "";
switch(instance.type) {
case CriterionInstance.TYPE_ADD:
@ -447,6 +447,7 @@ public class CustomFilterActivity extends ListActivity {
instance.end = cursor.getInt(0);
last = instance.end;
max = Math.max(max, last);
System.err.println("updated instance to " + last);
} finally {
cursor.close();
}

6
astrid/plugin-src/com/todoroo/astrid/core/CustomFilterAdapter.java
Unescape Escape View File

@ -5,7 +5,6 @@ package com.todoroo.astrid.core;
import java.util.List;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
@ -35,10 +34,10 @@ import com.todoroo.astrid.data.AddOn;
*/
public class CustomFilterAdapter extends ArrayAdapter<CriterionInstance> {
private final Activity activity;
private final CustomFilterActivity activity;
private final LayoutInflater inflater;
public CustomFilterAdapter(Activity activity, List<CriterionInstance> objects) {
public CustomFilterAdapter(CustomFilterActivity activity, List<CriterionInstance> objects) {
super(activity, R.id.name, objects);
this.activity = activity;
inflater = (LayoutInflater) activity.getSystemService(
@ -59,6 +58,7 @@ public class CustomFilterAdapter extends ArrayAdapter<CriterionInstance> {
showOptionsFor(viewHolder.item, new Runnable() {
@Override
public void run() {
activity.updateList();
notifyDataSetInvalidated();
}
});

6
astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
Unescape Escape View File

@ -87,8 +87,6 @@ import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.utility.Constants;
import com.todoroo.astrid.utility.Flags;
import com.todoroo.astrid.utility.Preferences;
import com.todoroo.astrid.widget.PowerWidget;
import com.todoroo.astrid.widget.PowerWidget42;
import com.todoroo.astrid.widget.TasksWidget;
/**
@ -997,10 +995,6 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
Preferences.setInt(SortSelectionActivity.PREF_SORT_SORT, sort);
ContextManager.getContext().startService(new Intent(ContextManager.getContext(),
TasksWidget.UpdateService.class));
ContextManager.getContext().startService(new Intent(ContextManager.getContext(),
PowerWidget.UpdateService.class));
ContextManager.getContext().startService(new Intent(ContextManager.getContext(),
PowerWidget42.UpdateService.class));
}
setUpTaskList();

18
astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
Unescape Escape View File

@ -116,7 +116,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
// --- task detail and decoration soft caches
public final DetailManager extendedDetailManager = new DetailManager();
public final ExtendedDetailManager extendedDetailManager = new ExtendedDetailManager();
public final DecorationManager decorationManager =
new DecorationManager();
public final TaskActionManager taskActionManager = new TaskActionManager();
@ -530,14 +530,13 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
* @author Tim Su <tim@todoroo.com>
*
*/
public class DetailManager extends AddOnManager<String> {
public class ExtendedDetailManager extends AddOnManager<String> {
private final Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_REQUEST_DETAILS);
public DetailManager() {
public ExtendedDetailManager() {
//
}
private final Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_REQUEST_DETAILS);
@Override
Intent createBroadcastIntent(Task task) {
broadcastIntent.putExtra(AstridApiConstants.EXTRAS_TASK_ID, task.getId());
@ -598,6 +597,10 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
@Override
Intent createBroadcastIntent(Task task) {
// TODO performance hack hack
if(task.getValue(Task.TIMER_START) == 0 &&
task.getValue(Task.ELAPSED_SECONDS) == 0)
return null;
intent.putExtra(AstridApiConstants.EXTRAS_TASK_ID, task.getId());
intent.putExtra(BROADCAST_EXTRA_TASK, task);
return intent;
@ -620,7 +623,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
int i = 0;
boolean colorSet = false;
if(viewHolder.decorations.length != decorations.size())
if(viewHolder.decorations == null || viewHolder.decorations.length != decorations.size())
viewHolder.decorations = new View[decorations.size()];
for(TaskDecoration decoration : decorations) {
if(decoration.color != 0 && !colorSet) {
@ -886,7 +889,8 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
// request details
draw(viewHolder, taskId, get(taskId));
Intent broadcastIntent = createBroadcastIntent(viewHolder.task);
activity.sendOrderedBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ);
if(broadcastIntent != null)
activity.sendOrderedBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ);
return true;
}

Write Preview
Loading…
Cancel
Save