Merge lp:~lemonboy/capnet-assist/check-network-connectivity into lp:~elementary-apps/capnet-assist/trunk

[The Lemon Man]

Make sure the network is available before checking for connectivity.

[Corentin Noël (tintou)]

Works like a charm here

review: Approve

[Adam Bieńkowski (donadigo)]

Code: nothing to point out really.

review: Approve (code)

=== modified file 'src/CaptiveLogin.vala'
--- src/CaptiveLogin.vala	2015-06-06 23:51:51 +0000
+++ src/CaptiveLogin.vala	2015-10-21 18:58:25 +0000
@@ -52,6 +52,14 @@
     }
     
     public bool isLoggedIn () {
+        var network_monitor = NetworkMonitor.get_default ();
+
+        // No connection is available at the moment, don't bother trying the
+        // connectivity check
+        if (!network_monitor.get_network_available ()) {
+            return true;
+        }
+
         var page = "http://connectivitycheck.android.com/generate_204";
         debug ("Getting 204 page");
 

=== modified file 'src/config.vala'
--- src/config.vala	2013-08-22 15:09:15 +0000
+++ src/config.vala	2015-10-21 18:58:25 +0000
@@ -15,5 +15,5 @@
  */
 
 namespace Constants {
-    public const string VERSION = "0.1";
+    public const string VERSION = "0.1.1";
 }