aboutsummaryrefslogtreecommitdiffstats
path: root/native/jni/src
diff options
context:
space:
mode:
authorKeisuke Kuroyanagi <ksk@google.com>2014-06-12 11:36:00 +0900
committerKeisuke Kuroyanagi <ksk@google.com>2014-06-12 11:36:00 +0900
commit59ed0c2db2714f36c18d0882c7845455b5b3dd43 (patch)
treedb935492bd8419d467c8064d7fce58f51a9d8853 /native/jni/src
parentd979d416c102c45773f4684473953f6fed8f983f (diff)
downloadlatinime-59ed0c2db2714f36c18d0882c7845455b5b3dd43.tar.gz
latinime-59ed0c2db2714f36c18d0882c7845455b5b3dd43.tar.xz
latinime-59ed0c2db2714f36c18d0882c7845455b5b3dd43.zip
Block offensive words in native code.
Bug: 15300452 Change-Id: Ic6c91c47453e19fb5db2c62b66659619e72b1ecf
Diffstat (limited to 'native/jni/src')
-rw-r--r--native/jni/src/suggest/core/result/suggestions_output_utils.cpp11
-rw-r--r--native/jni/src/suggest/core/suggest_options.h7
2 files changed, 15 insertions, 3 deletions
diff --git a/native/jni/src/suggest/core/result/suggestions_output_utils.cpp b/native/jni/src/suggest/core/result/suggestions_output_utils.cpp
index 23908255b..7b0e7e1b4 100644
--- a/native/jni/src/suggest/core/result/suggestions_output_utils.cpp
+++ b/native/jni/src/suggest/core/result/suggestions_output_utils.cpp
@@ -26,6 +26,7 @@
#include "suggest/core/policy/scoring.h"
#include "suggest/core/result/suggestion_results.h"
#include "suggest/core/session/dic_traverse_session.h"
+#include "suggest/core/suggest_options.h"
namespace latinime {
@@ -105,6 +106,11 @@ const int SuggestionsOutputUtils::MIN_LEN_FOR_MULTI_WORD_AUTOCORRECT = 16;
// Entries that are blacklisted or do not represent a word should not be output.
const bool isValidWord = !terminalDicNode->isBlacklistedOrNotAWord();
+ // When we have to block offensive words, non-exact matched offensive words should not be
+ // output.
+ const bool blockOffensiveWords = traverseSession->getSuggestOptions()->blockOffensiveWords();
+ const bool isBlockedOffensiveWord = blockOffensiveWords && isPossiblyOffensiveWord
+ && !isSafeExactMatch;
// Increase output score of top typing suggestion to ensure autocorrection.
// TODO: Better integration with java side autocorrection logic.
@@ -115,8 +121,9 @@ const int SuggestionsOutputUtils::MIN_LEN_FOR_MULTI_WORD_AUTOCORRECT = 16;
|| (isValidWord && scoringPolicy->doesAutoCorrectValidWord()),
boostExactMatches);
- // Don't output invalid words. However, we still need to submit their shortcuts if any.
- if (isValidWord) {
+ // Don't output invalid or blocked offensive words. However, we still need to submit their
+ // shortcuts if any.
+ if (isValidWord && !isBlockedOffensiveWord) {
int codePoints[MAX_WORD_LENGTH];
terminalDicNode->outputResult(codePoints);
const int indexToPartialCommit = outputSecondWordFirstLetterInputIndex ?
diff --git a/native/jni/src/suggest/core/suggest_options.h b/native/jni/src/suggest/core/suggest_options.h
index 1b21aafcf..2e22a7ac3 100644
--- a/native/jni/src/suggest/core/suggest_options.h
+++ b/native/jni/src/suggest/core/suggest_options.h
@@ -34,6 +34,10 @@ class SuggestOptions{
return getBoolOption(USE_FULL_EDIT_DISTANCE);
}
+ AK_FORCE_INLINE bool blockOffensiveWords() const {
+ return getBoolOption(BLOCK_OFFENSIVE_WORDS);
+ }
+
AK_FORCE_INLINE bool getAdditionalFeaturesBoolOption(const int key) const {
return getBoolOption(key + ADDITIONAL_FEATURES_OPTIONS);
}
@@ -45,9 +49,10 @@ class SuggestOptions{
// reorder options.
static const int IS_GESTURE = 0;
static const int USE_FULL_EDIT_DISTANCE = 1;
+ static const int BLOCK_OFFENSIVE_WORDS = 2;
// Additional features options are stored after the other options and used as setting values of
// experimental features.
- static const int ADDITIONAL_FEATURES_OPTIONS = 2;
+ static const int ADDITIONAL_FEATURES_OPTIONS = 3;
const int *const mOptions;
const int mLength;