Skip to content

Commit 47d46dd

Browse files
committed
chore: keep compatibility with current published version
1 parent 6a1cde5 commit 47d46dd

File tree

2 files changed

+23
-3
lines changed

2 files changed

+23
-3
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,15 @@ public class SupportHelper implements SupportSQLiteOpenHelper {
88

99
private SQLiteOpenHelper openHelper;
1010

11-
public SupportHelper(final Configuration configuration, byte[] password, SQLiteDatabaseHook hook,
11+
public Supporthelper(final Configuration configuration, byte[] password, SQLiteDatabaseHook hook,
1212
boolean enableWriteAheadLogging) {
13+
this(configuration, password, hook, enableWriteAheadLogging, configuration.callback.version)
14+
}
15+
16+
public SupportHelper(final Configuration configuration, byte[] password, SQLiteDatabaseHook hook,
17+
boolean enableWriteAheadLogging, int minimumSupportedVersion) {
1318
openHelper = new SQLiteOpenHelper(configuration.context, configuration.name, password,
14-
null, configuration.callback.version, 0, null, hook, enableWriteAheadLogging) {
19+
null, configuration.callback.version, minimumSupportedVersion, null, hook, enableWriteAheadLogging) {
1520
@Override
1621
public void onCreate(SQLiteDatabase db) {
1722
configuration.callback.onCreate(db);

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

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,38 @@
55

66
public class SupportOpenHelperFactory implements SupportSQLiteOpenHelper.Factory {
77

8+
private static final int UNCHANGED = -1;
9+
810
private final byte[] password;
911
private final SQLiteDatabaseHook hook;
1012
private final boolean enableWriteAheadLogging;
1113

14+
private final int minimumSupportedVersion = UNCHANGED;
15+
1216
public SupportOpenHelperFactory(byte[] password){
1317
this(password, null, false);
1418
}
1519

1620
public SupportOpenHelperFactory(byte[] password, SQLiteDatabaseHook hook, boolean enableWriteAheadLogging) {
21+
this(password, hook, enableWriteAheadLogging, UNCHANGED)
22+
}
23+
24+
public SupportOpenHelperFactory(byte[] password, SQLiteDatabaseHook hook,
25+
boolean enableWriteAheadLogging, int minimumSupportedVersion) {
1726
this.password = password;
1827
this.hook = hook;
1928
this.enableWriteAheadLogging = enableWriteAheadLogging;
29+
this.minimumSupportedVersion = minimumSupportedVersion;
2030
}
2131

2232
@NonNull
2333
@Override
2434
public SupportSQLiteOpenHelper create(@NonNull SupportSQLiteOpenHelper.Configuration configuration) {
25-
return new SupportHelper(configuration, this.password, this.hook, enableWriteAheadLogging);
35+
if (minimumSupportedVersion == UNCHANGED) {
36+
return new SupportHelper(configuration, this.password, this.hook, enableWriteAheadLogging);
37+
} else {
38+
return new SupportHelper(configuration, this.password, this.hook,
39+
enableWriteAheadLogging, minimumSupportedVersion);
40+
}
2641
}
2742
}

0 commit comments

Comments
 (0)