From 500e80784af9f2e15d487ad44e6358c31fc90dae Mon Sep 17 00:00:00 2001
From: Dmitry Bogatov <KAction@debian.org>
Date: Thu, 12 Sep 2019 04:41:06 +0000
Subject: [PATCH] Replace some of context.sql.get_config() with
 context.get_config()

Pattern `context.sql.get_config(context, {foo})` is unnecessary
redundant in Rust: unlike C, Rust has associated functions (methods).
---
 src/chat.rs       | 3 ++-
 src/dc_imex.rs    | 2 +-
 src/e2ee.rs       | 4 ++--
 src/securejoin.rs | 5 +++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/chat.rs b/src/chat.rs
index 99c1a3289..225881a23 100644
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -2,6 +2,7 @@ use std::ffi::CString;
 use std::path::{Path, PathBuf};
 
 use crate::chatlist::*;
+use crate::config::*;
 use crate::constants::*;
 use crate::contact::*;
 use crate::context::Context;
@@ -267,7 +268,7 @@ impl Chat {
             return Ok(0);
         }
 
-        if let Some(from) = context.sql.get_config(context, "configured_addr") {
+        if let Some(from) = context.get_config(Config::ConfiguredAddr) {
             let new_rfc724_mid = {
                 let grpid = match self.typ {
                     Chattype::Group | Chattype::VerifiedGroup => Some(self.grpid.as_str()),
diff --git a/src/dc_imex.rs b/src/dc_imex.rs
index 6f3fdf277..d5a96174f 100644
--- a/src/dc_imex.rs
+++ b/src/dc_imex.rs
@@ -362,7 +362,7 @@ fn set_self_key(
         error!(context, "File does not contain a private key.",);
     }
 
-    let self_addr = context.sql.get_config(context, "configured_addr");
+    let self_addr = context.get_config(Config::ConfiguredAddr);
 
     if self_addr.is_none() {
         error!(context, "Missing self addr");
diff --git a/src/e2ee.rs b/src/e2ee.rs
index d752ed78f..4204d929a 100644
--- a/src/e2ee.rs
+++ b/src/e2ee.rs
@@ -87,7 +87,7 @@ impl E2eeHelper {
                 EncryptPreference::NoPreference
             };
 
-            let addr = context.sql.get_config(context, "configured_addr");
+            let addr = context.get_config(Config::ConfiguredAddr);
 
             if let Some(addr) = addr {
                 let pubkey_ret = load_or_generate_self_public_key(context, &addr).map_err(|err| {
@@ -429,7 +429,7 @@ impl E2eeHelper {
                 }
             }
             /* load private key for decryption */
-            let self_addr = context.sql.get_config(context, "configured_addr");
+            let self_addr = context.get_config(Config::ConfiguredAddr);
             if let Some(self_addr) = self_addr {
                 if private_keyring.load_self_private_for_decrypting(
                     context,
diff --git a/src/securejoin.rs b/src/securejoin.rs
index 1ce0a0268..3ef6fecdd 100644
--- a/src/securejoin.rs
+++ b/src/securejoin.rs
@@ -4,6 +4,7 @@ use std::ptr;
 
 use crate::aheader::EncryptPreference;
 use crate::chat::{self, Chat};
+use crate::config::*;
 use crate::configure::*;
 use crate::constants::*;
 use crate::contact::*;
@@ -82,7 +83,7 @@ pub fn dc_get_securejoin_qr(context: &Context, group_chat_id: uint32_t) -> Optio
     ensure_secret_key_exists(context).ok();
     let invitenumber = token::lookup_or_new(context, token::Namespace::InviteNumber, group_chat_id);
     let auth = token::lookup_or_new(context, token::Namespace::Auth, group_chat_id);
-    let self_addr = match context.sql.get_config(context, "configured_addr") {
+    let self_addr = match context.get_config(Config::ConfiguredAddr) {
         Some(addr) => addr,
         None => {
             error!(context, "Not configured, cannot generate QR code.",);
@@ -139,7 +140,7 @@ pub fn dc_get_securejoin_qr(context: &Context, group_chat_id: uint32_t) -> Optio
 }
 
 fn get_self_fingerprint(context: &Context) -> Option<String> {
-    if let Some(self_addr) = context.sql.get_config(context, "configured_addr") {
+    if let Some(self_addr) = context.get_config(Config::ConfiguredAddr) {
         if let Some(key) = Key::from_self_public(context, self_addr, &context.sql) {
             return Some(key.fingerprint());
         }