denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages 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:37:33 +02:00
parent 8da7dbe766 8eafdc7f54
commit 6a995a63f5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/app/build.gradle
+2 -2
View File
@@ -7,8 +7,8 @@ android {
applicationId "org.strongswan.android" applicationId "org.strongswan.android"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 26 targetSdkVersion 26
versionCode 63 versionCode 64
versionName "2.1.0" versionName "2.1.1"
} }
sourceSets.main { sourceSets.main {
src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileDataSource.java
+2 -2
View File
@@ -230,7 +230,7 @@ public class VpnProfileDataSource
db.beginTransaction(); db.beginTransaction();
try 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()) for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext())
{ {
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
@@ -248,7 +248,7 @@ public class VpnProfileDataSource
if (oldVersion < 17) if (oldVersion < 17)
{ {
db.execSQL("ALTER TABLE " + TABLE_VPNPROFILE + " ADD " + KEY_DNS_SERVERS + db.execSQL("ALTER TABLE " + TABLE_VPNPROFILE + " ADD " + KEY_DNS_SERVERS +
" TEXT;"); " TEXT;");
} }
} }