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

sjlombardo · sjlombardo · commit cd681ad5a3cd · 2023-06-28T14:49:04.000-04:00
diff --git a/sqlcipher/src/androidTest/java/net/zetetic/database/sqlcipher_cts/SupportHelperTest.java b/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)
diff --git a/sqlcipher/src/main/java/net/zetetic/database/sqlcipher/SQLiteDatabase.java b/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;
         }
     }
diff --git a/sqlcipher/src/main/java/net/zetetic/database/sqlcipher/SupportHelper.java b/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,

Original file line number	Diff line number	Diff line change
`@@ -1634,7 +1634,7 @@ public long insert(String table, String nullColumnHack, ContentValues values) {`
`1634`	`1634`	`try {`
`1635`	`1635`	`return insertWithOnConflict(table, nullColumnHack, values, CONFLICT_NONE);`
`1636`	`1636`	`} catch (SQLException e) {`
`1637`		`- Log.e(TAG, "Error inserting " + values, e);`
	`1637`	`+ Log.e(TAG, "Error inserting", e);`
`1638`	`1638`	`return -1;`
`1639`	`1639`	`}`
`1640`	`1640`	`}`
`@@ -1682,7 +1682,7 @@ public long replace(String table, String nullColumnHack, ContentValues initialVa`
`1682`	`1682`	`return insertWithOnConflict(table, nullColumnHack, initialValues,`
`1683`	`1683`	`CONFLICT_REPLACE);`
`1684`	`1684`	`} catch (SQLException e) {`
`1685`		`- Log.e(TAG, "Error inserting " + initialValues, e);`
	`1685`	`+ Log.e(TAG, "Error inserting", e);`
`1686`	`1686`	`return -1;`
`1687`	`1687`	`}`
`1688`	`1688`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public class SupportHelper implements SupportSQLiteOpenHelper {`
`10`	`10`
`11`	`11`	`public SupportHelper(final Configuration configuration, byte[] password, SQLiteDatabaseHook hook,`
`12`	`12`	`boolean enableWriteAheadLogging) {`
`13`		`- this(configuration, password, hook, enableWriteAheadLogging, configuration.callback.version);`
	`13`	`+ this(configuration, password, hook, enableWriteAheadLogging, 0);`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public SupportHelper(final Configuration configuration, byte[] password, SQLiteDatabaseHook hook,`