Merge pull request #82 from SUPLA/develop

v2.3.14
SUPLA · Jul 6, 2019 · fbee73e · fbee73e
2 parents 8ca6f5d + 2601cdc
commit fbee73e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 12 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.supla.android"
         minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
-        versionCode 67
-        versionName "2.3.13"
+        versionCode 68
+        versionName "2.3.14"
 
         sourceSets.main {
             jniLibs.srcDir 'src/main/libs'

diff --git a/app/src/main/java/org/supla/android/db/DbHelper.java b/app/src/main/java/org/supla/android/db/DbHelper.java
@@ -21,6 +21,7 @@ of the License, or (at your option) any later version.
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
+import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
@@ -68,6 +69,18 @@ private void execSQL(SQLiteDatabase db, String sql) {
         db.execSQL(sql);
     }
 
+    private void addColumn(SQLiteDatabase db, String sql) {
+        try {
+            execSQL(db, sql);
+        } catch(SQLException e) {
+            if ( !e.getMessage().contains("duplicate column name:") ) {
+                throw e;
+            } else {
+                e.getStackTrace();
+            }
+        }
+    }
+
     private void createIndex(SQLiteDatabase db, String tableName, String fieldName) {
         final String SQL_CREATE_INDEX = "CREATE INDEX " + tableName + "_"
                 + fieldName + "_index ON " + tableName + "(" + fieldName + ")";
@@ -554,15 +567,15 @@ private void upgradeToV2(SQLiteDatabase db) {
 
     private void upgradeToV3(SQLiteDatabase db) {
         Trace.d(DbHelper.class.getName(), "upgradeToV3");
-        execSQL(db, "ALTER TABLE " + SuplaContract.ChannelEntry.TABLE_NAME
+        addColumn(db, "ALTER TABLE " + SuplaContract.ChannelEntry.TABLE_NAME
                 + " ADD COLUMN " + SuplaContract.ChannelEntry.COLUMN_NAME_ALTICON
                 + " INTEGER NOT NULL default 0");
 
-        execSQL(db, "ALTER TABLE " + SuplaContract.ChannelEntry.TABLE_NAME
+        addColumn(db, "ALTER TABLE " + SuplaContract.ChannelEntry.TABLE_NAME
                 + " ADD COLUMN " + SuplaContract.ChannelEntry.COLUMN_NAME_FLAGS
                 + " INTEGER NOT NULL default 0");
 
-        execSQL(db, "ALTER TABLE " + SuplaContract.ChannelEntry.TABLE_NAME
+        addColumn(db, "ALTER TABLE " + SuplaContract.ChannelEntry.TABLE_NAME
                 + " ADD COLUMN " + SuplaContract.ChannelEntry.COLUMN_NAME_PROTOCOLVERSION
                 + " INTEGER NOT NULL default 0");
     }
@@ -607,31 +620,31 @@ private void upgradeToV6(SQLiteDatabase db) {
 
         createElectricityMeterLogTable(db);
 
-        execSQL(db, "ALTER TABLE " + SuplaContract.ChannelEntry.TABLE_NAME
+        addColumn(db, "ALTER TABLE " + SuplaContract.ChannelEntry.TABLE_NAME
                 + " ADD COLUMN " + SuplaContract.ChannelEntry.COLUMN_NAME_DEVICEID
                 + " INTEGER NOT NULL default 0");
 
-        execSQL(db, "ALTER TABLE " + SuplaContract.ChannelEntry.TABLE_NAME
+        addColumn(db, "ALTER TABLE " + SuplaContract.ChannelEntry.TABLE_NAME
                 + " ADD COLUMN " + SuplaContract.ChannelEntry.COLUMN_NAME_USERICON
                 + " INTEGER NOT NULL default 0");
 
-        execSQL(db, "ALTER TABLE " + SuplaContract.ChannelEntry.TABLE_NAME
+        addColumn(db, "ALTER TABLE " + SuplaContract.ChannelEntry.TABLE_NAME
                 + " ADD COLUMN " + SuplaContract.ChannelEntry.COLUMN_NAME_MANUFACTURERID
                 + " SMALLINT NOT NULL default 0");
 
-        execSQL(db, "ALTER TABLE " + SuplaContract.ChannelEntry.TABLE_NAME
+        addColumn(db, "ALTER TABLE " + SuplaContract.ChannelEntry.TABLE_NAME
                 + " ADD COLUMN " + SuplaContract.ChannelEntry.COLUMN_NAME_TYPE
                 + " INTEGER NOT NULL default 0");
 
-        execSQL(db, "ALTER TABLE " + SuplaContract.ChannelEntry.TABLE_NAME
+        addColumn(db, "ALTER TABLE " + SuplaContract.ChannelEntry.TABLE_NAME
                 + " ADD COLUMN " + SuplaContract.ChannelEntry.COLUMN_NAME_PRODUCTID
                 + " SMALLINT NOT NULL default 0");
 
-        execSQL(db, "ALTER TABLE " + SuplaContract.ChannelGroupEntry.TABLE_NAME
+        addColumn(db, "ALTER TABLE " + SuplaContract.ChannelGroupEntry.TABLE_NAME
                 + " ADD COLUMN " + SuplaContract.ChannelEntry.COLUMN_NAME_USERICON
                 + " INTEGER NOT NULL default 0");
 
-        execSQL(db, "ALTER TABLE " + SuplaContract.LocationEntry.TABLE_NAME
+        addColumn(db, "ALTER TABLE " + SuplaContract.LocationEntry.TABLE_NAME
                 + " ADD COLUMN " + SuplaContract.LocationEntry.COLUMN_NAME_COLLAPSED
                 + " INTEGER NOT NULL default 0");