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

[Zisu Andrei]

This code is logically broken. With it, in all cases when a connection is faulty, the method will return true (which means it detected a captive portal). Which would give a lot of false positives.

On faulty internet connections, this code will cause the capnet to pop up for a split second before closing again.

[Corentin Noël (tintou)]

Shouldn't it return false then ?

[Danielle Foré (danrabbit)]

I believe that here FULL is according to network manager, which it would be even if it was a captive portal. so it's supposed to bail out if we're not connected to "the internet" (as far as network manager knows). This is to protect against launching capnet on intranets

[Zisu Andrei (matzipan)]

No, it shouldn't, that's the english equivalent of saying "if it's not a full connection, it's not a captive portal", which would imply captive portals only have full connectivity, which by definition is not what a captive portal is.

And if it returns true (like it is in trunk), it means that _everything_ that is not a full connection, is a captive portal. Which again is not true (for example, faulty internet connections or some internet connections).

@Dan capnet will not be launched on intranets because the connectivity request after will not return 200.

[Zisu Andrei (matzipan)]

In my last comment, replace "some internet connections" with "some intranet connections"

Unmerged revisions

125. By Zisu Andrei on 2016-12-20

Fix capnet popping up when no network connection is available

=== modified file 'src/Application.vala'
--- src/Application.vala	2016-09-08 21:00:07 +0000
+++ src/Application.vala	2016-12-20 19:15:01 +0000
@@ -28,12 +28,6 @@
     private bool is_captive_portal () {
         var network_monitor = NetworkMonitor.get_default ();
 
-        // No connection is available at the moment, don't bother trying the
-        // connectivity check
-        if (network_monitor.get_connectivity () != NetworkConnectivity.FULL) {
-            return true;
-        }
-
         var page = "http://connectivitycheck.android.com/generate_204";
         debug ("Getting 204 page");