Merge branch 'names' into 'master'

[messagingframework] Use clearer names for crypto signature account settings.… See merge request mer-core/messagingframework!25
sailfishos · Jan 4, 2019 · f9819a9 · f9819a9
2 parents bb2e61a + bdd5db7
commit f9819a9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/rpm/0020-Add-signature-settings-in-account.patch b/rpm/0020-Add-signature-settings-in-account.patch
@@ -1,4 +1,4 @@
-From 6573f8dff024a3a863f9e70cc38f6cf5e2832509 Mon Sep 17 00:00:00 2001
+From 77bc3dc3be744b3b74f90e472edb356c0c34009d Mon Sep 17 00:00:00 2001
 From: Damien Caliste <dcaliste@free.fr>
 Date: Mon, 5 Nov 2018 16:11:29 +0100
 Subject: [PATCH] Add signature settings in account
@@ -10,14 +10,14 @@ Subject: [PATCH] Add signature settings in account
  3 files changed, 72 insertions(+)
 
 diff --git a/src/libraries/qmfclient/qmailaccount.cpp b/src/libraries/qmfclient/qmailaccount.cpp
-index 8579636..b9381b9 100644
+index 8579636..b477e90 100644
 --- a/src/libraries/qmfclient/qmailaccount.cpp
 +++ b/src/libraries/qmfclient/qmailaccount.cpp
 @@ -61,6 +61,7 @@ static quint64 canCreateFoldersFlag = 0;
  static quint64 useSmartReplyFlag = 0;
  static quint64 canSearchOnServerFlag = 0;
  static quint64 hasPersistentConnectionFlag = 0;
