Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4968)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/spellchecker/SpellCheckerSessionBridge.java

Issue 1275813002: Implemented typo recognition in Chrome for Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@4_remove_mac_redundancies
Patch Set: Added a clarifying comment about Locale to the java file Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/spellchecker/SpellCheckerSessionBridge.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/spellchecker/SpellCheckerSessionBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/spellchecker/SpellCheckerSessionBridge.java
new file mode 100644
index 0000000000000000000000000000000000000000..911e1fe70857b3400a7acfef42075435d4aa1170
--- /dev/null
+++ b/chrome/android/java/src/org/chromium/chrome/browser/spellchecker/SpellCheckerSessionBridge.java
@@ -0,0 +1,135 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.chrome.browser.spellchecker;
+
+import android.content.Context;
+import android.view.textservice.SentenceSuggestionsInfo;
+import android.view.textservice.SpellCheckerSession;
+import android.view.textservice.SuggestionsInfo;
+import android.view.textservice.TextInfo;
+import android.view.textservice.TextServicesManager;
+
+import org.chromium.base.ApplicationStatus;
+import org.chromium.base.annotations.CalledByNative;
+
+import java.util.ArrayList;
+
+/**
+* JNI interface for native SpellCheckerSessionBridge to use Android's spellchecker.
+*/
+public class SpellCheckerSessionBridge implements SpellCheckerSession.SpellCheckerSessionListener {
newt (away) 2015/08/12 16:12:58 nit: I'd just import SpellCheckerSessionListener a
dylanking 2015/08/13 02:10:02 Agreed, done.
+ private class SpellingRequest {
newt (away) 2015/08/12 16:12:58 Make this static. Inner classes should always be s
dylanking 2015/08/13 02:10:02 Great point, thanks for the explanation as well.
+ private int mRouteId;
+ private int mIdentifier;
+ private String mText;
+
+ public SpellingRequest(int routeId, int identifier, String text) {
+ mRouteId = routeId;
+ mIdentifier = identifier;
+ mText = text;
+ }
+
+ public int getRouteId() {
+ return mRouteId;
+ }
+
+ public int getIdentifier() {
+ return mIdentifier;
+ }
+
+ public String getText() {
+ return mText;
+ }
+ }
+
+ private SpellCheckerSession mSpellCheckerSession;
+ private final long mNativeSpellCheckerSessionBridge;
newt (away) 2015/08/12 16:12:58 nit: I'd order this variable first since it's fina
dylanking 2015/08/13 02:10:02 Done.
+ private SpellingRequest mActiveSpellingRequest;
+ private SpellingRequest mPendingSpellingRequest;
+
+ public SpellCheckerSessionBridge(long nativeSpellCheckerSessionBridge) {
newt (away) 2015/08/12 16:12:58 make this private unless it needs to be public
dylanking 2015/08/13 02:10:02 Done.
+ mNativeSpellCheckerSessionBridge = nativeSpellCheckerSessionBridge;
+
+ Context context = ApplicationStatus.getApplicationContext();
+ final TextServicesManager textServicesManager =
+ (TextServicesManager) context.getSystemService(
+ Context.TEXT_SERVICES_MANAGER_SERVICE);
+
+ // This combination of parameters will cause the spellchecker to be based off of
+ // the system language specified in settings. Note that this is not the language specified
newt (away) 2015/08/12 16:12:58 Is this simply the "default locale", i.e. Locale.g
dylanking 2015/08/13 02:10:02 Yes, I believe this is simply the language used by
+ // in the adjacent "Spell checker" setting.
+ mSpellCheckerSession = textServicesManager.newSpellCheckerSession(null, null, this, true);
+ }
+
+ @CalledByNative
+ private static SpellCheckerSessionBridge create(long nativeSpellCheckerSessionBridge) {
+ return new SpellCheckerSessionBridge(nativeSpellCheckerSessionBridge);
+ }
+
+ @CalledByNative
+ private void requestTextCheck(int routeId, int identifier, String text) {
newt (away) 2015/08/12 16:12:58 Depending on how often this is called while an act
dylanking 2015/08/13 02:10:02 Very good point, I'll change the approach around t
+ // The listener can't handle multiple events in rapid sequence
+ // Save incoming request text to run at the end of the currently active request
+ // If multiple requests arrive during one active request, only the most
+ // recent request will run (the others get overwritten).
+ if (mActiveSpellingRequest != null) {
+ mPendingSpellingRequest = new SpellingRequest(routeId, identifier, text);
+ return;
+ }
+ mActiveSpellingRequest = new SpellingRequest(routeId, identifier, text);
+ mSpellCheckerSession.getSentenceSuggestions(
+ new TextInfo[] {new TextInfo(mActiveSpellingRequest.getText())}, 0);
+ }
+
+ @Override
+ public void onGetSentenceSuggestions(SentenceSuggestionsInfo[] results) {
+ ArrayList<Integer> offsets = new ArrayList<Integer>();
+ ArrayList<Integer> lengths = new ArrayList<Integer>();
+
+ for (SentenceSuggestionsInfo result : results) {
+ for (int i = 0; i < result.getSuggestionsCount(); i++) {
+ SuggestionsInfo currentSuggestion = result.getSuggestionsInfoAt(i);
+ boolean isWordCorrect = (currentSuggestion.getSuggestionsAttributes()
newt (away) 2015/08/12 16:12:58 This indentation is just too weird (and doesn't fo
dylanking 2015/08/13 02:10:03 Whoa, I blame 'git cl format'! Fixed ;)
+ & SuggestionsInfo.RESULT_ATTR_LOOKS_LIKE_TYPO)
+ == 0;
+ if (!isWordCorrect) {
+ offsets.add(result.getOffsetAt(i));
+ lengths.add(result.getLengthAt(i));
+ }
+ }
+ }
+
+ nativeProcessSpellCheckResults(mNativeSpellCheckerSessionBridge,
+ mActiveSpellingRequest.getRouteId(), mActiveSpellingRequest.getIdentifier(),
+ mActiveSpellingRequest.getText(), convertListToArray(offsets),
+ convertListToArray(lengths));
+
+ // If any pending requests arrived during the execution of this active request, the most
+ // recently arrived pending request will become the active request and be run.
+ if (mPendingSpellingRequest != null) {
+ mActiveSpellingRequest = mPendingSpellingRequest;
+ mPendingSpellingRequest = null;
+ mSpellCheckerSession.getSentenceSuggestions(
+ new TextInfo[] {new TextInfo(mActiveSpellingRequest.getText())}, 0);
+ } else {
+ mActiveSpellingRequest = null;
+ }
+ }
+
+ private int[] convertListToArray(ArrayList<Integer> toConvert) {
newt (away) 2015/08/12 16:12:58 naming suggestion: "list" and "array" might be cle
dylanking 2015/08/13 02:10:02 Changed.
+ int[] toReturn = new int[toConvert.size()];
+ int index = 0;
+ for (Integer number : toConvert) {
newt (away) 2015/08/12 16:12:58 When iterating over Collections, we usually avoid
dylanking 2015/08/13 02:10:02 Not sure why I did foreach especially when I was k
+ toReturn[index++] = number.intValue();
+ }
+ return toReturn;
+ }
+
+ @Override
+ public void onGetSuggestions(SuggestionsInfo[] results) {}
+
+ private native void nativeProcessSpellCheckResults(long nativeSpellCheckerSessionBridge,
+ int routeId, int identifier, String text, int[] offsets, int[] lengths);
+}

Powered by Google App Engine
This is Rietveld 408576698