am 41c471d9: Merge "[FileEncap5] Move conditional logic to caller"

* commit '41c471d93d117a65a4f241e588154d84709cf5d0':
  [FileEncap5] Move conditional logic to caller
main
Kurt Partridge 2013-03-06 13:00:05 -08:00 committed by Android Git Automerger
commit 26df5201cc
1 changed files with 4 additions and 3 deletions

View File

@ -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;
}