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

Fix for no astrid dependency injection in static block. 2.14.1

Browse Source
Tim Su 16 years ago
parent 81f56e69af
commit 5d94340a70
5 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File

2
astrid/AndroidManifest.xml
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.timsu.astrid" package="com.timsu.astrid"
android:versionCode="131" android:versionName="2.14.0"> android:versionCode="132" android:versionName="2.14.1">
<!-- ============================ Metadata ============================ --> <!-- ============================ Metadata ============================ -->

5
astrid/src-legacy/com/timsu/astrid/provider/TasksProvider.java
Unescape Escape View File

@ -17,9 +17,14 @@ import com.timsu.astrid.data.tag.TagIdentifier;
import com.timsu.astrid.data.tag.TagModelForView; import com.timsu.astrid.data.tag.TagModelForView;
import com.timsu.astrid.data.task.TaskController; import com.timsu.astrid.data.task.TaskController;
import com.timsu.astrid.data.task.TaskModelForProvider; import com.timsu.astrid.data.task.TaskModelForProvider;
import com.todoroo.astrid.service.AstridDependencyInjector;
public class TasksProvider extends ContentProvider { public class TasksProvider extends ContentProvider {
static {
AstridDependencyInjector.initialize();
}
private static final String TAG = "MessageProvider"; private static final String TAG = "MessageProvider";
private static final boolean LOGD = false; private static final boolean LOGD = false;

14
astrid/src/com/todoroo/astrid/service/UpgradeService.java
Unescape Escape View File

@ -84,17 +84,15 @@ public final class UpgradeService {
public void showChangeLog(int from, int to) { public void showChangeLog(int from, int to) {
StringBuilder changeLog = new StringBuilder("<html><body style='color: white'>"); StringBuilder changeLog = new StringBuilder("<html><body style='color: white'>");
switch(from) { if(from <= 130)
default: newVersionString(changeLog, "2.14.0 (5/24/10)", new String[] {
// came from earlier version
case 130:
newVersionString(changeLog, "2.14.0", new String[] {
"Pick a calendar to 'Add to Calendar' (in Settings menu)", "Pick a calendar to 'Add to Calendar' (in Settings menu)",
"RTM: archived lists are ignored", "RTM: archived lists are ignored",
"Fixed user-reported crashes!"}); "Fixed user-reported crashes!"});
if(from <= 131)
} newVersionString(changeLog, "2.14.1 (5/29/10)", new String[] {
"Fixed crash while using PureCalendar widget",
});
changeLog.append("</body></html>"); changeLog.append("</body></html>");

21
tests/src/com/todoroo/astrid/provider/TaskProviderTests.java
Unescape Escape View File

@ -0,0 +1,21 @@
package com.todoroo.astrid.provider;
import android.content.ContentResolver;
import android.database.Cursor;
import android.net.Uri;
import com.timsu.astrid.provider.TasksProvider;
import com.todoroo.andlib.test.TodorooTestCase;
public class TaskProviderTests extends TodorooTestCase {
/** test that we can start things up and query for tasks */
public void testSimpleTaskQuery() {
ContentResolver resolver = getContext().getContentResolver();
Uri tasks = Uri.withAppendedPath(TasksProvider.CONTENT_URI, "tasks");
Cursor c = resolver.query(tasks, new String[] { "name" }, null, null, null);
assertTrue(c.getCount() >= 0);
}
}

3
tests/src/com/todoroo/astrid/test/DatabaseTestCase.java
Unescape Escape View File

@ -7,6 +7,7 @@ import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.service.TestDependencyInjector; import com.todoroo.andlib.service.TestDependencyInjector;
import com.todoroo.andlib.test.TodorooTestCase; import com.todoroo.andlib.test.TodorooTestCase;
import com.todoroo.astrid.dao.Database; import com.todoroo.astrid.dao.Database;
import com.todoroo.astrid.service.AstridDependencyInjector;
/** /**
* Test case that automatically sets up and tears down a test database * Test case that automatically sets up and tears down a test database
@ -26,6 +27,8 @@ public class DatabaseTestCase extends TodorooTestCase {
public Database database; public Database database;
static { static {
AstridDependencyInjector.initialize();
// initialize test dependency injector // initialize test dependency injector
TestDependencyInjector injector = TestDependencyInjector.initialize("db"); TestDependencyInjector injector = TestDependencyInjector.initialize("db");
injector.addInjectable("tasksTable", TASKS_TEST); injector.addInjectable("tasksTable", TASKS_TEST);

Write Preview
Loading…
Cancel
Save