@@ -28,6 +28,7 @@ function authenticate() {

     xhr.onload = function () {

       if (xhr.readyState === 4) {

+        retry=0;

         console.log('------authentication request returned');

         if(xhr.status == 200) {

           response = JSON.parse(xhr.responseText);

@@ -69,11 +70,11 @@ function authenticate() {

         authenticate();

       }else{

         console.log('------Authentication timed out a second time');

-	//send back "timeout" to watch

-	auth="";

-	message ="Authentication timed out, verify settings and connectivity";

+        //send back "timeout" to watch

+        auth="";

+        message ="Authentication timed out, verify settings and connectivity";

-	// Build message

+        // Build message

         var dict = {

           'auth': message,

         };

@@ -105,30 +106,62 @@ function get_status() {

       var server=localStorage.getItem('server');

       url = server + "/webapi/entry.cgi?api=SYNO.SurveillanceStation.HomeMode&version=1&method=GetInfo&_sid="+sid;

       var xhr = new XMLHttpRequest();

+      xhr.timeout = 3000; // time in milliseconds

-      xhr.open("GET", url,false);

-      xhr.send();

+      xhr.open("GET", url,true);

-      if(xhr.status == 200) {

-        response = JSON.parse(xhr.responseText);

-        if (response.success == true){

-          status=response.data.on;   

-          var message;

-          switch (status) {

-            case true:

-              message = "Your Home mode is ON";

-              break;

-            case false:

-              message = "Your Home mode is OFF";

-              break;

-            default:

-              message = "home mode is unknown !";

-          }      

+      xhr.onload = function () {

+        if (xhr.readyState === 4) {

+          retry=0;

+          console.log('------Get-status request returned');

+          if(xhr.status == 200) {

+            response = JSON.parse(xhr.responseText);

+            if (response.success == true){

+              status=response.data.on;   

+              var message;

+              switch (status) {

+                case true:

+                  message = "Your Home mode is ON";

+                  break;

+                case false:

+                  message = "Your Home mode is OFF";

+                  break;

+                default:

+                  message = "home mode is unknown !";

+              }      

+              // Build message

+              var dict = {

+                'status': message,

+              };

+            

+              // Send the message

+              Pebble.sendAppMessage(dict, function(e) {

+                console.log('sent');

+              }, function() {

+                console.log('failed');

+              });

+            }

+          }else {

+            console.log('------Request returned error code ' + xhr.status);

+          }

+        }

+      }

+

+      xhr.ontimeout = function (e){

+        retry++;

+        if (retry<=1){

+          console.log('------Get-Status timed out retrying another time ');

+          get_status();

+        }else{

+          console.log('------Get-Status timed out a second time');

+          //send back "timeout" to watch

+          message ="Get-Status timed out, verify settings and connectivity";

+  

           // Build message

           var dict = {

             'status': message,

           };

-        

+  

           // Send the message

           Pebble.sendAppMessage(dict, function(e) {

             console.log('sent');

@@ -136,9 +169,11 @@ function get_status() {

             console.log('failed');

           });

         }

-      }else {

-        console.log('------Request returned error code ' + xhr.status.toString());

       }

+

+      xhr.send();

+

+      

     }else{

       Pebble.showSimpleNotificationOnPebble("DSCam H-S", "You need to set your Synology account and server.");

     }

@@ -272,3 +307,4 @@ Pebble.addEventListener('appmessage', function(e) {

   }

 });

+