self._pool = pool
self._backend = backend
self._busyReason = None
+ self._message = ""
- def send(self, text):
+ def send(self):
assert 0 < len(self._contacts), "No contacts selected"
+ assert 0 < len(self._message), "No message to send"
numbers = [misc_utils.make_ugly(contact.selectedNumber) for contact in self._contacts.itervalues()]
le = concurrent.AsyncLinearExecution(self._pool, self._send)
- le.start(numbers, text)
+ le.start(numbers, self._message)
def call(self):
assert len(self._contacts) == 1, "Must select 1 and only 1 contact"
+ assert len(self._message) == 0, "Cannot send message with call"
(contact, ) = self._contacts.itervalues()
number = misc_utils.make_ugly(contact.selectedNumber)
le = concurrent.AsyncLinearExecution(self._pool, self._call)
le = concurrent.AsyncLinearExecution(self._pool, self._cancel)
le.start()
+ def _get_message(self):
+ return self._message
+
+ def _set_message(self, message):
+ self._message = message
+
+ message = property(_get_message, _set_message)
+
def add_contact(self, contactId, title, description, numbersWithDescriptions):
if self._busyReason is not None:
raise RuntimeError("Please wait for %r" % self._busyReason)
- if contactId in self._contacts:
- _moduleLogger.info("Adding duplicate contact %r" % contactId)
- # @todo Remove this evil hack to re-popup the dialog
- self.recipientsChanged.emit()
- return
+ # Allow overwriting of contacts so that the message can be updated and the SMS dialog popped back up
contactDetails = _DraftContact(title, description, numbersWithDescriptions)
self._contacts[contactId] = contactDetails
self.recipientsChanged.emit()
def _clear(self):
oldContacts = self._contacts
self._contacts = {}
+ self._message = ""
if oldContacts:
self.recipientsChanged.emit()
self.sentMessage.emit()
self._clear()
except Exception, e:
+ _moduleLogger.exception("Reporting error to user")
self.error.emit(str(e))
def _call(self, number):
self.called.emit()
self._clear()
except Exception, e:
+ _moduleLogger.exception("Reporting error to user")
self.error.emit(str(e))
def _cancel(self):
)
self.cancelled.emit()
except Exception, e:
+ _moduleLogger.exception("Reporting error to user")
self.error.emit(str(e))
class Session(QtCore.QObject):
# @todo Somehow add support for csv contacts
+ # @BUG When loading without caches, downloads messages twice
stateChange = QtCore.pyqtSignal(str)
loggedOut = QtCore.pyqtSignal()
def logout(self):
assert self.state != self.LOGGEDOUT_STATE, "Can only logout if logged in (currently %s" % self.state
+ _moduleLogger.info("Logging out")
self._pool.stop()
self._loggedInTime = self._LOGGEDOUT_TIME
self._backend[0].persist()
self._save_to_cache()
+ self.stateChange.emit(self.LOGGEDOUT_STATE)
+ self.loggedOut.emit()
def clear(self):
assert self.state == self.LOGGEDOUT_STATE, "Can only clear when logged out (currently %s" % self.state
def logout_and_clear(self):
assert self.state != self.LOGGEDOUT_STATE, "Can only logout if logged in (currently %s" % self.state
+ _moduleLogger.info("Logging out and clearing the account")
self._pool.stop()
self._loggedInTime = self._LOGGEDOUT_TIME
self.clear()
+ self.stateChange.emit(self.LOGGEDOUT_STATE)
+ self.loggedOut.emit()
def update_contacts(self, force = True):
if not force and self._contacts:
le.start(dnd)
def _set_dnd(self, dnd):
- # I'm paranoid about our state geting out of sync so we set no matter
- # what but act as if we have the cannonical state
- assert self.state == self.LOGGEDIN_STATE, "DND requires being logged in (currently %s" % self.state
oldDnd = self._dnd
try:
+ assert self.state == self.LOGGEDIN_STATE, "DND requires being logged in (currently %s" % self.state
with qui_utils.notify_busy(self._errorLog, "Setting DND Status"):
yield (
self._backend[0].set_dnd,
{},
)
except Exception, e:
+ _moduleLogger.exception("Reporting error to user")
self.error.emit(str(e))
return
self._dnd = dnd
return self._dnd
def get_account_number(self):
+ if self.state != self.LOGGEDIN_STATE:
+ return ""
return self._backend[0].get_account_number()
def get_callback_numbers(self):
- # @todo Remove evilness (might call is_authed which can block)
+ if self.state != self.LOGGEDIN_STATE:
+ return {}
return self._backend[0].get_callback_numbers()
def get_callback_number(self):
le.start(callback)
def _set_callback_number(self, callback):
- # I'm paranoid about our state geting out of sync so we set no matter
- # what but act as if we have the cannonical state
- assert self.state == self.LOGGEDIN_STATE, "Callbacks configurable only when logged in (currently %s" % self.state
oldCallback = self._callback
try:
+ assert self.state == self.LOGGEDIN_STATE, "Callbacks configurable only when logged in (currently %s" % self.state
yield (
self._backend[0].set_callback_number,
(callback, ),
{},
)
except Exception, e:
+ _moduleLogger.exception("Reporting error to user")
self.error.emit(str(e))
return
self._callback = callback
needOps = True
self.loggedIn.emit()
+ self.stateChange.emit(finalState)
+ finalState = None # Mark it as already set
if needOps:
loginOps = self._loginOps[:]
self.error.emit("Error logging in")
except Exception, e:
self._loggedInTime = self._LOGGEDOUT_TIME
+ _moduleLogger.exception("Reporting error to user")
self.error.emit(str(e))
finally:
- self.stateChange.emit(finalState)
+ if finalState is not None:
+ self.stateChange.emit(finalState)
if isLoggedIn and self._callback:
self.set_callback_number(self._callback)
_moduleLogger.exception("Weirdness loading")
return False
- (
- version, build,
- contacts, contactUpdateTime,
- messages, messageUpdateTime,
- history, historyUpdateTime,
- dnd, callback
- ) = dumpedData
+ try:
+ (
+ version, build,
+ contacts, contactUpdateTime,
+ messages, messageUpdateTime,
+ history, historyUpdateTime,
+ dnd, callback
+ ) = dumpedData
+ except ValueError:
+ _moduleLogger.exception("Upgrade/downgrade fun")
+ return False
+ except:
+ _moduleLogger.exception("Weirdlings")
if misc_utils.compare_versions(
self._OLDEST_COMPATIBLE_FORMAT_VERSION,
oldCallback = self._callback
self._contacts = {}
- self._contactUpdateTime = datetime.datetime(1, 1, 1)
+ self._contactUpdateTime = datetime.datetime(1971, 1, 1)
self._messages = []
- self._messageUpdateTime = datetime.datetime(1, 1, 1)
+ self._messageUpdateTime = datetime.datetime(1971, 1, 1)
self._history = []
- self._historyUpdateTime = datetime.datetime(1, 1, 1)
+ self._historyUpdateTime = datetime.datetime(1971, 1, 1)
self._dnd = False
self._callback = ""
def _update_contacts(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 Contacts"):
self._contacts = yield (
self._backend[0].get_contacts,
{},
)
except Exception, e:
+ _moduleLogger.exception("Reporting error to user")
self.error.emit(str(e))
return
self._contactUpdateTime = datetime.datetime.now()
def _update_messages(self):
try:
+ assert self.state == self.LOGGEDIN_STATE, "Messages requires being logged in (currently %s" % self.state
with qui_utils.notify_busy(self._errorLog, "Updating Messages"):
self._messages = yield (
self._backend[0].get_messages,
{},
)
except Exception, e:
+ _moduleLogger.exception("Reporting error to user")
self.error.emit(str(e))
return
self._messageUpdateTime = datetime.datetime.now()
def _update_history(self):
try:
+ 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,
{},
)
except Exception, e:
+ _moduleLogger.exception("Reporting error to user")
self.error.emit(str(e))
return
self._historyUpdateTime = datetime.datetime.now()
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:
projects / gc-dialer / blobdiff