backup

diff --git a/res/languages/situare_fi.qm b/res/languages/situare_fi.qm
index f331e04..0daffc4 100644 (file)
Binary files a/res/languages/situare_fi.qm and b/res/languages/situare_fi.qm differ

diff --git a/res/languages/situare_fi.ts b/res/languages/situare_fi.ts
index 23fdded..64430bc 100644 (file)
--- a/res/languages/situare_fi.ts
+++ b/res/languages/situare_fi.ts
@@ -24,7 +24,7 @@
 <context>
     <name>LiblocationWrapper</name>
     <message>
-        <location filename="../../src/gps/liblocationwrapper.cpp" line="105"/>
+        <location filename="../../src/gps/liblocationwrapper.cpp" line="106"/>
         <source>Error in GPS</source>
         <translation>GPS virhe</translation>
     </message>
@@ -170,62 +170,62 @@
         <translation>Automaattinen keskitys pois päältä</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="178"/>
+        <location filename="../../src/engine/engine.cpp" line="180"/>
         <source>Unable to start GPS</source>
         <translation>GPS käynnistys epäonnistui</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="193"/>
+        <location filename="../../src/engine/engine.cpp" line="195"/>
         <source>Do you want to enable automatic location update with %1 min update interval?</source>
         <translation>Asetetaanko automaattinen paikan päivitys %1 minuutin välein päälle?</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="198"/>
+        <location filename="../../src/engine/engine.cpp" line="200"/>
         <source>Automatic location update enabled</source>
         <translation>Automaattinen paikan päivitys päällä</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="219"/>
+        <location filename="../../src/engine/engine.cpp" line="221"/>
         <source>Connection refused by the server</source>
         <translation>Palvelin ei vastaa pyyntöihin</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="222"/>
+        <location filename="../../src/engine/engine.cpp" line="224"/>
         <source>Connection closed by the server</source>
         <translation>Palvelin sulki yhteyden</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="225"/>
+        <location filename="../../src/engine/engine.cpp" line="227"/>
         <source>Remote server not found</source>
         <translation>Palvelinta ei löydy</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="228"/>
+        <location filename="../../src/engine/engine.cpp" line="230"/>
         <source>Connection timed out</source>
         <translation>Yhteys aikakatkaistiin</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="231"/>
+        <location filename="../../src/engine/engine.cpp" line="233"/>
         <source>Session expired. Please login again</source>
         <translation>Istunto vanhentunut. Kirjaudu uudelleen</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="237"/>
+        <location filename="../../src/engine/engine.cpp" line="241"/>
         <source>Invalid E-mail address or password</source>
         <translation>Virheellinen sähköpostiosoite tai salasana</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="240"/>
+        <location filename="../../src/engine/engine.cpp" line="244"/>
         <source>Update failed, please try again</source>
         <translation>Päivitys epäonnistui. Yritä uudelleen</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="243"/>
+        <location filename="../../src/engine/engine.cpp" line="247"/>
         <source>Data retrieval failed, please try again</source>
         <translation>Tiedon haku epäonnistui. Yritä uudelleen</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="246"/>
+        <location filename="../../src/engine/engine.cpp" line="250"/>
         <source>Address retrieval failed</source>
         <translation>Osoitteen haku epäonnistui</translation>
     </message>
@@ -234,34 +234,39 @@
         <translation type="obsolete">Osoitteen haku epäonnistui. Yritä uudelleen</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="249"/>
+        <location filename="../../src/engine/engine.cpp" line="253"/>
         <source>Image download failed</source>
         <translation>Kuvan haku epäonnistui</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="252"/>
+        <location filename="../../src/engine/engine.cpp" line="256"/>
         <source>Map image download failed</source>
         <translation>Karttakuvan lataaminen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="256"/>
+        <location filename="../../src/engine/engine.cpp" line="260"/>
         <source>GPS initialization failed</source>
         <translation>GPS alustus epäonnistui</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="259"/>
+        <location filename="../../src/engine/engine.cpp" line="263"/>
         <source>Unknown server response</source>
         <translation>Tuntematon vastaus palvelimelta</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="292"/>
-        <location filename="../../src/engine/engine.cpp" line="300"/>
+        <location filename="../../src/engine/engine.cpp" line="266"/>
+        <source>JSON parsing failed, invalid JSON string</source>
+        <translation>Virheellinen JSON, parsiminen epäonnistui</translation>
+    </message>
+    <message>
+        <location filename="../../src/engine/engine.cpp" line="299"/>
+        <location filename="../../src/engine/engine.cpp" line="307"/>
         <source>GPS enabled</source>
         <translation>GPS päällä</translation>
     </message>
     <message>
