From 199412a8ef5efaf729421fdac1633b7199a93d14 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Mon, 15 Apr 2019 14:24:23 +0200 Subject: [PATCH 1/2] android: Fix database upgrade from older versions --- .../org/strongswan/android/data/VpnProfileDataSource.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileDataSource.java b/src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileDataSource.java index 48c468ec1a..102b279cf2 100644 --- a/src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileDataSource.java +++ b/src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileDataSource.java @@ -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;"); } } From 8eafdc7f544e2a72d5afad6a10b48a3159cbb6ed Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 16 Apr 2019 15:58:31 +0200 Subject: [PATCH 2/2] android: New release after fixing DB update and adding UTF-8 for EAP-MSCHAPv2 --- src/frontends/android/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontends/android/app/build.gradle b/src/frontends/android/app/build.gradle index 1986158571..f37ece8671 100644 --- a/src/frontends/android/app/build.gradle +++ b/src/frontends/android/app/build.gradle @@ -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 {