X-Git-Url: http://git.maemo.org/git/?p=gc-dialer;a=blobdiff_plain;f=src%2Fsession.py;h=7061f09b383c145b7736e922711547c57f7044a9;hp=11de538a88fb1737b3521568ab056195f93836ab;hb=3cb332b757e1001a8d03920ce44f8885f562a963;hpb=b2ec60a84a1877c16d0b249c03a7c7c7462db3aa

diff --git a/src/session.py b/src/session.py
index 11de538..7061f09 100644
--- a/src/session.py
+++ b/src/session.py
@@ -235,7 +235,12 @@ class Session(QtCore.QObject):
 		self._cachePath = cachePath
 		self._voicemailCachePath = None
 		self._username = None
+		self._password = None
 		self._draft = Draft(self._pool, self._backend, self._errorLog)
+		self._delayedRelogin = QtCore.QTimer()
+		self._delayedRelogin.setInterval(0)
+		self._delayedRelogin.setSingleShot(True)
+		self._delayedRelogin.timeout.connect(self._on_delayed_relogin)
 
 		self._contacts = {}
 		self._accountUpdateTime = datetime.datetime(1971, 1, 1)
@@ -308,6 +313,10 @@ class Session(QtCore.QObject):
 		le = concurrent.AsyncLinearExecution(self._pool, self._update_account), (), {}
 		self._perform_op_while_loggedin(le)
 
+	def refresh_connection(self):
+		le = concurrent.AsyncLinearExecution(self._pool, self._refresh_authentication)
+		le.start()
+
 	def get_contacts(self):
 		return self._contacts
 
@@ -451,6 +460,7 @@ class Session(QtCore.QObject):
 					self._loggedInTime = int(time.time())
 					oldUsername = self._username
 					self._username = username
+					self._password = password
 					finalState = self.LOGGEDIN_STATE
 					if oldUsername != self._username:
 						needOps = not self._load()
@@ -490,6 +500,43 @@ class Session(QtCore.QObject):
 			if accountData is not None and self._callback:
 				self.set_callback_number(self._callback)
 
+	def _update_account(self):
+		try:
+			with qui_utils.notify_busy(self._errorLog, "Updating Account"):
+				accountData = yield (
+					self._backend[0].refresh_account_info,
+					(),
+					{},
+				)
+		except Exception, e:
+			_moduleLogger.exception("Reporting error to user")
+			self.error.emit(str(e))
+			return
+		self._loggedInTime = int(time.time())
+		self._process_account_data(accountData)
+
+	def _refresh_authentication(self):
+		try:
+			with qui_utils.notify_busy(self._errorLog, "Updating Account"):
+				accountData = yield (
+					self._backend[0].refresh_account_info,
+					(),
+					{},
+				)
+				accountData = None
+		except Exception, e:
+			_moduleLogger.exception("Passing to user")
+			self.error.emit(str(e))
+			# refresh_account_info does not normally throw, so it is fine if we
+			# just quit early because something seriously wrong is going on
+			return
+
+		if accountData is not None:
+			self._loggedInTime = int(time.time())
+			self._process_account_data(accountData)
+		else:
+			self._delayedRelogin.start()
+
 	def _load(self):
 		updateMessages = len(self._messages) != 0
 		updateHistory = len(self._history) != 0
@@ -625,21 +672,6 @@ class Session(QtCore.QObject):
 		import shutil
 		shutil.rmtree(self._voicemailCachePath, True)
 
-	def _update_account(self):
-		try:
-			assert self.state == self.LOGGEDIN_STATE, "Contacts requires being logged in (currently %s)" % self.state
-			with qui_utils.notify_busy(self._errorLog, "Updating Account"):
-				accountData = yield (
-					self._backend[0].refresh_account_info,
-					(),
-					{},
-				)
-		except Exception, e:
-			_moduleLogger.exception("Reporting error to user")
-			self.error.emit(str(e))
-			return
-		self._process_account_data(accountData)
-
 	def _update_messages(self, messageType):
 		try:
 			assert self.state == self.LOGGEDIN_STATE, "Messages requires being logged in (currently %s" % self.state
@@ -662,8 +694,8 @@ class Session(QtCore.QObject):
 			assert self.state == self.LOGGEDIN_STATE, "History requires being logged in (currently %s" % self.state
 			with qui_utils.notify_busy(self._errorLog, "Updating History"):
 				self._history = yield (
-					self._backend[0].get_recent,
-					(),
+					self._backend[0].get_call_history,
+					(self._backend[0].HISTORY_ALL, ),
 					{},
 				)
 		except Exception, e:
@@ -674,20 +706,21 @@ class Session(QtCore.QObject):
 		self.historyUpdated.emit()
 
 	def _update_dnd(self):
-		oldDnd = self._dnd
-		try:
-			assert self.state == self.LOGGEDIN_STATE, "DND requires being logged in (currently %s" % self.state
-			self._dnd = yield (
-				self._backend[0].is_dnd,
-				(),
-				{},
-			)
-		except Exception, e:
-			_moduleLogger.exception("Reporting error to user")
-			self.error.emit(str(e))
-			return
-		if oldDnd != self._dnd:
-			self.dndStateChange(self._dnd)
+		with qui_utils.notify_busy(self._errorLog, "Updating Do-Not-Disturb Status"):
+			oldDnd = self._dnd
+			try:
+				assert self.state == self.LOGGEDIN_STATE, "DND requires being logged in (currently %s" % self.state
+				self._dnd = yield (
+					self._backend[0].is_dnd,
+					(),
+					{},
+				)
+			except Exception, e:
+				_moduleLogger.exception("Reporting error to user")
+				self.error.emit(str(e))
+				return
+			if oldDnd != self._dnd:
+				self.dndStateChange(self._dnd)
 
 	def _download_voicemail(self, messageId):
 		actualPath = os.path.join(self._voicemailCachePath, "%s.mp3" % messageId)
@@ -775,3 +808,15 @@ class Session(QtCore.QObject):
 				continue
 
 			yield cleaned
+
+	@misc_utils.log_exception(_moduleLogger)
+	def _on_delayed_relogin(self):
+		try:
+			username = self._username
+			password = self._password
+			self.logout()
+			self.login(username, password)
+		except Exception, e:
+			_moduleLogger.exception("Passing to user")
+			self.error.emit(str(e))
+			return