X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fautogv.py;h=fee55f49bf45367789d9b0b139db2ae9f11cd8c1;hp=fcc138661343011f889fb9a106ca30cde36f23cc;hb=a2713ae4bb578c7a681599235ac9270148e393c5;hpb=69291b6ea410825bc288f4071e4a2bd200bdac2e

diff --git a/src/autogv.py b/src/autogv.py
index fcc1386..fee55f4 100644
--- a/src/autogv.py
+++ b/src/autogv.py
@@ -1,5 +1,6 @@
 import logging
 
+import dbus
 import telepathy
 
 try:
@@ -19,9 +20,10 @@ import util.coroutines as coroutines
 import util.go_utils as gobject_utils
 import util.tp_utils as telepathy_utils
 import util.misc as misc_utils
+import gvoice
 
 
-_moduleLogger = logging.getLogger("autogv")
+_moduleLogger = logging.getLogger(__name__)
 
 
 class NewGVConversations(object):
@@ -63,17 +65,18 @@ class NewGVConversations(object):
 			# Just let the TextChannel decide whether it should be reported to the user or not
 			props = self._connRef().generate_props(telepathy.CHANNEL_TYPE_TEXT, h, False)
 			if self._connRef()._channel_manager.channel_exists(props):
+				_moduleLogger.debug("Chat box already open for texting conversation with %s" % phoneNumber)
 				continue
 
 			# Maemo 4.1's RTComm opens a window for a chat regardless if a
 			# message is received or not, so we need to do some filtering here
 			mergedConv = conv.get_conversation(phoneNumber)
-			unreadConvs = [
-				conversation
-				for conversation in mergedConv.conversations
-				if not conversation.isRead and not conversation.isArchived
-			]
-			if not unreadConvs:
+			newConversations = mergedConv.conversations
+			newConversations = gvoice.conversations.filter_out_read(newConversations)
+			newConversations = gvoice.conversations.filter_out_self(newConversations)
+			newConversations = list(newConversations)
+			if not newConversations:
+				_moduleLogger.debug("Not opening chat box for %s, all new messages are either read or from yourself" % phoneNumber)
 				continue
 
 			chan = self._connRef()._channel_manager.channel_for_props(props, signal=True)
@@ -118,7 +121,11 @@ class RefreshVoicemail(object):
 			return
 
 		conn = telepathy.client.Connection(serviceName, connObjectPath)
-		chan = telepathy.client.Channel(serviceName, channelObjectPath)
+		try:
+			chan = telepathy.client.Channel(serviceName, channelObjectPath)
+		except dbus.exceptions.UnknownMethodException:
+			_moduleLogger.exception("Client might not have implemented a deprecated method")
+			return
 		missDetection = telepathy_utils.WasMissedCall(
 			bus, conn, chan, self._on_missed_call, self._on_error_for_missed
 		)
@@ -136,6 +143,24 @@ class RefreshVoicemail(object):
 		self._outstandingRequests.remove(missDetection)
 
 
+class TimedDisconnect(object):
+
+	def __init__(self, connRef):
+		self._connRef = connRef
+		self.__delayedDisconnect = gobject_utils.Timeout(self._on_delayed_disconnect)
+
+	def start(self):
+		self.__delayedDisconnect.start(seconds=60)
+
+	def stop(self):
+		self.__delayedDisconnect.cancel()
+
+	@misc_utils.log_exception(_moduleLogger)
+	def _on_delayed_disconnect(self):
+		_moduleLogger.info("Timed disconnect occurred")
+		self._connRef().disconnect(telepathy.CONNECTION_STATUS_REASON_NETWORK_ERROR)
+
+
 class AutoDisconnect(object):
 
 	def __init__(self, connRef):
@@ -174,6 +199,7 @@ class AutoDisconnect(object):
 		else:
 			_moduleLogger.info("Other status: %r" % (status, ))
 
+	@misc_utils.log_exception(_moduleLogger)
 	def _cancel_delayed_disconnect(self):
 		_moduleLogger.info("Cancelling auto-log off")
 		self.__delayedDisconnect.cancel()
@@ -230,3 +256,25 @@ class DisconnectOnShutdown(object):
 			self._connRef().disconnect(telepathy.CONNECTION_STATUS_REASON_REQUESTED)
 		except Exception:
 			_moduleLogger.exception("Error durring disconnect")
+
+
+class DelayEnableContactIntegration(object):
+
+	def __init__(self, protocolName):
+		self.__enableSystemContactSupport = telepathy_utils.EnableSystemContactIntegration(
+			protocolName
+		)
+		self.__delayedEnable = gobject_utils.Async(self._on_delayed_enable)
+
+	def start(self):
+		self.__delayedEnable.start()
+
+	def stop(self):
+		self.__delayedEnable.cancel()
+
+	@misc_utils.log_exception(_moduleLogger)
+	def _on_delayed_enable(self):
+		try:
+			self.__enableSystemContactSupport.start()
+		except dbus.DBusException, e:
+			_moduleLogger.info("Contact integration seems to not be supported (%s)" % e)