Merge lp:~philip.scott/capnet-assist/capnet-app-uniqueness into lp:~elementary-apps/capnet-assist/trunk

[Felipe Escoto]

Add Application Uniqueness

Prevent the capnet assist from launching twice

[Danielle Foré (danrabbit)]

I can confirm that this branch functions and ensures uniqueness. Some comments inline.

[lp:~philip.scott/capnet-assist/capnet-app-uniqueness]

94. By Felipe Escoto on 2016-09-08

Add Application.vala

[Danielle Foré (danrabbit)]

One little bitesize typo :)

review: Needs Fixing

[Leonardo Lemos (leonardolemos)]

You missed the letter 'e' in the string 'elementary Developers' localed at Application.vala.

[lp:~philip.scott/capnet-assist/capnet-app-uniqueness]

95. By Felipe Escoto on 2016-09-08

corrected typo on license

[Danielle Foré (danrabbit)]

review: Approve

[Danielle Foré (danrabbit)]

Works for me :)

review: Approve

=== added file 'src/Application.vala'
--- src/Application.vala	1970-01-01 00:00:00 +0000
+++ src/Application.vala	2016-09-08 18:44:19 +0000
@@ -0,0 +1,49 @@
+/*
+* Copyright (c) 2016 elementary LLC (https://launchpad.net/capnet-assist)
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public
+* License as published by the Free Software Foundation; either
+* version 2 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+* Boston, MA 02111-1307, USA.
+*/
+
+public class Captive.Application : Gtk.Application {
+
+    public Application () {
+        Object (application_id: "org.pantheon.captive-login");
+    }
+
+    public override void activate () {
+        if (!is_busy) {
+            mark_busy ();
+
+            var browser = new ValaBrowser (this);
+            if (browser.is_captive_portal ()) {
+                debug ("Opening browser to login");
+                browser.start ();
+            } else {
+                debug ("Already logged in and connected, or no internet connection. Shutting down.");
+                quit ();
+            }
+        }
+    }
+
+    public static int main (string[] args) {
+        Environment.set_application_name (Constants.APP_NAME);
+        Environment.set_prgname (Constants.APP_NAME);
+
+        var application = new Captive.Application ();
+
+        return application.run (args);
+    }
+}

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-08-28 16:08:41 +0000
+++ src/CMakeLists.txt	2016-09-08 18:44:19 +0000
@@ -37,6 +37,7 @@
 vala_precompile(VALA_C
     config.vala
     CaptiveLogin.vala
+    Application.vala
 PACKAGES
     ${CAPTIVE_LOGIN_PACKAGES}
 OPTIONS

=== modified file 'src/CaptiveLogin.vala'
--- src/CaptiveLogin.vala	2016-09-08 17:56:23 +0000
+++ src/CaptiveLogin.vala	2016-09-08 18:44:19 +0000
@@ -17,7 +17,7 @@
     END LICENSE
 ***/
 
-public class ValaBrowser : Gtk.Window {
+public class ValaBrowser : Gtk.ApplicationWindow {
 
     private enum ViewSecurity {
         NONE,
@@ -28,14 +28,16 @@
 
     private const string TITLE = _("Log in");
     private const string DUMMY_URL = "http://elementary.io/capnet-assist";
-    
+
     private WebKit.WebView web_view;
     private Gtk.ToggleButton tls_button;
     private Gtk.Label title_label;
 
     private ViewSecurity view_security = ViewSecurity.NONE;
-    
-    public ValaBrowser () {
+
+    public ValaBrowser (Gtk.Application app) {
+        Object (application: app);
+
         set_default_size (1000, 680);
         set_keep_above (true);
         set_skip_taskbar_hint (true);
@@ -48,7 +50,7 @@
 
     bool is_privacy_mode_enabled () {
         var privacy_settings = new GLib.Settings ("org.gnome.desktop.privacy");
-        bool privacy_mode = !privacy_settings.get_boolean ("remember-recent-files") || 
+        bool privacy_mode = !privacy_settings.get_boolean ("remember-recent-files") ||
                             !privacy_settings.get_boolean ("remember-app-usage");
         return privacy_mode;
     }
@@ -101,7 +103,7 @@
 
         add (web_view);
     }
-    
+
     public bool is_captive_portal () {
         var network_monitor = NetworkMonitor.get_default ();
 
@@ -120,14 +122,14 @@
         session.send_message (message);
 
         debug ("Return code: %u", message.status_code);
-        
+
         /*
-         * If there is an active connection to the internet, this will 
-         * successfully connect to the connectivity checker and return 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 
+         * request will fail and libsoup will return a transport failure status
          * code (<100).
-         * Otherwise, libsoup will resolve the redirect to the captive portal, 
+         * Otherwise, libsoup will resolve the redirect to the captive portal,
          * which will return status code 200.
          */
         return message.status_code == 200;
@@ -245,7 +247,7 @@
         grid.attach (primary_text, 1, 0, 1, 1);
         grid.attach (secondary_text, 1, 1, 1, 1);
         grid.attach (cert_details, 1, 2, 1, 1);
-        
+
         popover.add (grid);
 
         // This hack has been borrowed from midori, the widget provided by the
@@ -284,7 +286,7 @@
     }
 
     private void connect_signals () {
-        this.destroy.connect (Gtk.main_quit);
+        this.destroy.connect (application.quit);
         tls_button.toggled.connect (on_tls_button_click);
         //should title change?
         web_view.notify["title"].connect ((view, param_spec) => {
@@ -324,7 +326,7 @@
                 return true;
             }
 
-            Gtk.main_quit ();
+            application.quit ();
             return true;
         });
     }
@@ -333,20 +335,4 @@
         show_all ();
         web_view.load_uri (ValaBrowser.DUMMY_URL);
     }
-
-    public static int main (string[] args) {
-        Gtk.init (ref args);
-
-        var browser = new ValaBrowser ();
-
-        if (browser.is_captive_portal ()) {
-            debug ("Opening browser to login");
-            browser.start ();
-            Gtk.main ();
-        } else {
-            debug ("Already logged in and connected, or no internet connection. Shutting down.");
-        }
-
-        return 0;
-    }
 }

=== modified file 'src/config.vala'
--- src/config.vala	2015-10-21 12:51:28 +0000
+++ src/config.vala	2016-09-08 18:44:19 +0000
@@ -15,5 +15,6 @@
  */
 
 namespace Constants {
-    public const string VERSION = "0.1.1";
+    public const string VERSION = "0.2";
+    public const string APP_NAME = "captive-login";
 }

=== modified file 'src/config.vala.cmake'
--- src/config.vala.cmake	2013-08-22 15:09:15 +0000
+++ src/config.vala.cmake	2016-09-08 18:44:19 +0000
@@ -16,4 +16,5 @@
 
 namespace Constants {
     public const string VERSION = "@VERSION@";
+    public const string APP_NAME = "@CMAKE_PROJECT_NAME@";
 }