SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sms-list: don't look for duplicate parts if index is unknown

Browse Source
This commit is contained in:
Aleksander Morgado
2012-09-14 07:05:25 +02:00
parent 4f1991e2ba
commit 628f7e41a4
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-sms-list.c
+19 -9
View File
@@ -300,7 +300,8 @@ mm_sms_list_take_part (MMSmsList *self,
ctx.storage = storage;
/* Ensure we don't have already taken a part with the same index */
if (g_list_find_custom (self->priv->list,
if (mm_sms_part_get_index (part) != SMS_PART_INVALID_INDEX &&
g_list_find_custom (self->priv->list,
&ctx,
(GCompareFunc)cmp_sms_by_part_index_and_storage)) {
g_set_error (error,
@@ -313,18 +314,27 @@ mm_sms_list_take_part (MMSmsList *self,
/* Did we just get a part of a multi-part SMS? */
if (mm_sms_part_should_concat (part)) {
mm_dbg ("SMS part at '%s/%u' is from a multipart SMS (reference: '%u', sequence: '%u')",
mm_sms_storage_get_string (storage),
mm_sms_part_get_index (part),
mm_sms_part_get_concat_reference (part),
mm_sms_part_get_concat_sequence (part));
if (mm_sms_part_get_index (part) != SMS_PART_INVALID_INDEX)
mm_dbg ("SMS part at '%s/%u' is from a multipart SMS (reference: '%u', sequence: '%u')",
mm_sms_storage_get_string (storage),
mm_sms_part_get_index (part),
mm_sms_part_get_concat_reference (part),
mm_sms_part_get_concat_sequence (part));
else
mm_dbg ("SMS part (not stored) is from a multipart SMS (reference: '%u', sequence: '%u')",
mm_sms_part_get_concat_reference (part),
mm_sms_part_get_concat_sequence (part));
return take_multipart (self, part, state, storage, error);
}
/* Otherwise, we build a whole new single-part MMSms just from this part */
mm_dbg ("SMS part at '%s/%u' is from a singlepart SMS",
mm_sms_storage_get_string (storage),
mm_sms_part_get_index (part));
if (mm_sms_part_get_index (part) != SMS_PART_INVALID_INDEX)
mm_dbg ("SMS part at '%s/%u' is from a singlepart SMS",
mm_sms_storage_get_string (storage),
mm_sms_part_get_index (part));
else
mm_dbg ("SMS part (not stored) is from a singlepart SMS");
return take_singlepart (self, part, state, storage, error);
}