Log result of sqlite3_key

Author: developernotes

sqlcipher/src/main/java/net/zetetic/database/sqlcipher/SQLiteConnection.java

@@ -117,7 +117,7 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen
     // we can ensure that we detach the signal at the right time.
     private int mCancellationSignalAttachCount;
 
-    private static native void nativeKey(long connectionPtr, byte[] password);
+    private static native int nativeKey(long connectionPtr, byte[] password);
     private static native long nativeOpen(String path, int openFlags, String label,
             boolean enableTrace, boolean enableProfile);
     private static native void nativeClose(long connectionPtr);
@@ -217,7 +217,8 @@ private void open() {
             mConfiguration.databaseHook.preKey(this);
         }
         if(mConfiguration.password != null && mConfiguration.password.length > 0){
-          nativeKey(mConnectionPtr, mConfiguration.password);
+          int rc = nativeKey(mConnectionPtr, mConfiguration.password);
+          Log.i(TAG, String.format("Database keying operation returned:%s", rc));
         }
         if(mConfiguration.databaseHook != null){
             mConfiguration.databaseHook.postKey(this);

sqlcipher/src/main/jni/sqlcipher/android_database_SQLiteConnection.cpp

@@ -138,8 +138,8 @@ static int coll_localized(
   return rc;
 }
 
-static void nativeKey(JNIEnv* env, jclass clazz, jlong connectionPtr, jbyteArray keyArray) {
-    int rc = 0;
+static jint nativeKey(JNIEnv* env, jclass clazz, jlong connectionPtr, jbyteArray keyArray) {
+    int rc = SQLITE_ERROR;
     jsize size = 0;
     jbyte *key = nullptr;
     auto* connection = reinterpret_cast<SQLiteConnection*>(connectionPtr);
@@ -156,6 +156,7 @@ static void nativeKey(JNIEnv* env, jclass clazz, jlong connectionPtr, jbyteArray
         ALOGE("sqlite3_key(%p) failed: %d", connection->db, rc);
         throw_sqlite3_exception(env, connection->db, "Could not key db.");
     }
+    return rc;
 }
 
 static jlong nativeOpen(JNIEnv* env, jclass clazz, jstring pathStr, jint openFlags,
@@ -832,7 +833,7 @@ static jboolean nativeHasCodec(JNIEnv* env, jobject clazz){
 static JNINativeMethod sMethods[] =
 {
     /* name, signature, funcPtr */
-    {"nativeKey", "(J[B)V",
+    {"nativeKey", "(J[B)I",
             (void*)nativeKey },
     {"nativeOpen", "(Ljava/lang/String;ILjava/lang/String;ZZ)J",
             (void*)nativeOpen },