Tests that verify over reads do not occur

Author: developernotes

.idea/workspace.xml

@@ -51,9 +51,13 @@ public void prepareDatabaseEnvironment(){
     }
 
     public SQLiteDatabase createDatabase(File databaseFile){
+        return createDatabase(databaseFile, null);
+    }
+
+    public SQLiteDatabase createDatabase(File databaseFile, SQLiteDatabaseHook hook){
         Log.i(TAG, "Entered ZeteticApplication::createDatabase");
         Log.i(TAG, "Before SQLiteDatabase.openOrCreateDatabase");
-        return SQLiteDatabase.openOrCreateDatabase(databaseFile.getPath(), DATABASE_PASSWORD, null);
+        return SQLiteDatabase.openOrCreateDatabase(databaseFile.getPath(), DATABASE_PASSWORD, null, hook);
     }
 
     public void extractAssetToDatabaseDirectory(String fileName) throws IOException {

libs/armeabi-v7a/libsqlcipher.so

@@ -30,7 +30,7 @@ public Cursor query(Uri uri, String[] projection, String selection, String[] sel
 
         SQLiteDatabase.loadLibs(ZeteticApplication.getInstance());
         File databasePath = ZeteticApplication.getInstance().getDatabasePath(ZeteticApplication.DATABASE_NAME);
-        database = ZeteticApplication.getInstance().createDatabase(databasePath);
+        database = ZeteticApplication.getInstance().createDatabase(databasePath, null);
 
         createDatabaseWithData(database);
         SQLiteQueryBuilder builder = new SQLiteQueryBuilder();

libs/armeabi/libsqlcipher.so

@@ -2,6 +2,7 @@
 
 import android.util.Log;
 import net.sqlcipher.database.SQLiteDatabase;
+import net.sqlcipher.database.SQLiteDatabaseHook;
 import net.zetetic.ZeteticApplication;
 
 import java.io.File;
@@ -51,11 +52,23 @@ private void internalTearDown(){
 
     protected SQLiteDatabase createDatabase(File databasePath){
         Log.i(TAG, "Before ZeteticApplication.getInstance().createDatabase");
-        return ZeteticApplication.getInstance().createDatabase(databasePath);
+        return ZeteticApplication.getInstance().createDatabase(databasePath, new SQLiteDatabaseHook() {
+            @Override
+            public void preKey(SQLiteDatabase database) {
+                createDatabasePreKey(database);
+            }
+
+            @Override
+            public void postKey(SQLiteDatabase database) {
+                createDatabasePostKey(database);
+            }
+        });
     }
 
     protected void setUp(){};
     protected void tearDown(SQLiteDatabase database){};
+    protected void createDatabasePreKey(SQLiteDatabase database){};
+    protected void createDatabasePostKey(SQLiteDatabase database){};
 
     protected void log(String message){
         Log.i(TAG, message);

libs/sqlcipher.jar

@@ -96,6 +96,7 @@ private List<SQLCipherTest> getTestsToRun(){
         tests.add(new VerifyUTF8EncodingForKeyTest());
         tests.add(new TextAsIntegerTest());
         tests.add(new TextAsDoubleTest());
+        tests.add(new TextAsLongTest());
         tests.add(new CreateNonEncryptedDatabaseTest());
         tests.add(new ChangePasswordTest());
         tests.add(new ReadableWritableInvalidPasswordTest());

libs/x86/libsqlcipher.so

@@ -4,15 +4,16 @@
 import net.sqlcipher.database.SQLiteDatabase;
 
 public class TextAsIntegerTest extends SQLCipherTest {
+
     @Override
     public boolean execute(SQLiteDatabase database) {
         database.execSQL("create table t1(a TEXT);");
-        database.execSQL("insert into t1(a) values(500);");
+        database.execSQL("insert into t1(a) values(15);");
         Cursor cursor = database.rawQuery("select * from t1;", new String[]{});
         if(cursor != null){
             cursor.moveToFirst();
             int value = cursor.getInt(0);
-            return value == 500;
+            return value == 15;
         }
         return false;
     }