Merge lp:~michael-sheldon/ubuntu-keyboard/email-detection into lp:ubuntu-keyboard

[Michael Sheldon]

Detect if the user is entering an email address whilst in a field that supports predictions and suppress predictions, auto-caps and auto-spacing unless the input method requires predictions for standard character input (e.g. pinyin).

Detect if the user is entering an email address whilst in a field that supports predictions and suppress predictions, auto-caps and auto-spacing unless the input method requires predictions for standard character input (e.g. pinyin).

[Michael Sheldon (michael-sheldon)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-keyboard) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:236
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/489/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/115
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/114
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/114/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/114

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/489/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

one minor issue:
I test trying to login to twitter.com using my email address for username. Seems that after typing the @ sign and then returning to the ABC keyboard layout the shift key gets enabled, which we don't want.

review: Needs Fixing

[lp:~michael-sheldon/ubuntu-keyboard/email-detection]

237. By Michael Sheldon on 2014-10-29

Fix delayed autocaps deactivation

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:237
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/492/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/117
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/117/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/117

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/492/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

same problem occurs where the caps is turned on after entering the @ sign and returning to the main layout. Easiest way to reproduce is with the twitter webapp

review: Needs Fixing

[Bill Filler (bfiller)]

works now

review: Approve

=== modified file 'plugins/pinyin/src/chineselanguagefeatures.cpp'
--- plugins/pinyin/src/chineselanguagefeatures.cpp	2014-09-08 15:09:32 +0000
+++ plugins/pinyin/src/chineselanguagefeatures.cpp	2014-10-29 17:51:15 +0000
@@ -56,7 +56,7 @@
 
 bool ChineseLanguageFeatures::isSeparator(const QString &text) const
 {
-    static const QString separators = QString::fromUtf8("。、,!?:;\r\n");
+    static const QString separators = QString::fromUtf8("。、,!?:;.\r\n");
 
     if (text.isEmpty()) {
         return false;

=== modified file 'qml/Keyboard.qml'
--- qml/Keyboard.qml	2014-09-16 12:39:01 +0000
+++ qml/Keyboard.qml	2014-10-29 17:51:15 +0000
@@ -258,6 +258,7 @@
                         keypad.activeKeypadState = "NORMAL";
                         keypad.autoCapsTriggered = false;
                     }
+                    keypad.delayedAutoCaps = false;
                 }
             }
 

=== modified file 'src/plugin/inputmethod.cpp'
--- src/plugin/inputmethod.cpp	2014-10-07 15:44:46 +0000
+++ src/plugin/inputmethod.cpp	2014-10-29 17:51:15 +0000
@@ -423,7 +423,12 @@
         int position;
         bool ok = d->host->surroundingText(text, position);
         QString textOnLeft = d->editor.text()->surroundingLeft() + d->editor.text()->preedit();
-        if (ok && ((text.isEmpty() && d->editor.text()->preedit().isEmpty() && position == 0) 
+        QStringList leftHandWords = textOnLeft.split(" ");
+        bool email_detected = false;
+        if (!leftHandWords.isEmpty() && leftHandWords.last().contains("@")) {
+            email_detected = true;
+        }
+        if (ok && !email_detected && ((text.isEmpty() && d->editor.text()->preedit().isEmpty() && position == 0) 
                 || d->editor.wordEngine()->languageFeature()->activateAutoCaps(textOnLeft)
                 || d->editor.wordEngine()->languageFeature()->activateAutoCaps(textOnLeft.trimmed()))) {
             Q_EMIT activateAutocaps();

=== modified file 'src/view/abstracttexteditor.cpp'
--- src/view/abstracttexteditor.cpp	2014-10-10 13:27:50 +0000
+++ src/view/abstracttexteditor.cpp	2014-10-29 17:51:15 +0000
@@ -429,6 +429,17 @@
     QString keyText = QString("");
     Qt::Key event_key = Qt::Key_unknown;
     bool look_for_a_double_space = d->look_for_a_double_space;
+    bool email_detected = false;
+
+    // Detect if the user is entering an email address and avoid spacing, autocaps and autocomplete changes
+    QString textOnLeft = d->text->surroundingLeft() + d->text->preedit();
+    if (key.action() == Key::ActionBackspace) {
+        textOnLeft.chop(1);
+    }
+    QStringList leftHandWords = textOnLeft.split(" ");
+    if (!d->word_engine->languageFeature()->alwaysShowSuggestions() && !leftHandWords.isEmpty() && leftHandWords.last().contains("@")) {
+        email_detected = true;
+    }
 
     if (look_for_a_double_space) {
         // we reset the flag here so that we won't have to add boilerplate code later
@@ -445,8 +456,8 @@
                     not d->text->preedit().isEmpty() && isSeparator;
 
         if (d->preedit_enabled) {
-            if (d->text->surroundingRight().left(1).contains(QRegExp("[\\w]"))) {
-                // We're editing in the middle of a word, so just insert characters directly
+            if (d->text->surroundingRight().left(1).contains(QRegExp("[\\w]")) || email_detected) {
+                // We're editing in the middle of a word or entering an email address, so just insert characters directly
                 d->text->appendToPreedit(text);
                 commitPreedit();
                 alreadyAppended = true;
@@ -454,24 +465,28 @@
                 // this means we should commit the candidate, add the separator and whitespace
                 d->text->setPreedit(d->text->primaryCandidate());
                 d->text->appendToPreedit(text);
-                if (d->keyboardState == "CHARACTERS") {
+                if (d->keyboardState == "CHARACTERS" && !email_detected) {
                     d->appendix_for_previous_preedit = d->word_engine->languageFeature()->appendixForReplacedPreedit(d->text->preedit());
                     d->text->appendToPreedit(d->appendix_for_previous_preedit);
                 }
                 commitPreedit();
-                auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(d->text->surroundingLeft() + d->text->preedit() + text);
+                if (!email_detected) {
+                    auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(d->text->surroundingLeft() + d->text->preedit() + text);
+                }
                 alreadyAppended = true;
             }
             else if (d->auto_correct_enabled && (isSeparator || isSymbol)) {
-                if(isSeparator && d->keyboardState == "CHARACTERS") {
+                if(isSeparator && d->keyboardState == "CHARACTERS" && !email_detected) {
                     // remove all whitespaces before the separator, then add a whitespace after it
                     removeTrailingWhitespaces();
                 }
 
                 d->text->appendToPreedit(text);
-                auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(d->text->surroundingLeft() + d->text->preedit());
-                if(isSeparator && d->keyboardState == "CHARACTERS") {
-                    d->text->appendToPreedit(d->word_engine->languageFeature()->appendixForReplacedPreedit(d->text->preedit()));
+                if (!email_detected) {
+                    auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(d->text->surroundingLeft() + d->text->preedit());
+                    if(isSeparator && d->keyboardState == "CHARACTERS") {
+                        d->text->appendToPreedit(d->word_engine->languageFeature()->appendixForReplacedPreedit(d->text->preedit()));
+                    }
                 }
                 commitPreedit();
                 alreadyAppended = true;
@@ -505,8 +520,10 @@
     case Key::ActionBackspace: {
         if (not d->backspace_sent) {
             singleBackspace();
-            checkPreeditReentry(true);
-        } else {
+            if (!email_detected) {
+                checkPreeditReentry(true);
+            }
+        } else if (!email_detected) {
             checkPreeditReentry(false);
         }