commit 88f466678c17bb32c274a5367da0d6138679ab6b
author Kurt Partridge <kep@google.com> Wed Feb 27 12:27:50 2013 -0800
committer Kurt Partridge <kep@google.com> Wed Mar 06 07:19:41 2013 -0800
tree e2ca4bc103581f038d5116af765523396c96d90a
parent 7f7850d23a34f918bc44843bbc68862b45dc2752

[FileEncap4] Simplify logic

Change-Id: Ibb8660d12812b867856259d3e5c04a31e281027d

java/src/com/android/inputmethod/research/UploaderService.java

diff --git a/java/src/com/android/inputmethod/research/UploaderService.java b/java/src/com/android/inputmethod/research/UploaderService.java
index 13a9856..bb70c43 100644
--- a/java/src/com/android/inputmethod/research/UploaderService.java
+++ b/java/src/com/android/inputmethod/research/UploaderService.java
@@ -110,6 +110,10 @@
         return false;
     }
 
+    private boolean isConvenientToUpload() {
+        return isExternallyPowered() && hasWifiConnection();
+    }
+
     private boolean isExternallyPowered() {
         final Intent intent = registerReceiver(null, new IntentFilter(
                 Intent.ACTION_BATTERY_CHANGED));
@@ -126,10 +130,7 @@
     }
 
     private void doUpload(final boolean isUploadingUnconditionally) {
-        if (!isUploadingUnconditionally && (!isExternallyPowered() || !hasWifiConnection()
-                || IS_INHIBITING_AUTO_UPLOAD)) {
-            return;
-        }
+        if (!(isUploadingUnconditionally || isConvenientToUpload())) return;
         if (mFilesDir == null) {
             return;
         }