From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 15 Apr 2019 12:24:23 +0000 (+0200)
Subject: android: Fix database upgrade from older versions
X-Git-Tag: 5.8.0rc1~29^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=199412a8ef5efaf729421fdac1633b7199a93d14;p=thirdparty%2Fstrongswan.git

android: Fix database upgrade from older versions
---

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;");
 			}
 		}