Commit 9cccbe99 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Minor optimization

parent 0e021e3f
Pipeline #25619 failed with stage
in 60 minutes and 1 second
...@@ -38,10 +38,11 @@ using namespace KItinerary; ...@@ -38,10 +38,11 @@ using namespace KItinerary;
static bool isPkPassContent(KMime::Content *content) static bool isPkPassContent(KMime::Content *content)
{ {
const auto ct = content->contentType(); const auto ct = content->contentType();
if (ct->mimeType() == "application/vnd.apple.pkpass") { const QByteArray mimetype = ct->mimeType();
if (mimetype == "application/vnd.apple.pkpass") {
return true; return true;
} }
if (ct->mimeType() != "application/octet-stream" && ct->mimeType() != "application/zip") { if (mimetype != "application/octet-stream" && mimetype != "application/zip") {
return false; return false;
} }
if (ct->name().endsWith(QLatin1String("pkpass"))) { if (ct->name().endsWith(QLatin1String("pkpass"))) {
...@@ -54,13 +55,14 @@ static bool isPkPassContent(KMime::Content *content) ...@@ -54,13 +55,14 @@ static bool isPkPassContent(KMime::Content *content)
static bool isCalendarContent(KMime::Content *content) static bool isCalendarContent(KMime::Content *content)
{ {
const auto ct = content->contentType(); const auto ct = content->contentType();
if (ct->mimeType() == "text/calendar") { const QByteArray mimetype = ct ? ct->mimeType() : QByteArray();
if (mimetype == "text/calendar") {
return true; return true;
} }
if (ct->mimeType() != "text/plain" && ct->mimeType() != "application/octet-stream") { if (mimetype != "text/plain" && mimetype != "application/octet-stream") {
return false; return false;
} }
if (ct->name().endsWith(QLatin1String(".ics"))) { if (ct && ct->name().endsWith(QLatin1String(".ics"))) {
return true; return true;
} }
const auto cd = content->contentDisposition(false); const auto cd = content->contentDisposition(false);
......
...@@ -40,10 +40,11 @@ ...@@ -40,10 +40,11 @@
static bool isPkPassContent(KMime::Content *content) static bool isPkPassContent(KMime::Content *content)
{ {
const auto ct = content->contentType(false); const auto ct = content->contentType(false);
if (ct && ct->mimeType() == "application/vnd.apple.pkpass") { const QByteArray mimetype = ct ? ct->mimeType() : QByteArray();
if (mimetype == "application/vnd.apple.pkpass") {
return true; return true;
} }
if (ct && ct->mimeType() != "application/octet-stream" && ct->mimeType() != "application/zip") { if (mimetype != "application/octet-stream" && mimetype != "application/zip") {
return false; return false;
} }
if (ct && ct->name().endsWith(QLatin1String("pkpass"))) { if (ct && ct->name().endsWith(QLatin1String("pkpass"))) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment