commit 9283644c41bf702217168a1750aa82954a4f3f47
author Kurt Partridge <kep@google.com> Wed Feb 27 12:32:39 2013 -0800
committer Kurt Partridge <kep@google.com> Wed Mar 06 07:19:41 2013 -0800
tree 5fb5693f7539f340476dfe438464a1ede70b094e
parent 88f466678c17bb32c274a5367da0d6138679ab6b

[FileEncap5] Move conditional logic to caller

Change-Id: I6599539059f86dc8902210d325439c08035b2e2a

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 bb70c43..eb5bdef 100644
--- a/java/src/com/android/inputmethod/research/UploaderService.java
+++ b/java/src/com/android/inputmethod/research/UploaderService.java
@@ -99,7 +99,9 @@
     @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 @@
         return wifiInfo.isConnected();
     }
 
-    private void doUpload(final boolean isUploadingUnconditionally) {
-        if (!(isUploadingUnconditionally || isConvenientToUpload())) return;
+    private void doUpload() {
         if (mFilesDir == null) {
             return;
         }