am 8ed9bcca: am 91886a31: am baec6ce1: Revert reset to ub-latinimegoogle-fava-release

* commit '8ed9bccaf2f670fd34689771d37c4e064da25b57': (240 commits)
  Don't prompt before downloading.
  Add some more logging. Why not.
  Load metadata.json from resources on DB reset.
  Small optimization to eliminate a >0 check in RichInputConnection.
  Extend laggy connection timeout for initial load.
  Fix breakage in tests.
  LatinIME portion of StatsUtil change.
  Workaround for preserving responsiveness on a slow InputConnection.
  Do not decorate committed spans.
  Do not force downloads on package replace.
  Fix the previous downloads logic to not missing any downloads.
  Detection and logging of slow input connections.
  Clear/remove all the scheduled downloads in Download Manager
  Disable download notifications.
  Cleanup before fixing getTextAfterCursor().
  Do not restrict downloads to WiFi networks.
  Import translations. DO NOT MERGE
  Revert "Remove "Personal dictionary" link from settings."
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  ...

1 files changed, 1 insertions, 59 deletions

diff --git a/java/src/com/android/inputmethod/latin/utils/DictionaryInfoUtils.java b/java/src/com/android/inputmethod/latin/utils/DictionaryInfoUtils.java
index 096a545e5..cfa977a46 100644
--- a/java/src/com/android/inputmethod/latin/utils/DictionaryInfoUtils.java
+++ b/java/src/com/android/inputmethod/latin/utils/DictionaryInfoUtils.java
@@ -30,7 +30,6 @@ import com.android.inputmethod.latin.AssetFileAddress;
 import com.android.inputmethod.latin.BinaryDictionaryGetter;
 import com.android.inputmethod.latin.R;
 import com.android.inputmethod.latin.RichInputMethodManager;
-import com.android.inputmethod.latin.common.FileUtils;
 import com.android.inputmethod.latin.common.LocaleUtils;
 import com.android.inputmethod.latin.define.DecoderSpecificConstants;
 import com.android.inputmethod.latin.makedict.DictionaryHeader;
@@ -154,13 +153,6 @@ public class DictionaryInfoUtils {
     }
 
     /**
-     * Helper method to get the top level cache directory.
-     */
-    public static String getWordListStagingDirectory(final Context context) {
-        return context.getFilesDir() + File.separator + "staging";
-    }
-
-    /**
      * Helper method to get the top level temp directory.
      */
     public static String getWordListTempDirectory(final Context context) {
@@ -196,10 +188,6 @@ public class DictionaryInfoUtils {
         return new File(DictionaryInfoUtils.getWordListCacheDirectory(context)).listFiles();
     }
 
-    public static File[] getStagingDirectoryList(final Context context) {
-        return new File(DictionaryInfoUtils.getWordListStagingDirectory(context)).listFiles();
-    }
-
     @Nullable
     public static File[] getUnusedDictionaryList(final Context context) {
         return context.getFilesDir().listFiles(new FilenameFilter() {
@@ -233,7 +221,7 @@ public class DictionaryInfoUtils {
     /**
      * Find out the cache directory associated with a specific locale.
      */
-    public static String getCacheDirectoryForLocale(final String locale, final Context context) {
+    private static String getCacheDirectoryForLocale(final String locale, final Context context) {
         final String relativeDirectoryName = replaceFileNameDangerousCharacters(locale);
         final String absoluteDirectoryName = getWordListCacheDirectory(context) + File.separator
                 + relativeDirectoryName;
@@ -266,52 +254,6 @@ public class DictionaryInfoUtils {
         return getCacheDirectoryForLocale(locale, context) + File.separator + fileName;
     }
 
-    public static String getStagingFileName(String id, String locale, Context context) {
-        final String stagingDirectory = getWordListStagingDirectory(context);
-        // create the directory if it does not exist.
-        final File directory = new File(stagingDirectory);
-        if (!directory.exists()) {
-            if (!directory.mkdirs()) {
-                Log.e(TAG, "Could not create the staging directory.");
-            }
-        }
-        // e.g. id="main:en_in", locale ="en_IN"
-        final String fileName = replaceFileNameDangerousCharacters(
-                locale + TEMP_DICT_FILE_SUB + id);
-        return stagingDirectory + File.separator + fileName;
-    }
-
-    public static void moveStagingFilesIfExists(Context context) {
-        final File[] stagingFiles = DictionaryInfoUtils.getStagingDirectoryList(context);
-        if (stagingFiles != null && stagingFiles.length > 0) {
-            for (final File stagingFile : stagingFiles) {
-                final String fileName = stagingFile.getName();
-                final int index = fileName.indexOf(TEMP_DICT_FILE_SUB);
-                if (index == -1) {
-                    // This should never happen.
-                    Log.e(TAG, "Staging file does not have ___ substring.");
-                    continue;
-                }
-                final String[] localeAndFileId = fileName.split(TEMP_DICT_FILE_SUB);
-                if (localeAndFileId.length != 2) {
-                    Log.e(TAG, String.format("malformed staging file %s. Deleting.",
-                            stagingFile.getAbsoluteFile()));
-                    stagingFile.delete();
-                    continue;
-                }
-
-                final String locale = localeAndFileId[0];
-                // already escaped while moving to staging.
-                final String fileId = localeAndFileId[1];
-                final String cacheDirectoryForLocale = getCacheDirectoryForLocale(locale, context);
-                final String cacheFilename = cacheDirectoryForLocale + File.separator + fileId;
-                final File cacheFile = new File(cacheFilename);
-                // move the staging file to cache file.
-                FileUtils.renameTo(stagingFile, cacheFile);
-            }
-        }
-    }
-
     public static boolean isMainWordListId(final String id) {
         final String[] idArray = id.split(BinaryDictionaryGetter.ID_CATEGORY_SEPARATOR);
         // An id is supposed to be in format category:locale, so splitting on the separator