commit 4e39aa5c14fb956c57d016f4361bab07ac5213d0
author Andreas Traczyk <andreas.traczyk@savoirfairelinux.com> Fri May 11 17:29:26 2018 -0400
committer Adrien Béraud <adrien.beraud@savoirfairelinux.com> Sat Sep 22 16:23:24 2018 -0400
tree ec5a72827c12b99adf551166f9305eebd26edd30
parent c8035c6f0798336b97a3cbd5c56868c990ca2c6e

fix: check out_of_range exceptions from ContactModel::getContact

Change-Id: Ibc82dc1fe85bb9b331e39639dd874afb89b616c9
Reviewed-by: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>

src/utils.h

diff --git a/src/utils.h b/src/utils.h
index 144ca95..294b9cc 100755
--- a/src/utils.h
+++ b/src/utils.h
@@ -36,14 +36,19 @@
 
 static inline NSString* bestIDForConversation(const lrc::api::conversation::Info& conv, const lrc::api::ConversationModel& model)
 {
-    auto contact = model.owner.contactModel->getContact(conv.participants[0]);
-    if (!contact.registeredName.empty()) {
-        contact.registeredName.erase(std::remove(contact.registeredName.begin(), contact.registeredName.end(), '\n'), contact.registeredName.end());
-        contact.registeredName.erase(std::remove(contact.registeredName.begin(), contact.registeredName.end(), '\r'), contact.registeredName.end());
-        return [@(contact.registeredName.c_str()) removeEmptyLinesAtBorders];
+    try {
+        auto contact = model.owner.contactModel->getContact(conv.participants[0]);
+        if (!contact.registeredName.empty()) {
+            contact.registeredName.erase(std::remove(contact.registeredName.begin(), contact.registeredName.end(), '\n'), contact.registeredName.end());
+            contact.registeredName.erase(std::remove(contact.registeredName.begin(), contact.registeredName.end(), '\r'), contact.registeredName.end());
+            return [@(contact.registeredName.c_str()) removeEmptyLinesAtBorders];
+        }
+        else {
+            return [@(contact.profileInfo.uri.c_str()) removeEmptyLinesAtBorders];
+        }
+    } catch (std::out_of_range& e) {
+        NSLog(@"bestIDForConversation: getContact - out of range");
     }
-    else
-        return [@(contact.profileInfo.uri.c_str()) removeEmptyLinesAtBorders];
 }
 
 static inline NSString* bestIDForAccount(const lrc::api::account::Info& account)
@@ -80,17 +85,21 @@
 
 static inline NSString* bestNameForConversation(const lrc::api::conversation::Info& conv, const lrc::api::ConversationModel& model)
 {
-    auto contact = model.owner.contactModel->getContact(conv.participants[0]);
-    if (contact.profileInfo.alias.empty()) {
-        return bestIDForConversation(conv, model);
+    try {
+        auto contact = model.owner.contactModel->getContact(conv.participants[0]);
+        if (contact.profileInfo.alias.empty()) {
+            return bestIDForConversation(conv, model);
+        }
+        auto alias = contact.profileInfo.alias;
+        alias.erase(std::remove(alias.begin(), alias.end(), '\n'), alias.end());
+        alias.erase(std::remove(alias.begin(), alias.end(), '\r'), alias.end());
+        if(alias.length() == 0) {
+            return bestIDForConversation(conv, model);
+        }
+        return @(alias.c_str());
+    } catch (std::out_of_range& e) {
+        NSLog(@"bestNameForConversation: getContact - out of range");
     }
-    auto alias = contact.profileInfo.alias;
-    alias.erase(std::remove(alias.begin(), alias.end(), '\n'), alias.end());
-    alias.erase(std::remove(alias.begin(), alias.end(), '\r'), alias.end());
-    if(alias.length() == 0) {
-        return bestIDForConversation(conv, model);
-    }
-    return @(alias.c_str());
 }
 
 static inline lrc::api::profile::Type profileType(const lrc::api::conversation::Info& conv, const lrc::api::ConversationModel& model)