Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41c471d9 authored by Kurt Partridge's avatar Kurt Partridge Committed by Android (Google) Code Review
Browse files

Merge "[FileEncap5] Move conditional logic to caller"

parents 1bc20700 9283644c

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

+4 −3
Original line number Original line Diff line number Diff line
@@ -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;

        }

        }