-        <location filename="../../src/engine/engine.cpp" line="293"/>
-        <location filename="../../src/engine/engine.cpp" line="303"/>
+        <location filename="../../src/engine/engine.cpp" line="300"/>
+        <location filename="../../src/engine/engine.cpp" line="310"/>
         <source>Auto centering enabled</source>
         <translation>Automaattinen keskitys päällä</translation>
     </message>
@@ -297,12 +302,16 @@
 <context>
     <name>UserInfo</name>
     <message>
-        <location filename="../../src/ui/userinfo.cpp" line="340"/>
         <source>Location update failed
 
 Your message is saved to textbox until sending will succeed</source>
         <translatorcomment>Do \n&apos;s work properly?</translatorcomment>
-        <translation>Sijainnin päivitys epäonnistui\n\nVistisi on tallennettu kunnes pävitys on onnistunut</translation>
+        <translation type="obsolete">Sijainnin päivitys epäonnistui\n\nVistisi on tallennettu kunnes pävitys on onnistunut</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/userinfo.cpp" line="338"/>
+        <source>Location update failed, please try again</source>
+        <translation>Paikkatiedon päivitys epäonnistui, yritä uudelleen</translation>
     </message>
 </context>
 </TS>

diff --git a/src/common.h b/src/common.h
index 3ef080f..e07964b 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -63,7 +63,8 @@ namespace SituareError {
         IMAGE_DOWNLOAD_FAILED,      // image download failed from facebook
         MAP_IMAGE_DOWNLOAD_FAILED,  // map image download failed from OSM
         GPS_INITIALIZATION_FAILED,  // GPS intialization failed
-        UNKNOWN_REPLY               // unknown reply from situare server
+        UNKNOWN_REPLY,              // unknown reply from situare server
+        INVALID_JSON                // JSON parsing failed i.e. invalid JSON string
     };
 }
 

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index 7472232..52dd36e 100644 (file)
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -262,6 +262,9 @@ void SituareEngine::error(const int error)
     case SituareError::UNKNOWN_REPLY:
         m_ui->buildInformationBox(tr("Unknown server response"), true);
         break;
+    case SituareError::INVALID_JSON:
+        m_ui->buildInformationBox(tr("JSON parsing failed, invalid JSON string"), true);
+        break;
     default:
         qCritical() << "QNetworkReply::NetworkError :" << error;
         break;
@@ -360,13 +363,10 @@ void SituareEngine::logout()
     m_loggedIn = false;
     m_ui->loggedIn(m_loggedIn);
 
-    // we use existing updateWasSuccessful signal to clear locationUpdateDialog's data
+    // signal to clear locationUpdateDialog's data
     connect(this, SIGNAL(clearUpdateLocationDialogData()),
             m_ui, SIGNAL(clearUpdateLocationDialogData()));
     emit clearUpdateLocationDialogData();
-    // disconnect immediately
-    disconnect(this, SIGNAL(clearUpdateLocationDialogData()),
-            m_ui, SIGNAL(clearUpdateLocationDialogData()));
 
     m_facebookAuthenticator->clearAccountInformation(); // clear all
     m_automaticUpdateEnabled = false;

diff --git a/src/facebookservice/facebookauthentication.cpp b/src/facebookservice/facebookauthentication.cpp
index fe3d4a5..02d83ec 100644 (file)
--- a/src/facebookservice/facebookauthentication.cpp
+++ b/src/facebookservice/facebookauthentication.cpp
@@ -132,7 +132,8 @@ bool FacebookAuthentication::updateCredentials(const QUrl &url)
                         if (!ok) {
 
                             qFatal("An error occurred during parsing");
-                            exit (1);
+                            emit error(SituareError::INVALID_JSON);
+                            found = false;
                         }
                         qDebug() << "Session Key" << result[SESSION_KEY].toString();
                         m_loginCredentials.setSessionKey(result[SESSION_KEY].toString());

diff --git a/src/situareservice/situareservice.cpp b/src/situareservice/situareservice.cpp
index 9ceaa07..af6fd3c 100644 (file)
--- a/src/situareservice/situareservice.cpp
+++ b/src/situareservice/situareservice.cpp
@@ -320,7 +320,8 @@ void SituareService::parseUserData(const QByteArray &jsonReply)
     if (!ok) {
 
         qFatal("An error occurred during parsing");
-        exit (1);
+        emit error(SituareError::INVALID_JSON);
+        return;
     }
 
     QVariant userVariant = result.value("user");