From 04a64e1312b6cc036382463b0af306e1402a35c2 Mon Sep 17 00:00:00 2001
From: Filippo Scognamiglio <flscogna@gmail.com>
Date: Wed, 21 Nov 2018 18:01:49 +0100
Subject: [PATCH] Revert "Handle db upgrades and prepare work for old profiles
 deprecation."

This reverts commit 6fb8ceb5010357cf1a8d2ae305305a793b3b33a8.
---
 app/qml/ApplicationSettings.qml | 17 +----------------
 app/qml/Storage.qml             | 28 ++--------------------------
 2 files changed, 3 insertions(+), 42 deletions(-)

diff --git a/app/qml/ApplicationSettings.qml b/app/qml/ApplicationSettings.qml
index 6df3653..1742d89 100644
--- a/app/qml/ApplicationSettings.qml
+++ b/app/qml/ApplicationSettings.qml
@@ -24,9 +24,7 @@ import QtQuick.Controls 1.0
 import "utils.js" as Utils
 
 QtObject{
-    readonly property string version: "1.0.1"
-    readonly property int profileVersion: 2
-
+    property string version: "1.0.1"
 
     // STATIC CONSTANTS ////////////////////////////////////////////////////////
 
@@ -111,8 +109,6 @@ QtObject{
 
     signal initializedSettings()
 
-    signal showErrorMessage(string message)
-
     property Loader fontManager: Loader{
         states: [
             State { when: rasterization == no_rasterization
@@ -335,17 +331,6 @@ QtObject{
         burnInQuality = settings.burnInQuality !== undefined ? settings.burnInQuality : burnInQuality;
     }
 
-    function userLoadProfileString(profileString) {
-        var profile = JSON.parse(profileString);
-        var version = profile.version !== undefined ? profile.version : 1;
-
-        if (version === profileVersion) {
-            loadProfileString(profileString);
-        } else {
-            showErrorMessage("This profile is not supported on this version of CRT.")
-        }
-    }
-
     function loadProfileString(profileString){
         var settings = JSON.parse(profileString);
 
diff --git a/app/qml/Storage.qml b/app/qml/Storage.qml
index fff7183..a95dd02 100644
--- a/app/qml/Storage.qml
+++ b/app/qml/Storage.qml
@@ -23,20 +23,9 @@ import QtQuick.LocalStorage 2.0
 
 QtObject {
     property bool initialized: false
-    property string dbVersion: "1.1"
 
     function getDatabase() {
-        try {
-            return _getDatabase(dbVersion);
-        } catch (error) {
-            console.log("Error while reading from settings database:", error);
-            updateAndResetDatabase(_getDatabase(""));
-            return _getDatabase(dbVersion);
-        }
-    }
-
-    function _getDatabase(version) {
-        return LocalStorage.openDatabaseSync("coolretroterm", version, "StorageDatabase", 100000);
+         return LocalStorage.openDatabaseSync("coolretroterm", "1.0", "StorageDatabase", 100000);
     }
 
     function initialize() {
@@ -85,22 +74,9 @@ QtObject {
 
     function dropSettings(){
         var db = getDatabase();
-        dropSettingsFromDB(db);
-    }
-
-    function updateAndResetDatabase(db) {
-        console.log("Updating and resetting database.");
-        db.changeVersion(db.version, dbVersion);
-
-        try {
-            dropSettingsFromDB(db);
-        } catch (error) {}
-    }
-
-    function dropSettingsFromDB(db) {
         db.transaction(
             function(tx) {
                 tx.executeSql('DROP TABLE settings');
-        });
+          });
     }
 }