renamed package name to info/guardianproject/database/sqlcipher

eighthave · eighthave · commit 4b9e35f602f2 · 2011-02-24T16:24:55.000-05:00
diff --git a/jni/info_guardianproject_database_sqlcipher_SQLiteCompiledSql.cpp b/jni/info_guardianproject_database_sqlcipher_SQLiteCompiledSql.cpp
@@ -113,9 +113,9 @@ int register_android_database_SQLiteCompiledSql(JNIEnv * env)
 {
     jclass clazz;
 
-    clazz = env->FindClass("android/database/sqlite/SQLiteCompiledSql");
+    clazz = env->FindClass("info/guardianproject/database/sqlcipher/SQLiteCompiledSql");
     if (clazz == NULL) {
-        LOGE("Can't find android/database/sqlite/SQLiteCompiledSql");
+        LOGE("Can't find info/guardianproject/database/sqlcipher/SQLiteCompiledSql");
         return -1;
     }
 
diff --git a/jni/info_guardianproject_database_sqlcipher_SQLiteDatabase.cpp b/jni/info_guardianproject_database_sqlcipher_SQLiteDatabase.cpp
@@ -153,7 +153,7 @@ static void dbopen(JNIEnv* env, jobject object, jstring pathString, jint flags)
         const char *text = (const char*)sqlite3_column_text(statement, 0);
         if (strcmp(text, "ok") != 0) {
             LOGE("integrity check failed for \"%s\": %s\n", integritySql, path8, text);
-            jniThrowException(env, "android/database/sqlite/SQLiteDatabaseCorruptException", text);
+            jniThrowException(env, "info/guardianproject/database/sqlcipher/SQLiteDatabaseCorruptException", text);
             goto done;
         }
     }
