remove unused dc_chat_get_subtitle() api

src/chat.rs

@@ -604,38 +604,6 @@ impl Chat {
         &self.name
     }
 
-    pub fn get_subtitle(&self, context: &Context) -> String {
-        // returns either the address or the number of chat members
-
-        if self.typ == Chattype::Single && self.param.exists(Param::Selftalk) {
-            return context.stock_str(StockMessage::SelfTalkSubTitle).into();
-        }
-
-        if self.typ == Chattype::Single {
-            return context
-                .sql
-                .query_get_value(
-                    context,
-                    "SELECT c.addr
-                       FROM chats_contacts cc
-                       LEFT JOIN contacts c ON c.id=cc.contact_id
-                      WHERE cc.chat_id=?;",
-                    params![self.id],
-                )
-                .unwrap_or_else(|| "Err".into());
-        }
-
-        if self.typ == Chattype::Group || self.typ == Chattype::VerifiedGroup {
-            if self.id.is_deaddrop() {
-                return context.stock_str(StockMessage::DeadDrop).into();
-            }
-            let cnt = get_chat_contact_cnt(context, self.id);
-            return context.stock_string_repl_int(StockMessage::Member, cnt as i32);
-        }
-
-        "Err".to_string()
-    }
-
     pub fn get_profile_image(&self, context: &Context) -> Option<PathBuf> {
         if let Some(image_rel) = self.param.get(Param::ProfileImage) {
             if !image_rel.is_empty() {
@@ -693,7 +661,6 @@ impl Chat {
             is_sending_locations: self.is_sending_locations,
             color: self.get_color(context),
             profile_image: self.get_profile_image(context).unwrap_or_else(PathBuf::new),
-            subtitle: self.get_subtitle(context),
             draft,
             is_muted: self.is_muted(),
         })
@@ -1036,9 +1003,6 @@ pub struct ChatInfo {
     /// currently.
     pub profile_image: PathBuf,
 
-    /// Subtitle for the chat.
-    pub subtitle: String,
-
     /// The draft message text.
     ///
     /// If the chat has not draft this is an empty string.
@@ -2653,7 +2617,6 @@ mod tests {
                 "is_sending_locations": false,
                 "color": 15895624,
                 "profile_image": "",
-                "subtitle": "bob@example.com",
                 "draft": "",
                 "is_muted": false
             }

src/constants.rs

@@ -314,8 +314,6 @@ const DC_STR_SELFNOTINGRP: usize = 21; // deprecated;
 const DC_STR_NOMESSAGES: usize = 1;
 const DC_STR_SELF: usize = 2;
 const DC_STR_DRAFT: usize = 3;
-const DC_STR_MEMBER: usize = 4;
-const DC_STR_CONTACT: usize = 6;
 const DC_STR_VOICEMESSAGE: usize = 7;
 const DC_STR_DEADDROP: usize = 8;
 const DC_STR_IMAGE: usize = 9;
@@ -347,7 +345,6 @@ const DC_STR_ARCHIVEDCHATS: usize = 40;
 const DC_STR_STARREDMSGS: usize = 41;
 const DC_STR_AC_SETUP_MSG_SUBJECT: usize = 42;
 const DC_STR_AC_SETUP_MSG_BODY: usize = 43;
-const DC_STR_SELFTALK_SUBTITLE: usize = 50;
 const DC_STR_CANNOT_LOGIN: usize = 60;
 const DC_STR_SERVER_RESPONSE: usize = 61;
 const DC_STR_MSGACTIONBYUSER: usize = 62;

src/dc_receive_imf.rs

@@ -1192,9 +1192,9 @@ fn create_or_lookup_adhoc_group(
         return Ok((ChatId::new(0), Blocked::Not));
     }
     // use subject as initial chat name
-    let grpname = mime_parser.get_subject().unwrap_or_else(|| {
-        context.stock_string_repl_int(StockMessage::Member, member_ids.len() as i32)
-    });
+    let grpname = mime_parser
+        .get_subject()
+        .unwrap_or("Unnamed group".to_string());
 
     // create group record
     let new_chat_id: ChatId = create_group_record(

src/stock.rs

@@ -35,12 +35,6 @@ pub enum StockMessage {
     #[strum(props(fallback = "Draft"))]
     Draft = 3,
 
-    #[strum(props(fallback = "%1$s member(s)"))]
-    Member = 4,
-
-    #[strum(props(fallback = "%1$s contact(s)"))]
-    Contact = 6,
-
     #[strum(props(fallback = "Voice message"))]
     VoiceMessage = 7,
 
@@ -136,9 +130,6 @@ pub enum StockMessage {
     ))]
     AcSetupMsgBody = 43,
 
-    #[strum(props(fallback = "Messages I sent to myself"))]
-    SelfTalkSubTitle = 50,
-
     #[strum(props(fallback = "Cannot login as %1$s."))]
     CannotLogin = 60,
 
@@ -430,8 +421,9 @@ mod tests {
         let t = dummy_context();
         // uses %1$s substitution
         assert_eq!(
-            t.ctx.stock_string_repl_str(StockMessage::Member, "42"),
-            "42 member(s)"
+            t.ctx
+                .stock_string_repl_str(StockMessage::MsgAddMember, "Foo"),
+            "Member Foo added."
         );
         // We have no string using %1$d to test...
     }
@@ -440,8 +432,8 @@ mod tests {
     fn test_stock_string_repl_int() {
         let t = dummy_context();
         assert_eq!(
-            t.ctx.stock_string_repl_int(StockMessage::Member, 42),
-            "42 member(s)"
+            t.ctx.stock_string_repl_int(StockMessage::MsgAddMember, 42),
+            "Member 42 added."
         );
     }