diff --git a/qml/js/WallaBase.js b/qml/js/WallaBase.js
index 19d2100..a07ef0f 100644
--- a/qml/js/WallaBase.js
+++ b/qml/js/WallaBase.js
@@ -857,8 +857,7 @@ function createLatestDatabase( db )
"password TEXT NOT NULL, " +
"clientId TEXT NOT NULL, " +
"clientSecret TEXT NOT NULL, " +
- "lastSync INTEGER DEFAULT 0," +
- "fetchUnread INTEGER DEFAULT 0" +
+ "lastSync INTEGER DEFAULT 0" +
")"
);
@@ -936,14 +935,24 @@ function _updateSchema_v3( db )
);
}
+var errorFlag = false;
function _updateSchema_v4( db )
{
db.transaction(
- function( tx ) {
- tx.executeSql( "ALTER TABLE servers ADD COLUMN fetchUnread INTEGER DEFAULT 0" );
- tx.executeSql( "UPDATE servers SET fetchUnread=0" );
+ function ( tx ) {
+ try {
+ tx.executeSql( "ALTER TABLE servers ADD COLUMN fetchUnread INTEGER DEFAULT 0" );
+ tx.executeSql( "UPDATE servers SET fetchUnread=0" );
+ } catch ( e ) {
+ if ( errorFlag ) throw e;
+
+ errorFlag = true;
+ resetDatabase();
+ _updateSchema_v4( db );
+ }
db.changeVersion( db.version, "0.4" );
}
);
}
+
diff --git a/qml/pages/ArticlePage.qml b/qml/pages/ArticlePage.qml
index cb6d2d8..413e9d2 100644
--- a/qml/pages/ArticlePage.qml
+++ b/qml/pages/ArticlePage.qml
@@ -21,6 +21,9 @@
import QtQuick 2.0
import Sailfish.Silica 1.0
+import Sailfish.WebView 1.0
+import Sailfish.WebEngine 1.0
+import Sailfish.WebView.Popups 1.0
Page {
id: articlePage
@@ -29,7 +32,7 @@ Page {
property string title
property string content
- SilicaWebView {
+ WebView {
id: webview
anchors.fill: parent
@@ -42,9 +45,13 @@ Page {
var html =
"" +
"" +
+ "" +
"" +
"" +
"" +