nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "[FileEncap5] Move conditional logic to caller"

main
Kurt Partridge 2013-03-06 20:59:03 +00:00 committed by Android (Google) Code Review
parent 1bc20700d5 9283644c41
commit 41c471d93d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
java/src/com/android/inputmethod/research/UploaderService.java
View File

@ -99,7 +99,9 @@ public final class UploaderService extends IntentService {
@Override @Override
protected void onHandleIntent(Intent intent) { protected void onHandleIntent(Intent intent) {
if (!isPossibleToUpload()) return; if (!isPossibleToUpload()) return;
doUpload(isUploadingUnconditionally(intent.getExtras())); if (isUploadingUnconditionally(intent.getExtras()) || isConvenientToUpload()) {
doUpload();
}
} }
private boolean isUploadingUnconditionally(final Bundle bundle) { private boolean isUploadingUnconditionally(final Bundle bundle) {
@ -129,8 +131,7 @@ public final class UploaderService extends IntentService {
return wifiInfo.isConnected(); return wifiInfo.isConnected();
} }
private void doUpload(final boolean isUploadingUnconditionally) { private void doUpload() {
if (!(isUploadingUnconditionally || isConvenientToUpload())) return;
if (mFilesDir == null) { if (mFilesDir == null) {
return; return;
} }