@@ -462,9 +462,9 @@ int register_android_database_SQLiteDatabase(JNIEnv *env)
 {
     jclass clazz;
 
-    clazz = env->FindClass("android/database/sqlite/SQLiteDatabase");
+    clazz = env->FindClass("info/guardianproject/database/sqlcipher/SQLiteDatabase");
     if (clazz == NULL) {
-        LOGE("Can't find android/database/sqlite/SQLiteDatabase\n");
+        LOGE("Can't find info/guardianproject/database/sqlcipher/SQLiteDatabase\n");
         return -1;
     }
 
@@ -520,28 +520,28 @@ void throw_sqlite3_exception(JNIEnv* env, int errcode,
     const char* exceptionClass;
     switch (errcode) {
         case SQLITE_IOERR:
-            exceptionClass = "android/database/sqlite/SQLiteDiskIOException";
+            exceptionClass = "info/guardianproject/database/sqlcipher/SQLiteDiskIOException";
             break;
         case SQLITE_CORRUPT:
-            exceptionClass = "android/database/sqlite/SQLiteDatabaseCorruptException";
+            exceptionClass = "info/guardianproject/database/sqlcipher/SQLiteDatabaseCorruptException";
             break;
         case SQLITE_CONSTRAINT:
-           exceptionClass = "android/database/sqlite/SQLiteConstraintException";
+           exceptionClass = "info/guardianproject/database/sqlcipher/SQLiteConstraintException";
            break;
         case SQLITE_ABORT:
-           exceptionClass = "android/database/sqlite/SQLiteAbortException";
+           exceptionClass = "info/guardianproject/database/sqlcipher/SQLiteAbortException";
            break;
         case SQLITE_DONE:
-           exceptionClass = "android/database/sqlite/SQLiteDoneException";
+           exceptionClass = "info/guardianproject/database/sqlcipher/SQLiteDoneException";
            break;
         case SQLITE_FULL:
-           exceptionClass = "android/database/sqlite/SQLiteFullException";
+           exceptionClass = "info/guardianproject/database/sqlcipher/SQLiteFullException";
            break;
         case SQLITE_MISUSE:
-           exceptionClass = "android/database/sqlite/SQLiteMisuseException";
+           exceptionClass = "info/guardianproject/database/sqlcipher/SQLiteMisuseException";
            break;
         default:
-           exceptionClass = "android/database/sqlite/SQLiteException";
+           exceptionClass = "info/guardianproject/database/sqlcipher/SQLiteException";
            break;
     }
 
diff --git a/jni/info_guardianproject_database_sqlcipher_SQLiteDebug.cpp b/jni/info_guardianproject_database_sqlcipher_SQLiteDebug.cpp
@@ -187,7 +187,7 @@ static void getHeapDirtyPages(JNIEnv *env, jobject clazz, jintArray pages)
 
 static JNINativeMethod gMethods[] =
 {
-    { "getPagerStats", "(Landroid/database/sqlite/SQLiteDebug$PagerStats;)V",
+    { "getPagerStats", "(Linfo/guardianproject/database/sqlcipher/SQLiteDebug$PagerStats;)V",
             (void*) getPagerStats },
     { "getHeapSize", "()J", (void*) getHeapSize },
     { "getHeapAllocatedSize", "()J", (void*) getHeapAllocatedSize },
@@ -199,9 +199,9 @@ int register_android_database_SQLiteDebug(JNIEnv *env)
 {
     jclass clazz;
 
-    clazz = env->FindClass("android/database/sqlite/SQLiteDebug$PagerStats");
+    clazz = env->FindClass("info/guardianproject/database/sqlcipher/SQLiteDebug$PagerStats");
     if (clazz == NULL) {
-        LOGE("Can't find android/database/sqlite/SQLiteDebug$PagerStats");
+        LOGE("Can't find info/guardianproject/database/sqlcipher/SQLiteDebug$PagerStats");
         return -1;
     }
 
@@ -223,7 +223,7 @@ int register_android_database_SQLiteDebug(JNIEnv *env)
         return -1;
     }
 
-    return jniRegisterNativeMethods(env, "android/database/sqlite/SQLiteDebug",
+    return jniRegisterNativeMethods(env, "info/guardianproject/database/sqlcipher/SQLiteDebug",
             gMethods, NELEM(gMethods));
 }
 
diff --git a/jni/info_guardianproject_database_sqlcipher_SQLiteProgram.cpp b/jni/info_guardianproject_database_sqlcipher_SQLiteProgram.cpp
@@ -175,9 +175,9 @@ int register_android_database_SQLiteProgram(JNIEnv * env)
 {
     jclass clazz;
 
-    clazz = env->FindClass("android/database/sqlite/SQLiteProgram");
+    clazz = env->FindClass("info/guardianproject/database/sqlcipher/SQLiteProgram");
     if (clazz == NULL) {
-        LOGE("Can't find android/database/sqlite/SQLiteProgram");
+        LOGE("Can't find info/guardianproject/database/sqlcipher/SQLiteProgram");
         return -1;
     }
 
diff --git a/jni/info_guardianproject_database_sqlcipher_SQLiteQuery.cpp b/jni/info_guardianproject_database_sqlcipher_SQLiteQuery.cpp
@@ -348,9 +348,9 @@ int register_android_database_SQLiteQuery(JNIEnv * env)
 {
     jclass clazz;
 
-    clazz = env->FindClass("android/database/sqlite/SQLiteQuery");
+    clazz = env->FindClass("info/guardianproject/database/sqlcipher/SQLiteQuery");
     if (clazz == NULL) {
-        LOGE("Can't find android/database/sqlite/SQLiteQuery");
+        LOGE("Can't find info/guardianproject/database/sqlcipher/SQLiteQuery");
         return -1;
     }
 
diff --git a/jni/info_guardianproject_database_sqlcipher_SQLiteStatement.cpp b/jni/info_guardianproject_database_sqlcipher_SQLiteStatement.cpp
@@ -129,9 +129,9 @@ int register_android_database_SQLiteStatement(JNIEnv * env)
 {
     jclass clazz;
 
-    clazz = env->FindClass("android/database/sqlite/SQLiteStatement");
+    clazz = env->FindClass("info/guardianproject/database/sqlcipher/SQLiteStatement");
     if (clazz == NULL) {
-        LOGE("Can't find android/database/sqlite/SQLiteStatement");
+        LOGE("Can't find info/guardianproject/database/sqlcipher/SQLiteStatement");
         return -1;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -113,9 +113,9 @@ int register_android_database_SQLiteCompiledSql(JNIEnv * env)`
`113`	`113`	`{`
`114`	`114`	`jclass clazz;`
`115`	`115`
`116`		`- clazz = env->FindClass("android/database/sqlite/SQLiteCompiledSql");`
	`116`	`+ clazz = env->FindClass("info/guardianproject/database/sqlcipher/SQLiteCompiledSql");`
`117`	`117`	`if (clazz == NULL) {`
`118`		`- LOGE("Can't find android/database/sqlite/SQLiteCompiledSql");`
	`118`	`+ LOGE("Can't find info/guardianproject/database/sqlcipher/SQLiteCompiledSql");`
`119`	`119`	`return -1;`
`120`	`120`	`}`
`121`	`121`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ static void getHeapDirtyPages(JNIEnv *env, jobject clazz, jintArray pages)`
`187`	`187`
`188`	`188`	`static JNINativeMethod gMethods[] =`
`189`	`189`	`{`
`190`		`- { "getPagerStats", "(Landroid/database/sqlite/SQLiteDebug$PagerStats;)V",`
	`190`	`+ { "getPagerStats", "(Linfo/guardianproject/database/sqlcipher/SQLiteDebug$PagerStats;)V",`
`191`	`191`	`(void*) getPagerStats },`
`192`	`192`	`{ "getHeapSize", "()J", (void*) getHeapSize },`
`193`	`193`	`{ "getHeapAllocatedSize", "()J", (void*) getHeapAllocatedSize },`
`@@ -199,9 +199,9 @@ int register_android_database_SQLiteDebug(JNIEnv *env)`
`199`	`199`	`{`
`200`	`200`	`jclass clazz;`
`201`	`201`
`202`		`- clazz = env->FindClass("android/database/sqlite/SQLiteDebug$PagerStats");`
	`202`	`+ clazz = env->FindClass("info/guardianproject/database/sqlcipher/SQLiteDebug$PagerStats");`
`203`	`203`	`if (clazz == NULL) {`
`204`		`- LOGE("Can't find android/database/sqlite/SQLiteDebug$PagerStats");`
	`204`	`+ LOGE("Can't find info/guardianproject/database/sqlcipher/SQLiteDebug$PagerStats");`
`205`	`205`	`return -1;`
`206`	`206`	`}`
`207`	`207`
`@@ -223,7 +223,7 @@ int register_android_database_SQLiteDebug(JNIEnv *env)`
`223`	`223`	`return -1;`
`224`	`224`	`}`
`225`	`225`
`226`		`- return jniRegisterNativeMethods(env, "android/database/sqlite/SQLiteDebug",`
	`226`	`+ return jniRegisterNativeMethods(env, "info/guardianproject/database/sqlcipher/SQLiteDebug",`
`227`	`227`	`gMethods, NELEM(gMethods));`
`228`	`228`	`}`
`229`	`229`
Original file line number	Diff line number	Diff line change
`@@ -175,9 +175,9 @@ int register_android_database_SQLiteProgram(JNIEnv * env)`
`175`	`175`	`{`
`176`	`176`	`jclass clazz;`
`177`	`177`
`178`		`- clazz = env->FindClass("android/database/sqlite/SQLiteProgram");`
	`178`	`+ clazz = env->FindClass("info/guardianproject/database/sqlcipher/SQLiteProgram");`
`179`	`179`	`if (clazz == NULL) {`
`180`		`- LOGE("Can't find android/database/sqlite/SQLiteProgram");`
	`180`	`+ LOGE("Can't find info/guardianproject/database/sqlcipher/SQLiteProgram");`
`181`	`181`	`return -1;`
`182`	`182`	`}`
`183`	`183`
Original file line number	Diff line number	Diff line change
`@@ -348,9 +348,9 @@ int register_android_database_SQLiteQuery(JNIEnv * env)`
`348`	`348`	`{`
`349`	`349`	`jclass clazz;`
`350`	`350`
`351`		`- clazz = env->FindClass("android/database/sqlite/SQLiteQuery");`
	`351`	`+ clazz = env->FindClass("info/guardianproject/database/sqlcipher/SQLiteQuery");`
`352`	`352`	`if (clazz == NULL) {`
`353`		`- LOGE("Can't find android/database/sqlite/SQLiteQuery");`
	`353`	`+ LOGE("Can't find info/guardianproject/database/sqlcipher/SQLiteQuery");`
`354`	`354`	`return -1;`
`355`	`355`	`}`
`356`	`356`
Original file line number	Diff line number	Diff line change
`@@ -129,9 +129,9 @@ int register_android_database_SQLiteStatement(JNIEnv * env)`
`129`	`129`	`{`
`130`	`130`	`jclass clazz;`
`131`	`131`
`132`		`- clazz = env->FindClass("android/database/sqlite/SQLiteStatement");`
	`132`	`+ clazz = env->FindClass("info/guardianproject/database/sqlcipher/SQLiteStatement");`
`133`	`133`	`if (clazz == NULL) {`
`134`		`- LOGE("Can't find android/database/sqlite/SQLiteStatement");`
	`134`	`+ LOGE("Can't find info/guardianproject/database/sqlcipher/SQLiteStatement");`
`135`	`135`	`return -1;`
`136`	`136`	`}`
`137`	`137`