denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: Add database migration for managed certificates

Browse Source
This commit is contained in:
Markus Pfeiffer
2024-02-21 12:24:53 +01:00
committed by Tobias Brunner
parent 6882f17741
commit e2f505350e
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/app/src/main/java/org/strongswan/android/data/DatabaseHelper.java
+20 -1
View File
@@ -40,6 +40,8 @@ public class DatabaseHelper extends SQLiteOpenHelper
private static final String DATABASE_NAME = "strongswan.db"; private static final String DATABASE_NAME = "strongswan.db";
private static final String TABLE_NAME_VPN_PROFILE = "vpnprofile"; private static final String TABLE_NAME_VPN_PROFILE = "vpnprofile";
private static final String TABLE_NAME_TRUSTED_CERTIFICATE = "trustedcertificate";
private static final String TABLE_NAME_USER_CERTIFICATE = "usercertificate";
static final DbTable TABLE_VPN_PROFILE = new DbTable(TABLE_NAME_VPN_PROFILE, 1, new DbColumn[]{ static final DbTable TABLE_VPN_PROFILE = new DbTable(TABLE_NAME_VPN_PROFILE, 1, new DbColumn[]{
new DbColumn(VpnProfileDataSource.KEY_ID, "INTEGER PRIMARY KEY AUTOINCREMENT", 1), new DbColumn(VpnProfileDataSource.KEY_ID, "INTEGER PRIMARY KEY AUTOINCREMENT", 1),
@@ -67,7 +69,22 @@ public class DatabaseHelper extends SQLiteOpenHelper
new DbColumn(VpnProfileDataSource.KEY_DNS_SERVERS, "TEXT", 17), new DbColumn(VpnProfileDataSource.KEY_DNS_SERVERS, "TEXT", 17),
}); });
private static final int DATABASE_VERSION = 17; public static final DbTable TABLE_TRUSTED_CERTIFICATE = new DbTable(TABLE_NAME_TRUSTED_CERTIFICATE, 18, new DbColumn[]{
new DbColumn(ManagedCertificate.KEY_ID, "INTEGER PRIMARY KEY AUTOINCREMENT", 18),
new DbColumn(ManagedCertificate.KEY_VPN_PROFILE_UUID, "TEXT UNIQUE", 18),
new DbColumn(ManagedCertificate.KEY_ALIAS, "TEXT NOT NULL", 18),
new DbColumn(ManagedCertificate.KEY_DATA, "TEXT NOT NULL", 18),
});
public static final DbTable TABLE_USER_CERTIFICATE = new DbTable(TABLE_NAME_USER_CERTIFICATE, 18, new DbColumn[]{
new DbColumn(ManagedCertificate.KEY_ID, "INTEGER PRIMARY KEY AUTOINCREMENT", 18),
new DbColumn(ManagedCertificate.KEY_VPN_PROFILE_UUID, "TEXT UNIQUE", 18),
new DbColumn(ManagedCertificate.KEY_ALIAS, "TEXT NOT NULL", 18),
new DbColumn(ManagedCertificate.KEY_DATA, "TEXT NOT NULL", 18),
new DbColumn(ManagedUserCertificate.KEY_PASSWORD, "TEXT", 18),
});
private static final int DATABASE_VERSION = 18;
private static final Set<DbTable> TABLES; private static final Set<DbTable> TABLES;
@@ -75,6 +92,8 @@ public class DatabaseHelper extends SQLiteOpenHelper
{ {
TABLES = new HashSet<>(); TABLES = new HashSet<>();
TABLES.add(TABLE_VPN_PROFILE); TABLES.add(TABLE_VPN_PROFILE);
TABLES.add(TABLE_TRUSTED_CERTIFICATE);
TABLES.add(TABLE_USER_CERTIFICATE);
} }
public DatabaseHelper(Context context) public DatabaseHelper(Context context)