Merge branch 'android-fixes'
authorTobias Brunner <tobias@strongswan.org>
Wed, 24 Apr 2019 09:36:26 +0000 (11:36 +0200)
committerTobias Brunner <tobias@strongswan.org>
Wed, 24 Apr 2019 09:37:33 +0000 (11:37 +0200)
Fixes an upgrade issue and includes UTF8 support for EAP-MSCHAPv2.

src/frontends/android/app/build.gradle
src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileDataSource.java

index 1986158..f37ece8 100644 (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 {
index 48c468e..102b279 100644 (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;");
                        }
                }