work on msg sending.

pri/build_opts.pri

@@ -58,7 +58,7 @@ mac:qtHaveModule(macextras) {
 win32 {
   RC_ICONS = ../../resources/graphics/rssguard.ico
   QMAKE_TARGET_COMPANY = $$APP_AUTHOR
-  QMAKE_TARGET_DESCRIPTION = $$APP_NAME ($$APP_TYPE)
+  QMAKE_TARGET_DESCRIPTION = $$APP_NAME
   QMAKE_TARGET_COPYRIGHT = $$APP_COPYRIGHT
   QMAKE_TARGET_PRODUCT = $$APP_NAME
   

pri/vars.pri

@@ -4,7 +4,7 @@ APP_REVERSE_NAME              = "com.github.rssguard"
 APP_LOW_H_NAME                = ".rssguard"
 APP_AUTHOR                    = "Martin Rotter"
 APP_COPYRIGHT                 = "(C) 2011-2020 $$APP_AUTHOR"
-APP_VERSION                   = "3.7.0"
+APP_VERSION                   = "3.7.1"
 APP_LONG_NAME                 = "$$APP_NAME $$APP_VERSION"
 APP_EMAIL                     = "rotter.martinos@gmail.com"
 APP_URL                       = "https://github.com/martinrotter/rssguard"

src/librssguard/miscellaneous/application.cpp

@@ -523,6 +523,7 @@ void Application::onFeedUpdatesProgress(const Feed* feed, int current, int total
 void Application::onFeedUpdatesFinished(const FeedDownloadResults& results) {
   if (!results.updatedFeeds().isEmpty()) {
     // Now, inform about results via GUI message/notification.
-    qApp->showGuiMessage(tr("New messages downloaded"), results.overview(10), QSystemTrayIcon::NoIcon, nullptr, false);
+    qApp->showGuiMessage(tr("New messages downloaded"), results.overview(10), QSystemTrayIcon::MessageIcon::NoIcon,
+                         nullptr, false);
   }
 }

src/librssguard/services/gmail/definitions.h

@@ -7,6 +7,7 @@
 #define GMAIL_OAUTH_TOKEN_URL     "https://accounts.google.com/o/oauth2/token"
 #define GMAIL_OAUTH_SCOPE         "https://mail.google.com/"
 
+#define GMAIL_API_SEND_MESSAGE      "https://www.googleapis.com/upload/gmail/v1/users/me/messages/send?uploadType=multipart"
 #define GMAIL_API_BATCH_UPD_LABELS  "https://www.googleapis.com/gmail/v1/users/me/messages/batchModify"
 #define GMAIL_API_GET_ATTACHMENT    "https://www.googleapis.com/gmail/v1/users/me/messages/%1/attachments/%2"
 #define GMAIL_API_LABELS_LIST       "https://www.googleapis.com/gmail/v1/users/me/labels"

src/librssguard/services/gmail/gmailserviceroot.cpp

@@ -33,7 +33,7 @@ GmailServiceRoot::GmailServiceRoot(GmailNetworkFactory* network, RootItem* paren
 GmailServiceRoot::~GmailServiceRoot() = default;
 
 void GmailServiceRoot::updateTitle() {
-  setTitle(m_network->userName() + QSL(" (Gmail)"));
+  setTitle(m_network->username() + QSL(" (Gmail)"));
 }
 
 RootItem* GmailServiceRoot::obtainNewTreeForSyncIn() const {
@@ -78,7 +78,7 @@ void GmailServiceRoot::saveAccountDataToDatabase() {
   QSqlDatabase database = qApp->database()->connection(metaObject()->className());
 
   if (accountId() != NO_PARENT_CATEGORY) {
-    if (DatabaseQueries::overwriteGmailAccount(database, m_network->userName(),
+    if (DatabaseQueries::overwriteGmailAccount(database, m_network->username(),
                                                m_network->oauth()->clientId(),
                                                m_network->oauth()->clientSecret(),
                                                m_network->oauth()->redirectUrl(),
@@ -95,7 +95,7 @@ void GmailServiceRoot::saveAccountDataToDatabase() {
 
     if (saved) {
       if (DatabaseQueries::createGmailAccount(database, id_to_assign,
-                                              m_network->userName(),
+                                              m_network->username(),
                                               m_network->oauth()->clientId(),
                                               m_network->oauth()->clientSecret(),
                                               m_network->oauth()->redirectUrl(),

src/librssguard/services/gmail/gui/emailrecipientcontrol.cpp

@@ -35,3 +35,11 @@ EmailRecipientControl::EmailRecipientControl(const QString& recipient, QWidget*
 
   setLayout(lay);
 }
+
+QString EmailRecipientControl::recipientAddress() const {
+  return m_txtRecipient->text();
+}
+
+RecipientType EmailRecipientControl::recipientType() const {
+  return RecipientType(m_cmbRecipientType->currentData(Qt::ItemDataRole::UserRole).toInt());
+}

src/librssguard/services/gmail/gui/emailrecipientcontrol.h

@@ -5,6 +5,8 @@
 
 #include <QWidget>
 
+#include "services/gmail/definitions.h"
+
 class QComboBox;
 class QLineEdit;
 class PlainToolButton;
@@ -15,6 +17,10 @@ class EmailRecipientControl : public QWidget {
   public:
     explicit EmailRecipientControl(const QString& recipient, QWidget* parent = nullptr);
 
+  public:
+    QString recipientAddress() const;
+    RecipientType recipientType() const;
+
   signals:
     void removalRequested();
 

src/librssguard/services/gmail/gui/formaddeditemail.cpp

@@ -2,11 +2,15 @@
 
 #include "services/gmail/gui/formaddeditemail.h"
 
+#include "3rd-party/mimesis/mimesis.hpp"
+#include "exceptions/applicationexception.h"
 #include "gui/guiutilities.h"
+#include "gui/messagebox.h"
 #include "miscellaneous/application.h"
 #include "miscellaneous/iconfactory.h"
 #include "services/gmail/gmailserviceroot.h"
 #include "services/gmail/gui/emailrecipientcontrol.h"
+#include "services/gmail/network/gmailnetworkfactory.h"
 
 FormAddEditEmail::FormAddEditEmail(GmailServiceRoot* root, QWidget* parent) : QDialog(parent), m_root(root) {
   m_ui.setupUi(this);
@@ -22,6 +26,11 @@ FormAddEditEmail::FormAddEditEmail(GmailServiceRoot* root, QWidget* parent) : QD
   connect(m_ui.m_btnAdder, &PlainToolButton::clicked, this, [=]() {
     addRecipientRow();
   });
+
+  connect(m_ui.m_buttonBox->button(QDialogButtonBox::StandardButton::Ok),
+          &QPushButton::clicked,
+          this,
+          &FormAddEditEmail::onOkClicked);
 }
 
 void FormAddEditEmail::execForAdd() {
@@ -38,10 +47,95 @@ void FormAddEditEmail::removeRecipientRow() {
   sndr->deleteLater();
 }
 
+void FormAddEditEmail::onOkClicked() {
+  Mimesis::Message msg;
+  auto username = m_root->network()->username();
+
+  if (!username.endsWith(QSL("@gmail.com"))) {
+    username += QSL("@gmail.com");
+  }
+
+  msg["From"] = username.toStdString();
+
+  auto recipients = recipientControls();
+  QStringList rec_to, rec_cc, rec_bcc, rec_repl;
+
+  for (EmailRecipientControl* ctrl : recipients) {
+    switch (ctrl->recipientType()) {
+      case RecipientType::Cc:
+        rec_cc << ctrl->recipientAddress();
+        break;
+
+      case RecipientType::To:
+        rec_to << ctrl->recipientAddress();
+        break;
+
+      case RecipientType::Bcc:
+        rec_bcc << ctrl->recipientAddress();
+        break;
+
+      case RecipientType::ReplyTo:
+        rec_repl << ctrl->recipientAddress();
+        break;
+    }
+  }
+
+  if (!rec_cc.isEmpty()) {
+    msg["Cc"] = rec_cc.join(',').toStdString();
+  }
+
+  if (!rec_to.isEmpty()) {
+    msg["To"] = rec_to.join(',').toStdString();
+  }
+
+  if (!rec_bcc.isEmpty()) {
+    msg["Bcc"] = rec_bcc.join(',').toStdString();
+  }
+
+  if (!rec_repl.isEmpty()) {
+    msg["Reply-To"] = rec_repl.join(',').toStdString();
+  }
+
+  msg["Subject"] = m_ui.m_txtSubject->text().toStdString();
+  msg.set_plain(m_ui.m_txtMessage->toPlainText().toStdString());
+
+  if (m_originalMessage == nullptr) {
+    // Send completely new message.
+  }
+  else {
+    // TODO: Reply to existing message.
+  }
+
+  try {
+    m_root->network()->sendEmail(msg);
+    accept();
+  }
+  catch (const ApplicationException& ex) {
+    MessageBox::show(this, QMessageBox::Icon::Critical,
+                     tr("E-mail NOT sent"), tr("Your e-mail message wasn't sent."),
+                     QString(),
+                     ex.message());
+  }
+}
+
 void FormAddEditEmail::addRecipientRow(const QString& recipient) {
   auto* mail_rec = new EmailRecipientControl(recipient, this);
 
   connect(mail_rec, &EmailRecipientControl::removalRequested, this, &FormAddEditEmail::removeRecipientRow);
 
-  m_ui.m_layout->insertRow(m_ui.m_layout->indexOf(m_ui.m_txtMessage) - 1, mail_rec);
+  m_ui.m_layout->insertRow(m_ui.m_layout->count() - 5, mail_rec);
+}
+
+QList<EmailRecipientControl*> FormAddEditEmail::recipientControls() const {
+  QList<EmailRecipientControl*> list;
+
+  for (int i = 0; i < m_ui.m_layout->count(); i++) {
+    auto* wdg = qobject_cast<EmailRecipientControl*>(m_ui.m_layout->itemAt(i)->widget());
+
+    if (wdg != nullptr) {
+      list.append(wdg);
+    }
+  }
+
+  return list;
 }

src/librssguard/services/gmail/gui/formaddeditemail.h

@@ -12,6 +12,7 @@ namespace Ui {
 }
 
 class GmailServiceRoot;
+class Message;
 class EmailRecipientControl;
 
 class FormAddEditEmail : public QDialog {
@@ -25,13 +26,18 @@ class FormAddEditEmail : public QDialog {
 
   private slots:
     void removeRecipientRow();
+    void onOkClicked();
     void addRecipientRow(const QString& recipient = QString());
 
+  private:
+    QList<EmailRecipientControl*> recipientControls() const;
+
   private:
     GmailServiceRoot* m_root;
 
     Ui::FormAddEditEmail m_ui;
     QList<EmailRecipientControl*> m_recipientControls;
+    Message* m_originalMessage;
 };
 
 #endif // FORMADDEDITEMAIL_H

src/librssguard/services/gmail/gui/formaddeditemail.ui

@@ -6,27 +6,37 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>552</width>
-    <height>491</height>
+    <width>423</width>
+    <height>310</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Write e-mail message</string>
   </property>
   <layout class="QFormLayout" name="m_layout">
-   <item row="0" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>From</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <widget class="QLineEdit" name="m_txtSender">
-     <property name="placeholderText">
-      <string>Name and address of this e-mail message sender</string>
-     </property>
-    </widget>
+   <item row="0" column="0" colspan="2">
+    <layout class="QHBoxLayout" name="m_layoutAdder">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="PlainToolButton" name="m_btnAdder">
+       <property name="text">
+        <string>...</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item row="2" column="0" colspan="2">
     <widget class="QTextEdit" name="m_txtMessage">
@@ -51,29 +61,22 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0" colspan="2">
-    <layout class="QHBoxLayout" name="m_layoutAdder">
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="PlainToolButton" name="m_btnAdder">
-       <property name="text">
-        <string>...</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+   <item row="1" column="0">
+    <widget class="QLabel" name="m_lblSubject">
+     <property name="text">
+      <string>Subject</string>
+     </property>
+     <property name="buddy">
+      <cstring>m_txtSubject</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QLineEdit" name="m_txtSubject">
+     <property name="placeholderText">
+      <string>Title of your message</string>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>
@@ -84,24 +87,13 @@
    <header>plaintoolbutton.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>m_btnAdder</tabstop>
+  <tabstop>m_txtSubject</tabstop>
+  <tabstop>m_txtMessage</tabstop>
+ </tabstops>
  <resources/>
  <connections>
-  <connection>
-   <sender>m_buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>FormAddEditEmail</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>m_buttonBox</sender>
    <signal>rejected()</signal>

src/librssguard/services/gmail/gui/formeditgmailaccount.cpp

@@ -170,7 +170,7 @@ void FormEditGmailAccount::execForEdit(GmailServiceRoot* existing_root) {
   m_ui.m_txtAppKey->lineEdit()->setText(existing_root->network()->oauth()->clientSecret());
   m_ui.m_txtRedirectUrl->lineEdit()->setText(existing_root->network()->oauth()->redirectUrl());
 
-  m_ui.m_txtUsername->lineEdit()->setText(existing_root->network()->userName());
+  m_ui.m_txtUsername->lineEdit()->setText(existing_root->network()->username());
   m_ui.m_spinLimitMessages->setValue(existing_root->network()->batchSize());
 
   exec();

src/librssguard/services/gmail/network/gmailnetworkfactory.cpp

@@ -3,6 +3,7 @@
 #include "services/gmail/network/gmailnetworkfactory.h"
 
 #include "definitions/definitions.h"
+#include "exceptions/applicationexception.h"
 #include "gui/dialogs/formmain.h"
 #include "gui/tabwidget.h"
 #include "miscellaneous/application.h"
@@ -39,7 +40,7 @@ OAuth2Service* GmailNetworkFactory::oauth() const {
   return m_oauth2;
 }
 
-QString GmailNetworkFactory::userName() const {
+QString GmailNetworkFactory::username() const {
   return m_username;
 }
 
@@ -51,6 +52,27 @@ void GmailNetworkFactory::setBatchSize(int batch_size) {
   m_batchSize = batch_size;
 }
 
+void GmailNetworkFactory::sendEmail(const Mimesis::Message& msg) {
+  QString bearer = m_oauth2->bearer().toLocal8Bit();
+
+  if (bearer.isEmpty()) {
+    throw ApplicationException(tr("you aren't logged in"));
+  }
+
+  QString rfc_email = QString::fromStdString(msg.to_string());
+  QString json = QSL("{\"raw\": \"%1\"}").arg(QString(rfc_email.toUtf8().toBase64(QByteArray::Base64Option::Base64UrlEncoding)));
+  QByteArray input_data = json.toUtf8();
+  QList<QPair<QByteArray, QByteArray>> headers;
+  QByteArray out;
+  auto xx = NetworkFactory::performNetworkOperation(GMAIL_API_SEND_MESSAGE,
+                                                    DOWNLOAD_TIMEOUT,
+                                                    input_data,
+                                                    out,
+                                                    QNetworkAccessManager::Operation::PostOperation,
+                                                    headers);
+  int a = 5;
+}
+
 void GmailNetworkFactory::initializeOauth() {
   connect(m_oauth2, &OAuth2Service::tokensRetrieveError, this, &GmailNetworkFactory::onTokensError);
   connect(m_oauth2, &OAuth2Service::authFailed, this, &GmailNetworkFactory::onAuthFailed);

src/librssguard/services/gmail/network/gmailnetworkfactory.h

@@ -7,6 +7,7 @@
 
 #include "core/message.h"
 
+#include "3rd-party/mimesis/mimesis.hpp"
 #include "services/abstract/feed.h"
 #include "services/abstract/rootitem.h"
 
@@ -27,17 +28,14 @@ class GmailNetworkFactory : public QObject {
 
     OAuth2Service* oauth() const;
 
-    QString userName() const;
+    QString username() const;
     void setUsername(const QString& username);
 
     // Gets/sets the amount of messages to obtain during single feed update.
     int batchSize() const;
     void setBatchSize(int batch_size);
 
-    // Returns tree of feeds/categories.
-    // Top-level root of the tree is not needed here.
-    // Returned items do not have primary IDs assigned.
-    //RootItem* feedsCategories();
+    void sendEmail(const Mimesis::Message& msg);
 
     Downloader* downloadAttachment(const QString& msg_id, const QString& attachment_id);