Merge branch 'master' of ssh://git.zetetic.net/sqlcipher-android

Author: sjlombardo

sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SupportHelperTest.java

@@ -48,7 +48,7 @@ public void shouldCreateDatabaseNormallyWithInitialVersion() {
     }
 
     @Test
-    public void shouldRunUpgradeFromVersion1ToVersion2() {
+    public void shouldRunUpgradeFromVersion1ToVersion2WhenMinSupportedVersionIsProvided() {
         FakeCallback initialCallback = new FakeCallback(1);
 
         SupportHelper initialHelper = new SupportHelper(createConfiguration(initialCallback), null, null, true);
@@ -71,6 +71,29 @@ public void shouldRunUpgradeFromVersion1ToVersion2() {
         assertEquals(1, callbackWrapper.callbackCount[UPGRADE_INDEX]);
     }
 
+    @Test
+    public void shouldRunUpgradeFromVersion1ToVersion2() {
+        FakeCallback initialCallback = new FakeCallback(1);
+
+        SupportHelper initialHelper = new SupportHelper(createConfiguration(initialCallback), null, null, true);
+
+        initialHelper.getWritableDatabase();
+        initialHelper.close();
+
+        assertEquals(1, initialCallback.callbackCount[CREATION_INDEX]);
+        assertEquals(0, initialCallback.callbackCount[UPGRADE_INDEX]);
+
+        FakeCallback callbackWrapper = new FakeCallback(2);
+
+        SupportHelper helper = new SupportHelper(createConfiguration(callbackWrapper), null, null, true);
+
+        helper.getWritableDatabase();
+        helper.close();
+
+        assertEquals(0, callbackWrapper.callbackCount[CREATION_INDEX]);
+        assertEquals(1, callbackWrapper.callbackCount[UPGRADE_INDEX]);
+    }
+
     private SupportSQLiteOpenHelper.Configuration createConfiguration(SupportSQLiteOpenHelper.Callback callback) {
         Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
         return SupportSQLiteOpenHelper.Configuration.builder(context)

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

@@ -1634,7 +1634,7 @@ public long insert(String table, String nullColumnHack, ContentValues values) {
         try {
             return insertWithOnConflict(table, nullColumnHack, values, CONFLICT_NONE);
         } catch (SQLException e) {
-            Log.e(TAG, "Error inserting " + values, e);
+            Log.e(TAG, "Error inserting", e);
             return -1;
         }
     }
@@ -1682,7 +1682,7 @@ public long replace(String table, String nullColumnHack, ContentValues initialVa
             return insertWithOnConflict(table, nullColumnHack, initialValues,
                     CONFLICT_REPLACE);
         } catch (SQLException e) {
-            Log.e(TAG, "Error inserting " + initialValues, e);
+            Log.e(TAG, "Error inserting", e);
             return -1;
         }
     }

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

@@ -10,7 +10,7 @@ public class SupportHelper implements SupportSQLiteOpenHelper {
 
   public SupportHelper(final Configuration configuration, byte[] password, SQLiteDatabaseHook hook,
                        boolean enableWriteAheadLogging) {
-    this(configuration, password, hook, enableWriteAheadLogging, configuration.callback.version);
+    this(configuration, password, hook, enableWriteAheadLogging, 0);
   }
 
   public SupportHelper(final Configuration configuration, byte[] password, SQLiteDatabaseHook hook,