refactoed to code to use android/database/CursorWindow instead of our own; solves fillWindow, CrossProcessCursor and Observable issues

Author: n8fr8

src/info/guardianproject/database/AbstractCursor.java

@@ -22,6 +22,11 @@
 
 import android.content.ContentResolver;
 import android.database.CharArrayBuffer;
+import android.database.ContentObservable;
+import android.database.ContentObserver;
+import android.database.CursorWindow;
+import android.database.DataSetObservable;
+import android.database.DataSetObserver;
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.Config;
@@ -32,7 +37,7 @@
  * This is an abstract cursor class that handles a lot of the common code
  * that all cursors need to deal with and is provided for convenience reasons.
  */
-public abstract class AbstractCursor implements CrossProcessCursor {
+public abstract class AbstractCursor implements android.database.CrossProcessCursor {
     private static final String TAG = "Cursor";
 
     DataSetObservable mDataSetObservable = new DataSetObservable();
@@ -199,11 +204,14 @@ public final boolean moveToPosition(int position) {
      * Copy data from cursor to CursorWindow
      * @param position start position of data
      * @param window
-     */
-    public void fillWindow(int position, CursorWindow window) {
-        if (position < 0 || position > getCount()) {
+     */    
+    public void fillWindow(int position, android.database.CursorWindow window) {
+        
+    	
+    	if (position < 0 || position > getCount()) {
             return;
         }
+    	
         window.acquireReference();
         try {
             int oldpos = mPos;
@@ -475,6 +483,7 @@ protected DataSetObservable getDataSetObservable() {
         return mDataSetObservable;
 
     }
+    
     public void registerDataSetObserver(DataSetObserver observer) {
         mDataSetObservable.registerObserver(observer);
 
@@ -608,6 +617,8 @@ public void onChange(boolean selfChange) {
                 cursor.onChange(false);
             }
         }
+
+		
     }
 
     /**

src/info/guardianproject/database/AbstractWindowedCursor.java

@@ -17,6 +17,7 @@
 package info.guardianproject.database;
 
 import android.database.CharArrayBuffer;
+import android.database.CursorWindow;
 
 /**
  * A base class for Cursors that store their data in {@link CursorWindow}s.

src/info/guardianproject/database/BulkCursorNative.java

@@ -16,14 +16,15 @@
 
 package info.guardianproject.database;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import android.database.CursorWindow;
 import android.os.Binder;
-import android.os.RemoteException;
+import android.os.Bundle;
 import android.os.IBinder;
 import android.os.Parcel;
-import android.os.Bundle;
-
-import java.util.HashMap;
-import java.util.Map;
+import android.os.RemoteException;
 
 /**
  * Native implementation of the bulk cursor. This is only for use in implementing

src/info/guardianproject/database/BulkCursorToCursorAdaptor.java

@@ -18,13 +18,12 @@
 
 import android.database.CharArrayBuffer;
 import android.database.ContentObserver;
+import android.database.CursorWindow;
 import android.database.DataSetObserver;
-import android.os.RemoteException;
 import android.os.Bundle;
+import android.os.RemoteException;
 import android.util.Log;
 
-import java.util.Map;
-
 /**
  * Adapts an {@link IBulkCursor} to a {@link Cursor} for use in the local
  * process.
@@ -89,7 +88,7 @@ public synchronized IContentObserver getObserver() {
         if (mObserverBridge == null) {
             mObserverBridge = new SelfContentObserver(this);
         }
-        return mObserverBridge.getContentObserver();
+        return null;//mObserverBridge.getContentObserver();
     }
 
     @Override
@@ -181,6 +180,7 @@ public boolean requery() {
      * @hide
      * @deprecated
      */
+    /*
     @Override
     public boolean deleteRow() {
         try {
@@ -207,7 +207,7 @@ public boolean deleteRow() {
             Log.e(TAG, "Unable to delete row because the remote process is dead");
             return false;
         }
-    }
+    }*/
 
     @Override
     public String[] getColumnNames() {
@@ -225,7 +225,7 @@ public String[] getColumnNames() {
     /**
      * @hide
      * @deprecated
-     */
+     *//*
     @Override
     public boolean commitUpdates(Map<? extends Long,
             ? extends Map<String,Object>> additionalValues) {
@@ -258,7 +258,7 @@ public boolean commitUpdates(Map<? extends Long,
                 return false;
             }
         }
-    }
+    }*/
 
     @Override
     public Bundle getExtras() {
@@ -315,4 +315,5 @@ public void unregisterDataSetObserver(DataSetObserver observer) {
 	}
 
 
+
 }

src/info/guardianproject/database/ContentObservable.java

@@ -20,6 +20,8 @@
 
 import android.content.ContentResolver;
 import android.database.CharArrayBuffer;
+import android.database.ContentObserver;
+import android.database.DataSetObserver;
 import android.net.Uri;
 import android.os.Bundle;