From 6d63989197bc6bedbc0b41a6a3dd83deabef9255 Mon Sep 17 00:00:00 2001
From: Jatin Matani <jatinm@google.com>
Date: Mon, 30 Mar 2015 16:56:07 -0700
Subject: [PATCH] DictStats should mask account info in filename
Change-Id: I1985fcc352c1c0658c4177f906f1d71ee0d67c6f
---
.../inputmethod/latin/DictionaryStats.java | 18 +++++++++---------
.../latin/ExpandableBinaryDictionary.java | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/java/src/com/android/inputmethod/latin/DictionaryStats.java b/java/src/com/android/inputmethod/latin/DictionaryStats.java
index a6b37aa8f4..30f6f9fd82 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryStats.java
+++ b/java/src/com/android/inputmethod/latin/DictionaryStats.java
@@ -24,17 +24,17 @@ public class DictionaryStats {
public static final int NOT_AN_ENTRY_COUNT = -1;
public final Locale mLocale;
- public final String mDictName;
- public final String mDictFilePath;
+ public final String mDictType;
+ public final String mDictFileName;
public final long mDictFileSize;
public final int mContentVersion;
- public DictionaryStats(final Locale locale, final String dictName, final File dictFile,
- final int contentVersion) {
+ public DictionaryStats(final Locale locale, final String dictType, final String dictFileName,
+ final File dictFile, final int contentVersion) {
mLocale = locale;
- mDictName = dictName;
- mDictFilePath = (dictFile == null) ? null : dictFile.getName();
+ mDictType = dictType;
mDictFileSize = (dictFile == null || !dictFile.exists()) ? 0 : dictFile.length();
+ mDictFileName = dictFileName;
mContentVersion = contentVersion;
}
@@ -56,14 +56,14 @@ public class DictionaryStats {
@Override
public String toString() {
- final StringBuilder builder = new StringBuilder(mDictName);
- if (mDictName.equals(Dictionary.TYPE_MAIN)) {
+ final StringBuilder builder = new StringBuilder(mDictType);
+ if (mDictType.equals(Dictionary.TYPE_MAIN)) {
builder.append(" (");
builder.append(mContentVersion);
builder.append(")");
}
builder.append(": ");
- builder.append(mDictFilePath);
+ builder.append(mDictFileName);
builder.append(" / ");
builder.append(getFileSizeString());
return builder.toString();
diff --git a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
index 1ef7061fbc..37899d21e7 100644
--- a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
@@ -654,7 +654,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
asyncExecuteTaskWithLock(mLock.readLock(), new Runnable() {
@Override
public void run() {
- result.set(new DictionaryStats(mLocale, dictName, dictFile, 0));
+ result.set(new DictionaryStats(mLocale, dictName, dictName, dictFile, 0));
}
});
return result.get(null /* defaultValue */, TIMEOUT_FOR_READ_OPS_IN_MILLISECONDS);
--
GitLab