fixes for guardian to sqlcipher refactoring

n8fr8 · n8fr8 · commit 276126d7fbc7 · 2012-03-06T22:14:54.000-05:00
diff --git a/jni/Android.mk b/jni/Android.mk
@@ -28,7 +28,7 @@ LOCAL_SRC_FILES:= \
 	net_sqlcipher_database_SQLiteStatement.cpp \
 	net_sqlcipher_CursorWindow.cpp \
 	CursorWindow.cpp
-#	info_guardianproject_database_sqlcipher_SQLiteDebug.cpp
+#	net_sqlcipher_database_sqlcipher_SQLiteDebug.cpp
 
 LOCAL_C_INCLUDES += \
 	$(JNI_H_INCLUDE) \
diff --git a/jni/net_sqlcipher_database_SQLiteDatabase.cpp b/jni/net_sqlcipher_database_SQLiteDatabase.cpp
@@ -585,7 +585,7 @@ void throw_sqlite3_exception(JNIEnv* env, int errcode,
            exceptionClass = "net/sqlcipher/database/SQLiteMisuseException";
            break;
         default:
-           exceptionClass = "info/guardianproject/database/sqlcipher/SQLiteException";
+           exceptionClass = "net/sqlcipher/database/sqlcipher/SQLiteException";
            break;
     }
 
diff --git a/src/net/sqlcipher/database/SQLiteCursor.java b/src/net/sqlcipher/database/SQLiteCursor.java
@@ -612,7 +612,7 @@ public void fillWindow(int startPos, android.database.CursorWindow window) {
 	
 		/*
 		window.setStartPosition(startPos);
-        mCount = mQuery.fillWindow((info.guardianproject.database.CursorWindow)window, mInitialRead, 0);
+        mCount = mQuery.fillWindow((net.sqlcipher.database.CursorWindow)window, mInitialRead, 0);
         // return -1 means not finished
         if (mCount == NO_COUNT){
             mCount = startPos + mInitialRead;

Original file line number	Diff line number	Diff line change
`@@ -585,7 +585,7 @@ void throw_sqlite3_exception(JNIEnv* env, int errcode,`
`585`	`585`	`exceptionClass = "net/sqlcipher/database/SQLiteMisuseException";`
`586`	`586`	`break;`
`587`	`587`	`default:`
`588`		`- exceptionClass = "info/guardianproject/database/sqlcipher/SQLiteException";`
	`588`	`+ exceptionClass = "net/sqlcipher/database/sqlcipher/SQLiteException";`
`589`	`589`	`break;`
`590`	`590`	`}`
`591`	`591`