[TestPrep3] Add helper method to retrive dictionary
Change-Id: Id6e03c6f8a3e96979d589f0605ac056fcad7e1ffmain
parent
b6d05aeb7c
commit
19e05359e6
|
@ -93,6 +93,11 @@ public abstract class MainLogBuffer extends FixedLogBuffer {
|
||||||
mSuggest = suggest;
|
mSuggest = suggest;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private Dictionary getDictionary() {
|
||||||
|
if (mSuggest == null || !mSuggest.hasMainDictionary()) return null;
|
||||||
|
return mSuggest.getMainDictionary();
|
||||||
|
}
|
||||||
|
|
||||||
public void resetWordCounter() {
|
public void resetWordCounter() {
|
||||||
mNumWordsUntilSafeToSample = mNumWordsBetweenNGrams;
|
mNumWordsUntilSafeToSample = mNumWordsBetweenNGrams;
|
||||||
}
|
}
|
||||||
|
@ -137,18 +142,15 @@ public abstract class MainLogBuffer extends FixedLogBuffer {
|
||||||
if (mNumWordsUntilSafeToSample > 0) {
|
if (mNumWordsUntilSafeToSample > 0) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (mSuggest == null || !mSuggest.hasMainDictionary()) {
|
// Reload the dictionary in case it has changed (e.g., because the user has changed
|
||||||
|
// languages).
|
||||||
|
final Dictionary dictionary = getDictionary();
|
||||||
|
if (dictionary == null) {
|
||||||
// Main dictionary is unavailable. Since we cannot check it, we cannot tell if a
|
// Main dictionary is unavailable. Since we cannot check it, we cannot tell if a
|
||||||
// word is out-of-vocabulary or not. Therefore, we must judge the entire buffer
|
// word is out-of-vocabulary or not. Therefore, we must judge the entire buffer
|
||||||
// contents to potentially pose a privacy risk.
|
// contents to potentially pose a privacy risk.
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
// Reload the dictionary in case it has changed (e.g., because the user has changed
|
|
||||||
// languages).
|
|
||||||
final Dictionary dictionary = mSuggest.getMainDictionary();
|
|
||||||
if (dictionary == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check each word in the buffer. If any word poses a privacy threat, we cannot upload
|
// Check each word in the buffer. If any word poses a privacy threat, we cannot upload
|
||||||
// the complete buffer contents in detail.
|
// the complete buffer contents in detail.
|
||||||
|
|
Loading…
Reference in New Issue