fixed issue with Observable, ContentObserver, DataSetObserver, and removed unnecessary classes

Author: n8fr8

src/example/SQLDemoActivity.java

@@ -26,8 +26,14 @@ public void onCreate(Bundle savedInstanceState) {
     //then you can open the database using a password
     SQLiteDatabase db = eventsData.getWritableDatabase(password);
 
-    addEvent("Hello Android Event", password);
-    Cursor cursor = getEvents(password);
+    for (int i = 1; i < 100; i++)
+    	addEvent("Hello Android Event: " + i, db);
+    
+   db.close();
+   
+   db = eventsData.getReadableDatabase(password);
+   
+    Cursor cursor = getEvents(db);
     showEvents(cursor);
 
     db.close();
@@ -39,20 +45,15 @@ public void onDestroy() {
     eventsData.close();
   }
 
-  private void addEvent(String title, String password) {
-    SQLiteDatabase db = eventsData.getWritableDatabase(password);
+  private void addEvent(String title, SQLiteDatabase db) {
 
     ContentValues values = new ContentValues();
     values.put(EventDataSQLHelper.TIME, System.currentTimeMillis());
     values.put(EventDataSQLHelper.TITLE, title);
     db.insert(EventDataSQLHelper.TABLE, null, values);
-
   }
 
-  private Cursor getEvents(String password) {
-    SQLiteDatabase db = eventsData.getReadableDatabase(password);
-    
-
+  private Cursor getEvents(SQLiteDatabase db) {
 
     Cursor cursor = db.query(EventDataSQLHelper.TABLE, null, null, null, null,
         null, null);

src/info/guardianproject/database/AbstractCursor.java

@@ -22,6 +22,10 @@
 
 import android.content.ContentResolver;
 import android.database.CharArrayBuffer;
+import android.database.ContentObservable;
+import android.database.DataSetObservable;
+import android.database.DataSetObserver;
+import android.database.ContentObserver;
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.Config;
@@ -32,7 +36,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();
@@ -79,7 +83,7 @@ public void deactivate() {
      */
     public void deactivateInternal() {
         if (mSelfObserver != null) {
-      //      mContentResolver.unregisterContentObserver(mSelfObserver);
+            mContentResolver.unregisterContentObserver(mSelfObserver);
             mSelfObserverRegistered = false;
         }
         mDataSetObservable.notifyInvalidated();
@@ -88,7 +92,7 @@ public void deactivateInternal() {
     public boolean requery() {
         if (mSelfObserver != null && mSelfObserverRegistered == false) {
 
-      //      mContentResolver.registerContentObserver(mNotifyUri, true, mSelfObserver);
+            mContentResolver.registerContentObserver(mNotifyUri, true, mSelfObserver);
             mSelfObserverRegistered = true;
         }
         mDataSetObservable.notifyChanged();
@@ -200,7 +204,7 @@ public final boolean moveToPosition(int position) {
      * @param position start position of data
      * @param window
      */
-    public void fillWindow(int position, CursorWindow window) {
+    public void fillWindow(int position, android.database.CursorWindow window) {
         if (position < 0 || position > getCount()) {
             return;
         }
@@ -608,6 +612,7 @@ public void onChange(boolean selfChange) {
                 cursor.onChange(false);
             }
         }
+
     }
 
     /**

src/info/guardianproject/database/BulkCursorToCursorAdaptor.java

@@ -16,15 +16,16 @@
 
 package info.guardianproject.database;
 
+import java.util.Map;
+
 import android.database.CharArrayBuffer;
 import android.database.ContentObserver;
 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 +90,7 @@ public synchronized IContentObserver getObserver() {
         if (mObserverBridge == null) {
             mObserverBridge = new SelfContentObserver(this);
         }
-        return mObserverBridge.getContentObserver();
+        return null;//mObserverBridge.getContentObserver(); //TODO nf fix this
     }
 
     @Override