1 files changed, 7 insertions, 16 deletions
diff --git a/java/src/com/android/inputmethod/research/Uploader.java b/java/src/com/android/inputmethod/research/Uploader.java
index df495a88d..ba05ec12b 100644
--- a/java/src/com/android/inputmethod/research/Uploader.java
+++ b/java/src/com/android/inputmethod/research/Uploader.java
@@ -17,7 +17,6 @@
 package com.android.inputmethod.research;
 
 import android.Manifest;
-import android.app.AlarmManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -33,7 +32,6 @@ import com.android.inputmethod.latin.define.ProductionFlag;
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileFilter;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -48,19 +46,20 @@ import java.net.URL;
  */
 public final class Uploader {
     private static final String TAG = Uploader.class.getSimpleName();
-    private static final boolean DEBUG = false && ProductionFlag.IS_EXPERIMENTAL_DEBUG;
+    private static final boolean DEBUG = false
+            && ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS_DEBUG;
     // Set IS_INHIBITING_AUTO_UPLOAD to true for local testing
     private static final boolean IS_INHIBITING_AUTO_UPLOAD = false
-            && ProductionFlag.IS_EXPERIMENTAL_DEBUG;  // Force false for non-debug builds
+            && ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS_DEBUG;
     private static final int BUF_SIZE = 1024 * 8;
 
     private final Context mContext;
-    private final File mFilesDir;
+    private final ResearchLogDirectory mResearchLogDirectory;
     private final URL mUrl;
 
     public Uploader(final Context context) {
         mContext = context;
-        mFilesDir = context.getFilesDir();
+        mResearchLogDirectory = new ResearchLogDirectory(context);
 
         final String urlString = context.getString(R.string.research_logger_upload_url);
         if (TextUtils.isEmpty(urlString)) {
@@ -106,16 +105,8 @@ public final class Uploader {
     }
 
     public void doUpload() {
-        if (mFilesDir == null) {
-            return;
-        }
-        final File[] files = mFilesDir.listFiles(new FileFilter() {
-            @Override
-            public boolean accept(final File pathname) {
-                return pathname.getName().startsWith(ResearchLogger.LOG_FILENAME_PREFIX)
-                        && !pathname.canWrite();
-            }
-        });
+        final File[] files = mResearchLogDirectory.getUploadableLogFiles();
+        if (files == null) return;
         for (final File file : files) {
             uploadFile(file);
         }