Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-17 21:46:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Create get_configured_provider(), remove delete_server_after == "1" check

Browse Source
This commit is contained in:
Hocuri
2021-01-20 13:31:42 +01:00
parent 687db252b6
commit b67fbedcef
3 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/sql.rs
View File

@@ -9,6 +9,7 @@ use std::time::Duration;
use rusqlite::{Connection, Error as SqlError, OpenFlags};
use crate::chat::add_device_msg;
use crate::config::Config::DeleteServerAfter;
use crate::constants::{ShowEmails, DC_CHAT_ID_TRASH};
use crate::context::Context;
@@ -20,7 +21,6 @@ use crate::param::{Param, Params};
use crate::peerstate::Peerstate;
use crate::provider::get_provider_by_domain;
use crate::stock::StockMessage;
use crate::{chat::add_device_msg, provider::get_provider_by_id};
use crate::{
chat::{update_device_icon, update_saved_messages_icon},
config::Config,
@@ -1481,19 +1481,10 @@ CREATE INDEX devmsglabels_index1 ON devmsglabels (label);
disable_server_delete = true;
// Don't disable server delete if it was on by default (Nauta):
if let Some(provider) = get_provider_by_id(
&context
.get_config(Config::ConfiguredProvider)
.await
.unwrap_or_default(),
) {
if let Some(provider) = context.get_configured_provider().await {
if let Some(defaults) = &provider.config_defaults {
if let Some(config) =
defaults.iter().find(|d| d.key == Config::DeleteServerAfter)
{
if config.value == "1" {
disable_server_delete = false;
}
if defaults.iter().any(|d| d.key == Config::DeleteServerAfter) {
disable_server_delete = false;
}
}
}