nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set default account and client service status to something useful

Browse source 
Set account default to ONLINE, so we don't initially show up as being
offline before even having checked connectivity. Add an UNKNOWN to
client service status so that when the initial connectivity check comes
up offine, the account actually gets notified and hence also the client.
This commit is contained in:
Michael Gratton 2018-12-30 22:32:41 +11:00 • committed by Michael James Gratton
parent 20447c814f
commit 62665bf782
2 changed files with 31 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/engine/api/geary-account.vala
View file

@ -79,11 +79,17 @@ public abstract class Geary.Account : BaseObject {
*
* This property's value is set based on the {@link
* ClientService.current_status} of the account's {@link incoming}
* and {@link outgoing} services. if
* and {@link outgoing} services. See {@link Status} for more
* information.
*
* The initial value for this property is {@link Status.ONLINE},
* which may or may not be incorrect. However the once the account
* has been opened, its services will begin checking connectivity
* and the value will be updated to match in due course.
*
* @see ClientService.current_status
*/
public Status current_status { get; protected set; default = 0; }
public Status current_status { get; protected set; default = ONLINE; }
/**
* The service manager for the incoming email service.

27
src/engine/api/geary-client-service.vala
View file

@ -29,17 +29,31 @@ public abstract class Geary.ClientService : BaseObject {
*/
public enum Status {
/**
* The service status is currently unknown.
*
* This is the initial state, and will only change after the
* service has performed initial connectivity testing and/or
* successfully connected to the remote host.
*/
UNKNOWN,
/**
* The service is currently offline.
*
* This is the initial state, and will only change after
* This is the initial state, will only change after
* having successfully connected to the remote service. An
* attempt to connect will be made when the connectivity
* manager indicates the network has changed.
*/
OFFLINE,
/** A connection has been established and is operating normally. */
/**
* The service is connected and working normally.
*
* A connection to the remote host has been established and is
* operating normally.
*/
CONNECTED,
/**
@ -104,6 +118,7 @@ public abstract class Geary.ClientService : BaseObject {
*/
public bool automatically_reconnect() {
return (
this == UNKNOWN ||
this == OFFLINE ||
this == CONNECTED ||
this == CONNECTION_FAILED
@ -117,6 +132,7 @@ public abstract class Geary.ClientService : BaseObject {
*/
public bool is_error() {
return (
this != UNKNOWN &&
this != OFFLINE &&
this != CONNECTED
);
@ -156,11 +172,14 @@ public abstract class Geary.ClientService : BaseObject {
* The current state of certain aspects of the service
* (e.g. online/offline state may not be fully known, and hence
* the value of this property reflects the engine's current
* understanding of the service's status, not necessarily reality.
* understanding of the service's status, not necessarily that of
* actual reality.
*
* The initial value for this property is {@link Status.UNKNOWN}.
*
* @see Account.current_status
*/
public Status current_status { get; protected set; default = OFFLINE; }
public Status current_status { get; protected set; default = UNKNOWN; }
/** The network endpoint the service will connect to. */
public Endpoint remote { get; private set; }