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

refactor: rename dc_sqlite3 to sql

Browse Source
This commit is contained in:
dignifiedquire
2019-07-12 21:57:34 +02:00
parent f3884e30ac
commit 8714599655
25 changed files with 377 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/dc_securejoin.rs
View File

@@ -14,13 +14,13 @@ use crate::dc_mimeparser::*;
use crate::dc_msg::*;
use crate::dc_param::*;
use crate::dc_qr::*;
use crate::dc_sqlite3::*;
use crate::dc_stock::*;
use crate::dc_strencode::*;
use crate::dc_token::*;
use crate::dc_tools::*;
use crate::key::*;
use crate::peerstate::*;
use crate::sql;
use crate::types::*;
use crate::x::*;
@@ -52,7 +52,7 @@ pub unsafe fn dc_get_securejoin_qr(
auth = dc_create_id();
dc_token_save(context, DC_TOKEN_AUTH, group_chat_id, auth);
}
let self_addr = dc_sqlite3_get_config(context, &context.sql, "configured_addr", None);
let self_addr = sql::get_config(context, &context.sql, "configured_addr", None);
let cleanup = |fingerprint, chat, group_name, group_name_urlencoded| {
free(fingerprint as *mut libc::c_void);
@@ -75,7 +75,7 @@ pub unsafe fn dc_get_securejoin_qr(
}
let self_addr = self_addr.unwrap();
let self_name = dc_sqlite3_get_config(context, &context.sql, "displayname", Some("")).unwrap();
let self_name = sql::get_config(context, &context.sql, "displayname", Some("")).unwrap();
fingerprint = get_self_fingerprint(context);
if fingerprint.is_null() {
@@ -124,7 +124,7 @@ pub unsafe fn dc_get_securejoin_qr(
}
fn get_self_fingerprint(context: &Context) -> *mut libc::c_char {
if let Some(self_addr) = dc_sqlite3_get_config(context, &context.sql, "configured_addr", None) {
if let Some(self_addr) = sql::get_config(context, &context.sql, "configured_addr", None) {
if let Some(key) = Key::from_self_public(context, self_addr, &context.sql) {
return key.fingerprint_c();
}
@@ -941,7 +941,7 @@ pub unsafe fn dc_handle_degrade_event(context: &Context, peerstate: &Peerstate)
// with things they cannot fix, so the user is just kicked from the verified group
// (and he will know this and can fix this)
if Some(DegradeEvent::FingerprintChanged) == peerstate.degrade_event {
let contact_id: i32 = dc_sqlite3_query_row(
let contact_id: i32 = sql::query_row(
context,
&context.sql,
"SELECT id FROM contacts WHERE addr=?;",