From 9008a65c147a3849ef5850029bb335213d25b2f3 Mon Sep 17 00:00:00 2001
From: Alexander Krotov <ilabdsf@gmail.com>
Date: Thu, 13 Feb 2020 13:45:15 +0300
Subject: [PATCH] Remove DC_IMAP_SEEN constant

Replace "flags" integer with a "seen" boolean.
---
 examples/repl/cmdline.rs |  2 +-
 src/constants.rs         |  2 --
 src/dc_receive_imf.rs    | 10 +++++-----
 src/imap/mod.rs          |  6 +-----
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/examples/repl/cmdline.rs b/examples/repl/cmdline.rs
index 79bb8ebe7..a788fda01 100644
--- a/examples/repl/cmdline.rs
+++ b/examples/repl/cmdline.rs
@@ -94,7 +94,7 @@ fn dc_reset_tables(context: &Context, bits: i32) -> i32 {
 fn dc_poke_eml_file(context: &Context, filename: impl AsRef<Path>) -> Result<(), Error> {
     let data = dc_read_file(context, filename)?;
 
-    if let Err(err) = dc_receive_imf(context, &data, "import", 0, 0) {
+    if let Err(err) = dc_receive_imf(context, &data, "import", 0, false) {
         println!("dc_receive_imf errored: {:?}", err);
     }
     Ok(())
diff --git a/src/constants.rs b/src/constants.rs
index 52a1dd676..8816d4265 100644
--- a/src/constants.rs
+++ b/src/constants.rs
@@ -57,8 +57,6 @@ impl Default for ShowEmails {
     }
 }
 
-pub const DC_IMAP_SEEN: u32 = 0x1;
-
 pub const DC_HANDSHAKE_CONTINUE_NORMAL_PROCESSING: i32 = 0x01;
 pub const DC_HANDSHAKE_STOP_NORMAL_PROCESSING: i32 = 0x02;
 pub const DC_HANDSHAKE_ADD_DELETE_JOB: i32 = 0x04;
diff --git a/src/dc_receive_imf.rs b/src/dc_receive_imf.rs
index c59fb4e26..e0bb62fe8 100644
--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -37,7 +37,7 @@ pub fn dc_receive_imf(
     imf_raw: &[u8],
     server_folder: impl AsRef<str>,
     server_uid: u32,
-    flags: u32,
+    seen: bool,
 ) -> Result<()> {
     info!(
         context,
@@ -153,7 +153,7 @@ pub fn dc_receive_imf(
             from_id_blocked,
             &mut hidden,
             &mut chat_id,
-            flags,
+            seen,
             &mut needs_delete_job,
             &mut insert_msg_id,
             &mut created_db_entries,
@@ -274,7 +274,7 @@ fn add_parts(
     from_id_blocked: bool,
     hidden: &mut bool,
     chat_id: &mut ChatId,
-    flags: u32,
+    seen: bool,
     needs_delete_job: &mut bool,
     insert_msg_id: &mut MsgId,
     created_db_entries: &mut Vec<(ChatId, MsgId)>,
@@ -333,7 +333,7 @@ fn add_parts(
     let to_id: u32;
 
     if incoming {
-        state = if 0 != flags & DC_IMAP_SEEN {
+        state = if seen {
             MessageState::InSeen
         } else {
             MessageState::InFresh
@@ -541,7 +541,7 @@ fn add_parts(
         *chat_id,
         from_id,
         *sent_timestamp,
-        0 == flags & DC_IMAP_SEEN,
+        !seen,
         &mut sort_timestamp,
         sent_timestamp,
         &mut rcvd_timestamp,
diff --git a/src/imap/mod.rs b/src/imap/mod.rs
index b4d6f5f9a..d3f5079f0 100644
--- a/src/imap/mod.rs
+++ b/src/imap/mod.rs
@@ -33,8 +33,6 @@ use crate::stock::StockMessage;
 mod idle;
 pub mod select_folder;
 
-const DC_IMAP_SEEN: usize = 0x0001;
-
 type Result<T> = std::result::Result<T, Error>;
 
 #[derive(Debug, Fail)]
@@ -773,12 +771,10 @@ impl Imap {
                 _ => false,
             });
 
-            let flags = if is_seen { DC_IMAP_SEEN } else { 0 };
-
             if !is_deleted && msg.body().is_some() {
                 let body = msg.body().unwrap_or_default();
                 if let Err(err) =
-                    dc_receive_imf(context, &body, folder.as_ref(), server_uid, flags as u32)
+                    dc_receive_imf(context, &body, folder.as_ref(), server_uid, is_seen)
                 {
                     warn!(
                         context,