From 81c3855ce763283f41f2b1d859b45d683d6e2d7e Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Tue, 26 Feb 2013 13:01:18 -0800
Subject: [PATCH] Move the static initialization of the dependency injector in
 SqlContentProvider to hopefully fix a bug where it would be called at a weird
 time

---
 .../astrid/provider/SqlContentProvider.java     | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/astrid/src/com/todoroo/astrid/provider/SqlContentProvider.java b/astrid/src/com/todoroo/astrid/provider/SqlContentProvider.java
index 8cea5d916..1477b7f23 100644
--- a/astrid/src/com/todoroo/astrid/provider/SqlContentProvider.java
+++ b/astrid/src/com/todoroo/astrid/provider/SqlContentProvider.java
@@ -31,13 +31,18 @@ import com.todoroo.astrid.service.AstridDependencyInjector;
 @SuppressWarnings("nls")
 public class SqlContentProvider extends ContentProvider {
 
+    // --- instance variables
+
+    private static UriMatcher uriMatcher;
+
     static {
         AstridDependencyInjector.initialize();
-    }
 
-    // --- instance variables
+        uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
 
-    private static UriMatcher uriMatcher;
+        uriMatcher.addURI(AstridApiConstants.API_PACKAGE + ".private",
+                "sql", 0);
+    }
 
     @Autowired
     private Database database;
@@ -56,12 +61,6 @@ public class SqlContentProvider extends ContentProvider {
         }
     }
 
-    static {
-        uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
-
-        uriMatcher.addURI(AstridApiConstants.API_PACKAGE + ".private",
-                "sql", 0);
-    }
 
     public SqlContentProvider() {
         DependencyInjectionService.getInstance().inject(this);