sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-15 00:00:16 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'android-fixes'

Browse Source 
Fixes an upgrade issue and includes UTF8 support for EAP-MSCHAPv2.
This commit is contained in:
Tobias Brunner 2019-04-24 11:36:26 +02:00
commit 6a995a63f5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/android/app/build.gradle
View File

@ -7,8 +7,8 @@ android {
applicationId "org.strongswan.android"
minSdkVersion 15
targetSdkVersion 26
versionCode 63
versionName "2.1.0"
versionCode 64
versionName "2.1.1"
}
sourceSets.main {

4
src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileDataSource.java
View File

@ -230,7 +230,7 @@ public class VpnProfileDataSource
db.beginTransaction();
try
{
Cursor cursor = db.query(TABLE_VPNPROFILE, ALL_COLUMNS, KEY_UUID + " is NULL", null, null, null, null);
Cursor cursor = db.query(TABLE_VPNPROFILE, getColumns(16), KEY_UUID + " is NULL", null, null, null, null);
for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext())
{
ContentValues values = new ContentValues();
@ -248,7 +248,7 @@ public class VpnProfileDataSource
if (oldVersion < 17)
{
db.execSQL("ALTER TABLE " + TABLE_VPNPROFILE + " ADD " + KEY_DNS_SERVERS +
" TEXT;");
" TEXT;");
}
}