2 files changed, 16 insertions, 12 deletions
diff --git a/java/src/com/android/inputmethod/latin/DictionaryStats.java b/java/src/com/android/inputmethod/latin/DictionaryStats.java
index a6b37aa8f..19769717e 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryStats.java
+++ b/java/src/com/android/inputmethod/latin/DictionaryStats.java
@@ -20,28 +20,32 @@ import java.io.File;
 import java.math.BigDecimal;
 import java.util.Locale;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 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,
+    public DictionaryStats(
+            @Nonnull final Locale locale,
+            @Nonnull final String dictType,
+            @Nonnull final String dictFileName,
+            @Nullable 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;
     }
 
     public String getFileSizeString() {
-        if (mDictFileSize == 0) {
-            return "0";
-        }
         BigDecimal bytes = new BigDecimal(mDictFileSize);
         BigDecimal kb = bytes.divide(new BigDecimal(1024), 2, BigDecimal.ROUND_HALF_UP);
         if (kb.longValue() == 0) {
@@ -56,14 +60,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 1ef7061fb..37899d21e 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);