From 9283644c41bf702217168a1750aa82954a4f3f47 Mon Sep 17 00:00:00 2001
From: Kurt Partridge <kep@google.com>
Date: Wed, 27 Feb 2013 12:32:39 -0800
Subject: [PATCH] [FileEncap5] Move conditional logic to caller

Change-Id: I6599539059f86dc8902210d325439c08035b2e2a
---
 .../com/android/inputmethod/research/UploaderService.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/java/src/com/android/inputmethod/research/UploaderService.java b/java/src/com/android/inputmethod/research/UploaderService.java
index bb70c4318..eb5bdefb7 100644
--- a/java/src/com/android/inputmethod/research/UploaderService.java
+++ b/java/src/com/android/inputmethod/research/UploaderService.java
@@ -99,7 +99,9 @@ public final class UploaderService extends IntentService {
     @Override
     protected void onHandleIntent(Intent intent) {
         if (!isPossibleToUpload()) return;
-        doUpload(isUploadingUnconditionally(intent.getExtras()));
+        if (isUploadingUnconditionally(intent.getExtras()) || isConvenientToUpload()) {
+            doUpload();
+        }
     }
 
     private boolean isUploadingUnconditionally(final Bundle bundle) {
@@ -129,8 +131,7 @@ public final class UploaderService extends IntentService {
         return wifiInfo.isConnected();
     }
 
-    private void doUpload(final boolean isUploadingUnconditionally) {
-        if (!(isUploadingUnconditionally || isConvenientToUpload())) return;
+    private void doUpload() {
         if (mFilesDir == null) {
             return;
         }