summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/add-linux-autostart1
-rw-r--r--src/leap/bitmask/gui/mainwindow.py9
-rw-r--r--src/leap/bitmask/util/autostart.py67
3 files changed, 76 insertions, 1 deletions
diff --git a/changes/add-linux-autostart b/changes/add-linux-autostart
new file mode 100644
index 00000000..44b175bc
--- /dev/null
+++ b/changes/add-linux-autostart
@@ -0,0 +1 @@
+- Add autostart on Linux. Closes #4989.
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 1bd39267..943e92ea 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -50,7 +50,7 @@ from leap.bitmask.services.mail import conductor as mail_conductor
from leap.bitmask.services import EIP_SERVICE, MX_SERVICE
-from leap.bitmask.util import make_address
+from leap.bitmask.util import autostart, make_address
from leap.bitmask.util.keyring_helpers import has_keyring
from leap.bitmask.logs.leap_log_handler import LeapLogHandler
@@ -103,6 +103,7 @@ class MainWindow(QtGui.QMainWindow):
:type start_hidden: bool
"""
QtGui.QMainWindow.__init__(self)
+ autostart.set_autostart(True)
# register leap events ########################################
register(signal=proto.UPDATER_NEW_UPDATES,
@@ -1740,6 +1741,12 @@ class MainWindow(QtGui.QMainWindow):
"""
# TODO separate the shutting down of services from the
# UI stuff.
+ if self._quitting:
+ return
+
+ autostart.set_autostart(False)
+
+ self._quitting = True
# first thing to do quitting, hide the mainwindow and show tooltip.
self.hide()
diff --git a/src/leap/bitmask/util/autostart.py b/src/leap/bitmask/util/autostart.py
new file mode 100644
index 00000000..b8ac02b1
--- /dev/null
+++ b/src/leap/bitmask/util/autostart.py
@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+# autostart.py
+# Copyright (C) 2013, 2014 LEAP
+#
+# 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 3 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, see <http://www.gnu.org/licenses/>.
+"""
+Helpers to enable/disable bitmask's autostart.
+"""
+import flags
+import logging
+import os
+
+from leap.bitmask.platform_init import IS_LINUX
+
+logger = logging.getLogger(__name__)
+
+
+DESKTOP_ENTRY = """\
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Application
+Name=Bitmask
+Comment=Secure Communication
+Exec=bitmask --start-hidden
+Terminal=false
+Icon=bitmask
+"""
+
+DESKTOP_ENTRY_PATH = os.path.expanduser("~/.config/autostart/bitmask.desktop")
+
+
+def set_autostart(enabled):
+ """
+ Set the autostart mode to enabled or disabled depending on the parameter.
+ If `enabled` is `True`, save the autostart file to its place. Otherwise,
+ remove that file.
+ Right now we support only Linux autostart.
+
+ :param enabled: whether the autostart should be enabled or not.
+ :type enabled: bool
+ """
+ # we don't do autostart for bundle or systems different than Linux
+ if flags.STANDALONE or not IS_LINUX:
+ return
+
+ if enabled:
+ with open(DESKTOP_ENTRY_PATH, 'w') as f:
+ f.write(DESKTOP_ENTRY)
+ else:
+ try:
+ os.remove(DESKTOP_ENTRY_PATH)
+ except OSError: # if the file does not exist
+ pass
+ except Exception as e:
+ logger.error("Problem disabling autostart, {0!r}".format(e))