Ticket #2187: 0001-Sugar-Ad-hoc-network-reconnect-after-suspend-2187.patch

src/jarabe/model/adhoc.py

@@ -134 +134 @@
     def _update_state(self):
         self.emit('state-changed', self._current_channel, self._device_state)
 
-    def _have_configured_connections(self):
-        return len(network.get_settings().connections) > 0
-
     def autoconnect(self):
-        """Autoconnect to an Ad-hoc network"""
-        if self._device_state != network.DEVICE_STATE_DISCONNECTED:
-            return
-        elif self._have_configured_connections():
-            self._autoconnect_adhoc_timer()
-        else:
-            self._autoconnect_adhoc()
-
-    def _autoconnect_adhoc_timer(self):
         """Start a timer which basically looks for 30 seconds of inactivity
         on the device, then does autoconnect to an Ad-hoc network.
 
@@ -157 +145 @@
                 self._AUTOCONNECT_TIMEOUT, self.__idle_check_cb)
 
     def __idle_check_cb(self):
-        if  self._device_state == network.DEVICE_STATE_DISCONNECTED:
-            logging.debug("Connect to Ad-hoc network due to inactivity.")
+        if self._device_state == network.DEVICE_STATE_DISCONNECTED:
             self._autoconnect_adhoc()
         return False