Merge lp:~matzipan/capnet-assist/no-internet-fix into lp:~elementary-apps/capnet-assist/trunk

[Zisu Andrei]

Fix assistant triggering on connections without internet

Before, if the network connection had no internet, soup would try and fetch the URL and it would timeout after about 10-15 seconds, returning a status code of 2. Because if the comparison in the isLoggedIn method, this returned false, so the captive portal would trigger even if there was no internet connection.

This MR also prevents the captive portal from closing when connection is acquired, as sometimes there is valuable information displayed there (including download links)

[lp:~matzipan/capnet-assist/no-internet-fix]

77. By Zisu Andrei on 2016-07-18

Change the assistant to use epiphany cookie store

[Zisu Andrei (matzipan)]

To test, unplug the internet connection from your router, and toggle the connection off and back on, the unpatched captive portal should kick-in after about 15 seconds. The patch version should not do that.

[Cody Garver (codygarver)]

When I join a captive network that is already known, the window appears then closes instantly. Because it has nothing to do?

[Zisu Andrei (matzipan)]

That's odd, since my branch actually removes the "Gtk.main_quit ();" on line 41, which was causing flickers.

Are you sure you installed correctly?

[Cody Garver (codygarver)]

Maybe it's because you are not performing the login check anymore before starting the browser? It's launching for any captive network you join, regardless of your previous history with the network.

[Zisu Andrei (matzipan)]

I am failing to see how the previous code took into account "history" either.

The check is still performed on line 52:
  if (browser.is_captive_portal ()) {

When you join a network, it will check if it can connect to the android URL.

If it is in a captive network and the captive portal triggers, then it will get redirected to the captive portal and soup will return the 200 status code, which means is_captive_portal will return true.

If it is in a captive network and the captive portal does not trigger (which I assume is the previously known network you're reffering to), then it means it will connect to the android connectivity checker URL, so soup will return the 204 status code, in which case is_captive_portal will return false - so the window won't even open in the first place.

It you are in a network without internet connection, before, soup would've returned status code 2, which meant that the assistant's window launched, but there was no website to display, since status code 2 means something along the lines of "connection timeout". After my changes, soup returning status 2 is ignored and is_captive_portal returns false.

[Zisu Andrei (matzipan)]

Hey Cody,

So it seems, on my end, that it happens when the web_view.load_failed gets fired, which in turn seems to call Gtk.main_quit ();

Please advise if this is the case, if yes then this is not an issue with my branch. I will come with another merge request with improvements for network failures.

[lp:~matzipan/capnet-assist/no-internet-fix]

78. By Zisu Andrei on 2016-07-19

Implement retries to increase the chance of success

[Zisu Andrei (matzipan)]

Felipe said that this merge request does not introduce any regressions.

review: Approve (test)

=== modified file 'src/CaptiveLogin.vala'
--- src/CaptiveLogin.vala	2016-02-18 01:19:52 +0000
+++ src/CaptiveLogin.vala	2016-07-18 10:54:04 +0000
@@ -102,7 +102,7 @@
         add (web_view);
     }
     
-    public bool isLoggedIn () {
+    public bool is_captive_portal () {
         var network_monitor = NetworkMonitor.get_default ();
 
         // No connection is available at the moment, don't bother trying the
@@ -120,7 +120,17 @@
         session.send_message (message);
 
         debug ("Return code: %u", message.status_code);
-        return message.status_code == 204;
+        
+        /*
+         * If there is an active connection to the internet, this will 
+         * successfully connect to the connectivity checker and return 204. 
+         * If there is no internet connection (including no captive portal), this
+         * request will fail and libsoup will return a transport failure status 
+         * code (<100).
+         * Otherwise, libsoup will resolve the redirect to the captive portal, 
+         * which will return status code 200.
+         */
+        return message.status_code == 200;
     }
 
     private void update_tls_info () {
@@ -279,11 +289,10 @@
         web_view.load_changed.connect ((view, event) => {
             switch (event) {
                 case WebKit.LoadEvent.FINISHED:
-                    if (isLoggedIn ()) {
+                    if (is_captive_portal ()) {
+                        debug ("Still not logged in.");
+                    } else {
                         debug ("Logged in!");
-                        Gtk.main_quit ();
-                    } else {
-                        debug ("Still not logged in.");
                     }
                     break;
 
@@ -325,12 +334,12 @@
 
         var browser = new ValaBrowser ();
 
-        if (!browser.isLoggedIn ()) {
+        if (browser.is_captive_portal ()) {
             debug ("Opening browser to login");
             browser.start ();
             Gtk.main ();
         } else {
-            debug ("Already logged in and connected, shutting down.");
+            debug ("Already logged in and connected, or no internet connection. Shutting down.");
         }
 
         return 0;