Changeset 458:78cd48f17c14 in SMSSender

Timestamp:

Jan 5, 2015 11:15:28 AM (3 years ago)

Author:

Sämy Zehnder <saemy.zehnder@…>

Branch:

new-gtwy-coopmobile

Message:

Fixes the computation of the sms costs and the splitting for the CoopMobile?
gateway.

File:

• gateways/CoopMobile/business/account_costs.cpp (modified) (3 diffs)

gateways/CoopMobile/business/account_costs.cpp

@@ -1 +1 @@
 /*
   Coop Mobile gateway plugin - The smssender plugin for the Coop Mobile platform.
-  Copyright (C) 2011-2014, gorrión. See http://smssender.gorrion.ch
+  Copyright (C) 2011-2015, gorrión. See http://smssender.gorrion.ch
 
   This program is free software: you can redistribute it and/or modify
@@ -58 +58 @@
 
     const bool messageContainsSpecialChars = hasSpecialChars(
-                message, '\r' + '\n' + GSM_CHARS + GSM_DOUBLE_PRICE_CHARS);
+                message, QString("\r\n") + GSM_CHARS + GSM_DOUBLE_PRICE_CHARS);
     const MaxCount *maxCount = messageContainsSpecialChars
             ? &SPECIAL_MAX_COUNT
@@ -86 +86 @@
 QStringList Account::MessageDivider::divideMessageIntoLongSMS(
         const QString &message) const {
-    return divideMessageIntoLongSMS(message + FORCED_MESSAGE_SUFFIX, NULL);
+    return divideMessageIntoLongSMS(message, NULL);
 }
 
 int Account::MessageDivider::costsForMessage(const QString &message) const {
     int costs;
-    divideMessageIntoLongSMS(message, &costs);
+    divideMessageIntoLongSMS(message + FORCED_MESSAGE_SUFFIX, &costs);
     return costs;
 }