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

Clean up Engine's account added/removed signals.

Browse source 
* src/engine/api/geary-engine.vala (Engine): Move account_added and
  account_removed signals to AccountRemoved since the engine isn't
  tracking this any more. Remove bool param from add_account for the same
  reason and update call sites.
This commit is contained in:
Michael James Gratton 2018-05-28 00:55:59 +10:00
parent 4b5aad833a
commit e6891f528a
4 changed files with 39 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/client/accounts/account-dialog-account-list-pane.vala
View file

@ -72,12 +72,16 @@ public class AccountDialogAccountListPane : AccountDialogPane {
Gtk.ScrolledWindow scroll = (Gtk.ScrolledWindow) builder.get_object("scrolledwindow");
toolbar.get_style_context().set_junction_sides(Gtk.JunctionSides.TOP);
scroll.get_style_context().set_junction_sides(Gtk.JunctionSides.BOTTOM);
// Watch for accounts to be added/removed.
this.application.engine.account_added.connect(on_account_added);
this.application.engine.account_removed.connect(on_account_removed);
this.application.controller.account_manager.account_added.connect(
on_account_added
);
this.application.controller.account_manager.account_removed.connect(
on_account_removed
);
}
private void notify_edit_account() {
string? account = get_selected_account();
if (account != null)

8
src/client/accounts/account-manager.vala
View file

@ -90,6 +90,12 @@ public class AccountManager : GLib.Object {
private Goa.Client? goa_service = null;
/** Fired when a new account is created. */
public signal void account_added(Geary.AccountInformation added);
/** Fired when an account is deleted. */
public signal void account_removed(Geary.AccountInformation removed);
/** Fired when a SSO account has been updated. */
public signal void sso_account_updated(Geary.AccountInformation updated);
@ -457,12 +463,14 @@ public class AccountManager : GLib.Object {
}
this.enabled_accounts.unset(info.id);
account_removed(info);
}
private void enable_account(Geary.AccountInformation account)
throws GLib.Error {
this.enabled_accounts.set(account.id, account);
this.engine.add_account(account);
account_added(account);
}
private inline string to_geary_id(Goa.Object account) {

50
src/engine/api/geary-engine.vala
View file

@ -71,29 +71,21 @@ public class Geary.Engine : BaseObject {
public signal void closed();
/**
* Fired when an account becomes available in the engine. Opening the
* engine makes all existing accounts available; newly created accounts are
* also made available as soon as they're stored.
* Fired when an account becomes available in the engine.
*
* Accounts are made available as soon as they're added to the
* engine.
*/
public signal void account_available(AccountInformation account);
/**
* Fired when an account becomes unavailable in the engine. Closing the
* engine makes all accounts unavailable; deleting an account also makes it
* unavailable.
* Fired when an account becomes unavailable in the engine.
*
* Accounts are become available as soon when they are removed from the
* engine or the engine is closed.
*/
public signal void account_unavailable(AccountInformation account);
/**
* Fired when a new account is created.
*/
public signal void account_added(AccountInformation account);
/**
* Fired when an account is deleted.
*/
public signal void account_removed(AccountInformation account);
/**
* Fired when an {@link Endpoint} associated with the {@link AccountInformation} reports
* TLS certificate warnings during connection.
@ -130,9 +122,9 @@ public class Geary.Engine : BaseObject {
Imap.init();
HTML.init();
}
/**
* Initializes the engine, and makes all existing accounts available.
* Initializes the engine so that accounts can be added to it.
*/
public async void open_async(GLib.File resource_dir,
GLib.Cancellable? cancellable = null)
@ -155,12 +147,12 @@ public class Geary.Engine : BaseObject {
}
/**
* Uninitializes the engine, and makes all accounts unavailable.
* Uninitializes the engine, and removes all known accounts.
*/
public async void close_async(Cancellable? cancellable = null) throws Error {
if (!is_open)
return;
Gee.Collection<AccountInformation> unavailable_accounts = accounts.values;
accounts.clear();
@ -382,10 +374,9 @@ public class Geary.Engine : BaseObject {
}
/**
* Adds the account to be tracked by the engine. Should only be called from
* AccountInformation.store_async() and this class.
* Adds the account to be tracked by the engine.
*/
public void add_account(AccountInformation account, bool created = false) throws Error {
public void add_account(AccountInformation account) throws Error {
check_opened();
bool already_added = accounts.has_key(account.id);
@ -394,16 +385,12 @@ public class Geary.Engine : BaseObject {
if (!already_added) {
account.untrusted_host.connect(on_untrusted_host);
if (created)
account_added(account);
account_available(account);
}
}
/**
* Deletes the account from disk.
* Removes an account from the engine.
*/
public async void remove_account_async(AccountInformation account,
Cancellable? cancellable = null) throws Error {
@ -420,13 +407,10 @@ public class Geary.Engine : BaseObject {
// Removal *MUST* be done in the following order:
// 1. Send the account-unavailable signal.
// Files will be deleted client side.
// Account will be removed client side.
account_unavailable(account);
// 2. Send the account-removed signal.
account_removed(account);
// 3. Remove the account data from the engine.
// 2. Remove the account data from the engine.
account_instances.unset(account.id);
}
}

14
test/engine/api/geary-engine-test.vala
View file

@ -68,21 +68,21 @@ class Geary.EngineTest : TestCase {
new MockServiceInformation()
);
assert(info.id == "account_01");
this.engine.add_account(info, true);
this.engine.add_account(info);
info = this.engine.create_orphan_account(
new MockServiceInformation(),
new MockServiceInformation()
);
assert(info.id == "account_02");
this.engine.add_account(info, true);
this.engine.add_account(info);
info = this.engine.create_orphan_account(
new MockServiceInformation(),
new MockServiceInformation()
);
assert(info.id == "account_03");
this.engine.add_account(info, true);
this.engine.add_account(info);
info = this.engine.create_orphan_account(
new MockServiceInformation(),
@ -101,8 +101,7 @@ class Geary.EngineTest : TestCase {
"foo",
new MockServiceInformation(),
new MockServiceInformation()
),
true
)
);
AccountInformation info = this.engine.create_orphan_account(
@ -110,7 +109,7 @@ class Geary.EngineTest : TestCase {
new MockServiceInformation()
);
assert(info.id == "account_01");
this.engine.add_account(info, true);
this.engine.add_account(info);
info = this.engine.create_orphan_account(
new MockServiceInformation(),
@ -123,8 +122,7 @@ class Geary.EngineTest : TestCase {
"bar",
new MockServiceInformation(),
new MockServiceInformation()
),
true
)
);
info = this.engine.create_orphan_account(