SQLCipher for Android 3.0.0 binaries, test adjustments

Author: developernotes

libs/armeabi/libsqlcipher_android.so

@@ -11,6 +11,7 @@
         <option name="PROGUARD_CFG_PATH" value="/proguard.cfg" />
         <includeSystemProguardFile>false</includeSystemProguardFile>
         <includeAssetsFromLibraries>true</includeAssetsFromLibraries>
+        <option name="COMPILE_CUSTOM_GENERATED_SOURCES" value="false" />
         <resOverlayFolders />
       </configuration>
     </facet>
@@ -25,7 +26,6 @@
       <excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-assets" />
       <excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-resources" />
       <excludeFolder url="file://$MODULE_DIR$/target/generated-sources/extracted-dependencies" />
-      <excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="jdk" jdkName="Maven Android 2.1 Platform" jdkType="Android SDK" />

libs/sqlcipher.jar

@@ -0,0 +1,43 @@
+package net.zetetic.tests;
+
+import android.util.Log;
+import net.sqlcipher.database.SQLiteDatabase;
+import net.sqlcipher.database.SQLiteDatabaseHook;
+import net.zetetic.QueryHelper;
+import net.zetetic.ZeteticApplication;
+
+import java.io.File;
+
+public class CipherMigrateTest extends SQLCipherTest {
+
+    File olderFormatDatabase = ZeteticApplication.getInstance().getDatabasePath("2x.db");
+
+    @Override
+    public boolean execute(SQLiteDatabase database) {
+        database.close();
+        final boolean[] status = {false};
+        try {
+            ZeteticApplication.getInstance().extractAssetToDatabaseDirectory("2x.db");
+            SQLiteDatabaseHook hook = new SQLiteDatabaseHook() {
+                public void preKey(SQLiteDatabase database) {}
+                public void postKey(SQLiteDatabase database) {
+                    String value = QueryHelper.singleValueFromQuery(database, "PRAGMA cipher_migrate");
+                    status[0] = Integer.valueOf(value) == 0;
+                }
+            };
+            database = SQLiteDatabase.openOrCreateDatabase(olderFormatDatabase,
+                    ZeteticApplication.DATABASE_PASSWORD, null, hook);
+            if(database != null){
+                database.close();
+            }
+        } catch (Exception e) {
+            Log.i(TAG, "error", e);
+        }
+        return status[0];
+    }
+
+    @Override
+    public String getName() {
+        return "Cipher Migrate Test";
+    }
+}

libs/x86/libsqlcipher_android.so

@@ -29,18 +29,13 @@ public boolean execute(SQLiteDatabase database) {
             File sourceDatabase = ZeteticApplication.getInstance().getDatabasePath(ZeteticApplication.ONE_X_USER_VERSION_DATABASE);
             SQLiteDatabase originalDatabase = SQLiteDatabase.openOrCreateDatabase(sourceDatabase, password, null, new SQLiteDatabaseHook() {
                 public void preKey(SQLiteDatabase database) {
-                    database.rawExecSQL("PRAGMA cipher_default_use_hmac=off;");
                 }
                 public void postKey(SQLiteDatabase database) {
                     database.rawExecSQL("PRAGMA cipher_migrate;");
                 }
             });
-            int userVersion = originalDatabase.getVersion();
-            originalDatabase.close();
-            SQLiteDatabase.upgradeDatabaseFormatFromVersion1To2(sourceDatabase, password);
-            SQLiteDatabase migratedDatabase = SQLiteDatabase.openOrCreateDatabase(sourceDatabase, password, null, null);
-            migratedDatabase.setVersion(userVersion);
-            return migratedDatabase.getVersion() == userVersion;
+            return originalDatabase.getVersion() > 0;
+
         } catch (Exception e) {
             return false;
         }

net.zetetic.sqlcipher.test.iml

@@ -40,6 +40,7 @@ private void runSuite(){
 
     private List<SQLCipherTest> getTestsToRun(){
         List<SQLCipherTest> tests = new ArrayList<SQLCipherTest>();
+        tests.add(new CipherMigrateTest());
         tests.add(new GetTypeFromCrossProcessCursorWrapperTest());
         tests.add(new InvalidPasswordTest());
         tests.add(new NullQueryResultTest());