Merge lp:~pat-mcgowan/messaging-app/revert-counts into lp:messaging-app

[Pat McGowan]

The character count logic is much more complex and needs to account for escape characters and different encoding schemes that change the counts.
For now this hides the elements that were added. Anyone who turned it on will no longer see them.

The character count logic is much more complex and needs to account for escape characters and different encoding schemes that change the counts.
For now this hides the elements that were added. Anyone who turned it on will no longer see them.

[Tiago Salem Herrmann (tiagosh)]

code looks good.
thank you.

review: Approve

=== modified file 'src/qml/ComposeBar.qml'
--- src/qml/ComposeBar.qml	2016-08-19 15:15:09 +0000
+++ src/qml/ComposeBar.qml	2016-08-31 13:58:42 +0000
@@ -462,7 +462,9 @@
                 fontSize: "small"
                 font.italic: messageTextArea.inputMethodComposing && (attachments.count == 0) && !usingMMS
                 color: Theme.palette.normal.backgroundTertiaryText
-                visible: msgSettings.showCharacterCount && (messageTextArea.lineCount > 1)
+                // hide this option for now
+                //visible: msgSettings.showCharacterCount && (messageTextArea.lineCount > 1)
+                visible: false
             }
 
         }

=== modified file 'src/qml/SettingsPage.qml'
--- src/qml/SettingsPage.qml	2016-08-19 15:14:50 +0000
+++ src/qml/SettingsPage.qml	2016-08-31 13:58:42 +0000
@@ -25,18 +25,18 @@
     title: i18n.tr("Settings")
 
     property var setMethods: {
-        "mmsGroupChatEnabled": function(value) { telepathyHelper.mmsGroupChat = value },
-        "characterCountEnabled": function(value) { msgSettings.showCharacterCount = value }
+        "mmsGroupChatEnabled": function(value) { telepathyHelper.mmsGroupChat = value }/*,
+        "characterCountEnabled": function(value) { msgSettings.showCharacterCount = value }*/
     }
     property var settingsModel: [
         { "name": "mmsGroupChatEnabled",
           "description": i18n.tr("Enable MMS group chat"),
           "property": telepathyHelper.mmsGroupChat
-        },
+        }/*,
         { "name": "characterCountEnabled",
           "description": i18n.tr("Show character count"),
           "property": msgSettings.showCharacterCount
-        }
+        }*/
     ]
 
     // These fake items are used to track if there are instances loaded