Updated SQLCipher for Android libraries to 2.0.0-RC7 and added

unencrypted import test.

Author: developernotes

assets/unencrypted.db

@@ -14,6 +14,7 @@ public class ZeteticApplication extends Application {
     private Activity activity;
     public static final String TAG = "Zetetic";
     public static final String ONE_X_DATABASE = "1x.db";
+    public static final String UNENCRYPTED_DATABASE = "unencrypted.db";
 
     public ZeteticApplication(){
         instance = this;
@@ -41,11 +42,11 @@ public SQLiteDatabase createDatabase(File databaseFile){
         return SQLiteDatabase.openOrCreateDatabase(databaseFile, DATABASE_PASSWORD, null);
     }
 
-    public void extract1xDatabaseToDatabaseDirectory() throws IOException {
+    public void extractAssetToDatabaseDirectory(String fileName) throws IOException {
 
         int length;
-        InputStream sourceDatabase = ZeteticApplication.getInstance().getAssets().open(ONE_X_DATABASE);
-        File destinationPath = ZeteticApplication.getInstance().getDatabasePath(ONE_X_DATABASE);
+        InputStream sourceDatabase = ZeteticApplication.getInstance().getAssets().open(fileName);
+        File destinationPath = ZeteticApplication.getInstance().getDatabasePath(fileName);
         OutputStream destination = new FileOutputStream(destinationPath);
 
         byte[] buffer = new byte[4096];

libs/armeabi/libsqlcipher_android.so

@@ -13,7 +13,7 @@ public class AttachExistingDatabaseTest extends SQLCipherTest {
     public boolean execute(SQLiteDatabase database) {
 
         try {
-            ZeteticApplication.getInstance().extract1xDatabaseToDatabaseDirectory();
+            ZeteticApplication.getInstance().extractAssetToDatabaseDirectory(ZeteticApplication.ONE_X_DATABASE);
             File other = ZeteticApplication.getInstance().getDatabasePath(ZeteticApplication.ONE_X_DATABASE);
             String otherPath = other.getAbsolutePath();
             String attach = String.format("attach database ? as other key ?");

libs/sqlcipher.jar

@@ -0,0 +1,54 @@
+package net.zetetic.tests;
+
+import android.database.Cursor;
+import net.sqlcipher.database.SQLiteDatabase;
+import net.zetetic.ZeteticApplication;
+
+import java.io.File;
+import java.io.IOException;
+
+public class ImportUnencryptedDatabaseTest extends SQLCipherTest {
+
+    @Override
+    public boolean execute(SQLiteDatabase database) {
+
+        File unencryptedDatabase = ZeteticApplication.getInstance().getDatabasePath("unencrypted.db");
+        File encryptedDatabase = ZeteticApplication.getInstance().getDatabasePath("encrypted.db");
+
+        try {
+            ZeteticApplication.getInstance().extractAssetToDatabaseDirectory("unencrypted.db");
+
+            database.close();
+            database = SQLiteDatabase.openOrCreateDatabase(unencryptedDatabase, "", null);
+            database.rawExecSQL(String.format("ATTACH DATABASE '%s' AS encrypted KEY '%s'",
+                                encryptedDatabase.getAbsolutePath(), ZeteticApplication.DATABASE_PASSWORD));
+            database.rawExecSQL("select sqlcipher_export('encrypted')");
+            database.rawExecSQL("DETACH DATABASE encrypted");
+            database.close();
+
+            database = SQLiteDatabase.openOrCreateDatabase(encryptedDatabase, ZeteticApplication.DATABASE_PASSWORD,
+                                                           null);
+            Cursor cursor = database.rawQuery("select * from t1", new String[]{});
+            cursor.moveToFirst();
+            String a = cursor.getString(0);
+            String b = cursor.getString(1);
+            cursor.close();
+            database.close();
+
+            return a.equals("one for the money") &&
+                   b.equals("two for the show");
+
+        } catch (IOException e) {
+            return false;
+        }
+        finally {
+            unencryptedDatabase.delete();
+            encryptedDatabase.delete();
+        }
+    }
+
+    @Override
+    public String getName() {
+        return "Import Unencrypted Database Test";
+    }
+}

net.zetetic.sqlcipher.test.iws

@@ -13,7 +13,7 @@ public boolean execute(SQLiteDatabase database) {
 
         try {
             String password = ZeteticApplication.DATABASE_PASSWORD;
-            ZeteticApplication.getInstance().extract1xDatabaseToDatabaseDirectory();
+            ZeteticApplication.getInstance().extractAssetToDatabaseDirectory(ZeteticApplication.ONE_X_DATABASE);
             File sourceDatabase = ZeteticApplication.getInstance().getDatabasePath(ZeteticApplication.ONE_X_DATABASE);
             SQLiteDatabase.upgradeDatabaseFormatFromVersion1To2(sourceDatabase, password);
 

src/main/java/net/zetetic/ZeteticApplication.java

@@ -53,6 +53,7 @@ private List<SQLCipherTest> getTestsToRun(){
         tests.add(new MigrationFromDatabaseFormat1To2());
         tests.add(new StatusMemoryUsedTest());
         tests.add(new PragmaCipherVersionTest());
+        tests.add(new ImportUnencryptedDatabaseTest());
         return tests;
     }
 }