Fix for no astrid dependency injection in static block. 2.14.1

15 years ago · b11df0aa95
parent 60c46a9939
commit b11df0aa95
5 changed files with 36 additions and 9 deletions
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
      package="com.timsu.astrid"
-      android:versionCode="131" android:versionName="2.14.0">
+      android:versionCode="132" android:versionName="2.14.1">
      
    <!-- ============================ Metadata ============================ -->   
      
--- a/astrid/src-legacy/com/timsu/astrid/provider/TasksProvider.java
+++ b/astrid/src-legacy/com/timsu/astrid/provider/TasksProvider.java
@ -17,9 +17,14 @@ import com.timsu.astrid.data.tag.TagIdentifier;
 import com.timsu.astrid.data.tag.TagModelForView;
 import com.timsu.astrid.data.task.TaskController;
 import com.timsu.astrid.data.task.TaskModelForProvider;
+import com.todoroo.astrid.service.AstridDependencyInjector;

 public class TasksProvider extends ContentProvider {

+    static {
+        AstridDependencyInjector.initialize();
+    }
+
 	private static final String TAG = "MessageProvider";

 	private static final boolean LOGD = false;
--- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
@ -84,17 +84,15 @@ public final class UpgradeService {
    public void showChangeLog(int from, int to) {
        StringBuilder changeLog = new StringBuilder("<html><body style='color: white'>");

-        switch(from) {
-        default:
-            // came from earlier version
-
-        case 130:
-            newVersionString(changeLog, "2.14.0", new String[] {
+        if(from <= 130)
+            newVersionString(changeLog, "2.14.0 (5/24/10)", new String[] {
                    "Pick a calendar to 'Add to Calendar' (in Settings menu)",
                    "RTM: archived lists are ignored",
                    "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>");

--- a/tests/src/com/todoroo/astrid/provider/TaskProviderTests.java
+++ b/tests/src/com/todoroo/astrid/provider/TaskProviderTests.java
@ -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);
+    }
+
+}
--- a/tests/src/com/todoroo/astrid/test/DatabaseTestCase.java
+++ b/tests/src/com/todoroo/astrid/test/DatabaseTestCase.java
@ -7,6 +7,7 @@ import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.TestDependencyInjector;
 import com.todoroo.andlib.test.TodorooTestCase;
 import com.todoroo.astrid.dao.Database;
+import com.todoroo.astrid.service.AstridDependencyInjector;

 /**
 * Test case that automatically sets up and tears down a test database
@ -26,6 +27,8 @@ public class DatabaseTestCase extends TodorooTestCase {
 	public Database database;

    static {
+        AstridDependencyInjector.initialize();
+
        // initialize test dependency injector
        TestDependencyInjector injector = TestDependencyInjector.initialize("db");
        injector.addInjectable("tasksTable", TASKS_TEST);