Don't expand when not necessary

f64bc6a0 · Laurent Montel · c362da00 · f64bc6a0
Commit f64bc6a0 authored Mar 10, 2016 by Laurent Montel 😁
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

plugins/messageviewerplugins/expandurlplugin/viewerpluginexpandurlinterface.cpp ...lugins/expandurlplugin/viewerpluginexpandurlinterface.cpp +6 -2

No files found.
--- a/plugins/messageviewerplugins/expandurlplugin/viewerpluginexpandurlinterface.cpp
+++ b/plugins/messageviewerplugins/expandurlplugin/viewerpluginexpandurlinterface.cpp
@@ -17,6 +17,8 @@

 #include "viewerpluginexpandurlinterface.h"
 #include <MessageViewer/ScamExpandUrlJob>
+#include <MessageViewer/ScamCheckShortUrlManager>
+#include <MessageViewer/ScamCheckShortUrl>

 #include <QHBoxLayout>
 #include <QIcon>
@@ -47,8 +49,10 @@ QAction *ViewerPluginExpandurlInterface::action() const
 void ViewerPluginExpandurlInterface::showWidget()
 {
    if (mCurrentUrl.isValid()) {
-        MessageViewer::ScamExpandUrlJob *job = new MessageViewer::ScamExpandUrlJob(this);
-        job->expandedUrl(mCurrentUrl);
+        if (MessageViewer::ScamCheckShortUrlManager::self()->scamCheckShortUrl()->isShortUrl(mCurrentUrl)) {
+            MessageViewer::ScamExpandUrlJob *job = new MessageViewer::ScamExpandUrlJob(this);
+            job->expandedUrl(mCurrentUrl);
+        }
    }
 }