tyiu/notedeck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "introduce decks_cache"

Browse Source 
This was causing a crash when switching accounts

This reverts commit 69e93b0ebf.
This commit is contained in:
William Casarin
2024-12-09 09:03:34 -08:00
parent 1b31557b03
commit 32caaee642
7 changed files with 82 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/accounts/mod.rs
View File

@@ -8,13 +8,12 @@ use uuid::Uuid;
use enostr::{ClientMessage, FilledKeypair, FullKeypair, Keypair, RelayPool};
use nostrdb::{Filter, Ndb, Note, NoteKey, Subscription, Transaction};
use crate::app::get_active_columns_mut;
use crate::decks::DecksCache;
use crate::{
column::Columns,
imgcache::ImageCache,
login_manager::AcquireKeyState,
muted::Muted,
route::Route,
route::{Route, Router},
storage::{KeyStorageResponse, KeyStorageType},
ui::{
account_login_view::{AccountLoginResponse, AccountLoginView},
@@ -231,12 +230,13 @@ pub fn render_accounts_route(
ui: &mut egui::Ui,
ndb: &Ndb,
col: usize,
columns: &mut Columns,
img_cache: &mut ImageCache,
accounts: &mut Accounts,
decks: &mut DecksCache,
login_state: &mut AcquireKeyState,
route: AccountsRoute,
) -> SingleUnkIdAction {
let router = columns.column_mut(col).router_mut();
let resp = match route {
AccountsRoute::Accounts => AccountsView::new(ndb, accounts, img_cache)
.ui(ui)
@@ -252,15 +252,12 @@ pub fn render_accounts_route(
if let Some(resp) = resp {
match resp {
AccountsRouteResponse::Accounts(response) => {
process_accounts_view_response(accounts, decks, col, response);
process_accounts_view_response(accounts, response, router);
SingleUnkIdAction::no_action()
}
AccountsRouteResponse::AddAccount(response) => {
let action = process_login_view_response(accounts, decks, response);
let action = process_login_view_response(accounts, response);
*login_state = Default::default();
let router = get_active_columns_mut(accounts, decks)
.column_mut(col)
.router_mut();
router.go_back();
action
}
@@ -271,20 +268,16 @@ pub fn render_accounts_route(
}
pub fn process_accounts_view_response(
accounts: &mut Accounts,
decks: &mut DecksCache,
col: usize,
manager: &mut Accounts,
response: AccountsViewResponse,
router: &mut Router<Route>,
) {
let router = get_active_columns_mut(accounts, decks)
.column_mut(col)
.router_mut();
match response {
AccountsViewResponse::RemoveAccount(index) => {
accounts.remove_account(index);
manager.remove_account(index);
}
AccountsViewResponse::SelectAccount(index) => {
accounts.select_account(index);
manager.select_account(index);
}
AccountsViewResponse::RouteToLogin => {
router.route_to(Route::add_account());
@@ -626,18 +619,15 @@ fn get_selected_index(accounts: &[UserAccount], keystore: &KeyStorageType) -> Op
pub fn process_login_view_response(
manager: &mut Accounts,
decks: &mut DecksCache,
response: AccountLoginResponse,
) -> SingleUnkIdAction {
let (pubkey, login_action) = match response {
let login_action = match response {
AccountLoginResponse::CreateNew => {
let kp = FullKeypair::generate().to_keypair();
(kp.pubkey, manager.add_account(kp))
manager.add_account(FullKeypair::generate().to_keypair())
}
AccountLoginResponse::LoginWith(keypair) => (keypair.pubkey, manager.add_account(keypair)),
AccountLoginResponse::LoginWith(keypair) => manager.add_account(keypair),
};
manager.select_account(login_action.switch_to_index);
decks.add_deck_default(pubkey);
login_action.unk
}