Adjustments for 4.5.0 release

Author: developernotes

app/src/main/java/net/zetetic/tests/CipherMigrateTest.java

@@ -22,11 +22,13 @@ public boolean execute(SQLiteDatabase database) {
                 public void preKey(SQLiteDatabase database) {}
                 public void postKey(SQLiteDatabase database) {
                     String value = QueryHelper.singleValueFromQuery(database, "PRAGMA cipher_migrate");
+                    setMessage(String.format("cipher_migrate result:%s", value));
                     status[0] = Integer.valueOf(value) == 0;
                 }
             };
-            database = SQLiteDatabase.openOrCreateDatabase(olderFormatDatabase,
-                    ZeteticApplication.DATABASE_PASSWORD, null, hook);
+            database = SQLiteDatabase.openDatabase(olderFormatDatabase.getPath(),
+                    ZeteticApplication.DATABASE_PASSWORD, null,
+              SQLiteDatabase.OPEN_READWRITE | SQLiteDatabase.CREATE_IF_NECESSARY, hook);
             if(database != null){
                 database.close();
             }

app/src/main/java/net/zetetic/tests/JavaClientLibraryVersionTest.java

@@ -5,7 +5,7 @@
 public class
 JavaClientLibraryVersionTest extends SQLCipherTest {
 
-  private final String EXPECTED_SQLCIPHER_ANDROID_VERSION = "4.4.3";
+  private final String EXPECTED_SQLCIPHER_ANDROID_VERSION = "4.5.0";
 
   @Override
   public boolean execute(SQLiteDatabase database) {

app/src/main/java/net/zetetic/tests/PragmaCipherVersionTest.java

@@ -6,7 +6,7 @@
 
 public class PragmaCipherVersionTest extends SQLCipherTest {
 
-    private final String CURRENT_CIPHER_VERSION = "4.4.3";
+    private final String CURRENT_CIPHER_VERSION = "4.5.0";
 
     @Override
     public boolean execute(SQLiteDatabase database) {

app/src/main/java/net/zetetic/tests/VerifyUTF8EncodingForKeyTest.java

@@ -4,6 +4,7 @@
 import net.sqlcipher.database.SQLiteDatabase;
 import net.sqlcipher.database.SQLiteDatabaseHook;
 import net.sqlcipher.database.SQLiteException;
+import net.sqlcipher.database.SQLiteStatement;
 import net.zetetic.ZeteticApplication;
 
 import java.io.File;
@@ -27,17 +28,26 @@ public boolean execute(SQLiteDatabase database) {
                     setMessage(String.format("Database should not open with password:%s", invalidPassword));
                     return false;
                 }
-            } catch (SQLiteException ex){}
+            } catch (SQLiteException ex){
+                log(String.format("Error opening database:%s", ex.getMessage()));
+            }
             SQLiteDatabaseHook hook = new SQLiteDatabaseHook() {
-                public void preKey(SQLiteDatabase database) {}
-                public void postKey(SQLiteDatabase database) {
-                    database.rawExecSQL("PRAGMA cipher_migrate;");
+                public void preKey(SQLiteDatabase db) {}
+                public void postKey(SQLiteDatabase db) {
+                    SQLiteStatement statement = db.compileStatement("PRAGMA cipher_migrate;");
+                    long result = statement.simpleQueryForLong();
+                    statement.close();
+                    String message = String.format("cipher_migrate result:%d", result);
+                    setMessage(message);
+                    log(message);
                 }
             };
-            sourceDatabase = SQLiteDatabase.openDatabase(sourceDatabaseFile.getPath(),
-                    password, null, SQLiteDatabase.OPEN_READWRITE, hook);
+            sourceDatabase = SQLiteDatabase.openDatabase(sourceDatabaseFile.getAbsolutePath(),
+                    password, null,
+              SQLiteDatabase.OPEN_READWRITE | SQLiteDatabase.CREATE_IF_NECESSARY, hook);
             return queryContent(sourceDatabase);
         } catch (Exception e) {
+            log(String.format("Error attempting to open database:%s", e.getMessage()));
             return false;
         }
     }

app/src/main/java/net/zetetic/tests/support/JavaClientLibraryVersionTest.java

@@ -5,7 +5,7 @@
 
 public class JavaClientLibraryVersionTest extends SupportTest {
 
-  private final String EXPECTED_SQLCIPHER_ANDROID_VERSION = "4.4.3";
+  private final String EXPECTED_SQLCIPHER_ANDROID_VERSION = "4.5.0";
 
   @Override
   public boolean execute(SQLiteDatabase database) {

app/src/main/java/net/zetetic/tests/support/PragmaCipherVersionTest.java

@@ -7,7 +7,7 @@
 
 public class PragmaCipherVersionTest extends SupportTest {
 
-    private final String CURRENT_CIPHER_VERSION = "4.4.3";
+    private final String CURRENT_CIPHER_VERSION = "4.5.0";
 
     @Override
     public boolean execute(SQLiteDatabase database) {