Merge remote-tracking branch 'sqlcipher/master'

Author: gmetaxas

src/net/sqlcipher/CursorWrapper.java

@@ -31,5 +31,9 @@ public CursorWrapper(Cursor cursor) {
     public int getType(int columnIndex) {
         return mCursor.getType(columnIndex);
     }
+
+    public Cursor getWrappedCursor() {
+      return mCursor;
+    }
 }
 

src/net/sqlcipher/database/SQLiteDatabase.java

@@ -1488,11 +1488,9 @@ public Cursor rawQueryWithFactory(
      */
     public Cursor rawQuery(String sql, String[] selectionArgs,
                            int initialRead, int maxRead) {
-        SQLiteCursor c = (SQLiteCursor)rawQueryWithFactory(
-                                                           null, sql, selectionArgs, null);
-        c.setLoadStyle(initialRead, maxRead);
-
-        return c;
+      net.sqlcipher.CursorWrapper cursorWrapper = (net.sqlcipher.CursorWrapper)rawQueryWithFactory(null, sql, selectionArgs, null);
+      ((SQLiteCursor)cursorWrapper.getWrappedCursor()).setLoadStyle(initialRead, maxRead);
+      return cursorWrapper;
     }
 
     /**