-+static quint64 useCryptoSignatureFlag = 0;
++static quint64 useCryptoSignatureByDefaultFlag = 0;
 
  class QMailAccountPrivate : public QSharedData
  {
@@ -34,7 +34,7 @@ index 8579636..b9381b9 100644
  const quint64 &QMailAccount::UseSmartReply = useSmartReplyFlag;
  const quint64 &QMailAccount::CanSearchOnServer = canSearchOnServerFlag;
  const quint64 &QMailAccount::HasPersistentConnection = hasPersistentConnectionFlag;
-+const quint64 &QMailAccount::UseCryptoSignature = useCryptoSignatureFlag;
++const quint64 &QMailAccount::UseCryptoSignatureByDefault = useCryptoSignatureByDefaultFlag;
 
  /*!
      Creates an uninitialised account object.
@@ -90,14 +90,14 @@ index 8579636..b9381b9 100644
 
      Should be updated by QMailRetrievalAction::retrieveMessageList() when an account is synchronized.
 diff --git a/src/libraries/qmfclient/qmailaccount.h b/src/libraries/qmfclient/qmailaccount.h
-index 8ba3efa..2eb24fe 100644
+index 8ba3efa..9306dd9 100644
 --- a/src/libraries/qmfclient/qmailaccount.h
 +++ b/src/libraries/qmfclient/qmailaccount.h
 @@ -77,6 +77,7 @@ public:
      static const quint64 &UseSmartReply;
      static const quint64 &CanSearchOnServer;
      static const quint64 &HasPersistentConnection;
-+    static const quint64 &UseCryptoSignature;
++    static const quint64 &UseCryptoSignatureByDefault;
 
      QMailAccount();
      explicit QMailAccount(const QMailAccountId& id);
@@ -114,16 +114,16 @@ index 8ba3efa..2eb24fe 100644
      void setLastSynchronized(const QMailTimeStamp &synced);
 
 diff --git a/src/libraries/qmfclient/qmailstore_p.cpp b/src/libraries/qmfclient/qmailstore_p.cpp
-index 599b573..f6af612 100644
+index 599b573..bf7331e 100644
 --- a/src/libraries/qmfclient/qmailstore_p.cpp
 +++ b/src/libraries/qmfclient/qmailstore_p.cpp
 @@ -2671,6 +2671,10 @@ bool SSOAccountSatisfyTheProperty(Accounts::Account* ssoAccount, const QMailAcco
              status &= (~QMailAccount::AppendSignature);
              status |= appendSignature?(QMailAccount::AppendSignature):0;
 
-+            bool useCryptoSignature = ssoAccount->valueAsBool("crypto/sign");
-+            status &= (~QMailAccount::UseCryptoSignature);
-+            status |= useCryptoSignature?(QMailAccount::UseCryptoSignature):0;
++            bool useCryptoSignature = ssoAccount->valueAsBool("crypto/signByDefault");
++            status &= (~QMailAccount::UseCryptoSignatureByDefault);
++            status |= useCryptoSignature?(QMailAccount::UseCryptoSignatureByDefault):0;
 +
              bool hasPersistentConnection = ssoAccount->valueAsBool("hasPersistentConnection", false);
              status &= (~QMailAccount::HasPersistentConnection);
@@ -132,23 +132,23 @@ index 599b573..f6af612 100644
                                              63, true, const_cast<quint64 *>(&QMailMessage::Todo), t, false)
                  || attemptRegisterStatusBit(QLatin1String("HasSignature"), QLatin1String("messagestatus"),
                                              63, true, const_cast<quint64 *>(&QMailMessage::HasSignature), t, false)
-+                || attemptRegisterStatusBit(QLatin1String("UseCryptoSignature"), QLatin1String("accountstatus"),
-+                                            63, true, const_cast<quint64 *>(&QMailAccount::UseCryptoSignature), t, false)
++                || attemptRegisterStatusBit(QLatin1String("UseCryptoSignatureByDefault"), QLatin1String("accountstatus"),
++                                            63, true, const_cast<quint64 *>(&QMailAccount::UseCryptoSignatureByDefault), t, false)
                  || attemptRegisterStatusBit(QLatin1String("NoNotification"), QLatin1String("messagestatus"),
                                              63, true, const_cast<quint64 *>(&QMailMessage::NoNotification), t, false);
 
 @@ -3717,17 +3723,21 @@ QMailAccount QMailStorePrivate::extractAccount(const QSharedPointer<Accounts::Ac
      const bool& canTransmit = ssoAccount->valueAsBool("canTransmit", true);
      const bool& appendSignature = ssoAccount->valueAsBool("signatureEnabled", true);
      const bool& hasPersistentConnection = ssoAccount->valueAsBool("hasPersistentConnection", false);
-+    const bool& useCryptoSignature = ssoAccount->valueAsBool("crypto/sign");
++    const bool& useCryptoSignature = ssoAccount->valueAsBool("crypto/signByDefault");
 
      result.setStatus(QMailAccount::Enabled, enabled);
      result.setStatus(QMailAccount::PreferredSender, isDefault);
      result.setStatus(QMailAccount::CanTransmit, canTransmit);
      result.setStatus(QMailAccount::AppendSignature, appendSignature);
      result.setStatus(QMailAccount::HasPersistentConnection, hasPersistentConnection);
-+    result.setStatus(QMailAccount::UseCryptoSignature, useCryptoSignature);
++    result.setStatus(QMailAccount::UseCryptoSignatureByDefault, useCryptoSignature);
 
      result.setSignature(ssoAccount->valueAsString("signature"));
      result.setFromAddress(ssoAccount->contains("fullName")?
@@ -163,8 +163,8 @@ index 599b573..f6af612 100644
      ssoAccount->setValue("signatureEnabled", appendSignature);
      const bool hasPersistentConnection = (account->status() & QMailAccount::HasPersistentConnection);
      ssoAccount->setValue("hasPersistentConnection", hasPersistentConnection);
-+    const bool useCryptoSignature = (account->status() & QMailAccount::UseCryptoSignature);
-+    ssoAccount->setValue("crypto/sign", useCryptoSignature);
++    const bool useCryptoSignature = (account->status() & QMailAccount::UseCryptoSignatureByDefault);
++    ssoAccount->setValue("crypto/signByDefault", useCryptoSignature);
      ssoAccount->setValue("signature", account->signature());
 +    ssoAccount->setValue("crypto/pluginName", account->cryptoSignatureType());
 +    ssoAccount->setValue("crypto/keyNames", account->cryptoSignatureIds());
@@ -175,8 +175,8 @@ index 599b573..f6af612 100644
          ssoAccount->setValue("signatureEnabled", signatureEnabled);
          bool hasPersistentConnection = account->status() & QMailAccount::HasPersistentConnection;
          ssoAccount->setValue("hasPersistentConnection", hasPersistentConnection);
-+        bool useCryptoSignature = account->status() & QMailAccount::UseCryptoSignature;
-+        ssoAccount->setValue("crypto/sign", useCryptoSignature);
++        bool useCryptoSignature = account->status() & QMailAccount::UseCryptoSignatureByDefault;
++        ssoAccount->setValue("crypto/signByDefault", useCryptoSignature);
          ssoAccount->setValue("signature", account->signature());
 +        ssoAccount->setValue("crypto/pluginName", account->cryptoSignatureType());
 +        ssoAccount->setValue("crypto/keyNames", account->cryptoSignatureIds());

diff --git a/upstream b/upstream