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

Commit 19b620c8 authored by Jonathan Klee's avatar Jonathan Klee
Browse files

refactor: rename WorkerUtils in WorkLauncher

parent 20842d8e

app/src/main/java/foundation/e/drive/account/receivers/AccountAddedReceiver.kt

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import foundation.e.drive.utils.AppConstants 
import foundation.e.drive.utils.DavClientProvider

import foundation.e.drive.utils.RootSyncedFolderProvider

import foundation.e.drive.work.WorkRequestFactory.*

import foundation.e.drive.work.WorkerUtils

import foundation.e.drive.work.WorkLauncher

import timber.log.Timber



/**
@@ -52,7 +52,7 @@ class AccountAddedReceiver() : BroadcastReceiver() { 
        if (registerSetupWorkers(context)) {

            DavClientProvider.getInstance().cleanUp()



            WorkerUtils.enqueuePeriodicUserInfoFetching(WorkManager.getInstance(context))

            WorkLauncher.getInstance(context).enqueuePeriodicUserInfoFetching();

        }

}

app/src/main/java/foundation/e/drive/account/setup/FinishSetupWorker.java

+5 −6
Original line number Diff line number Diff line
@@ -15,12 +15,11 @@ import static foundation.e.drive.utils.AppConstants.SHARED_PREFERENCE_NAME; 
import android.content.Context;



import androidx.annotation.NonNull;

import androidx.work.WorkManager;

import androidx.work.Worker;

import androidx.work.WorkerParameters;



import foundation.e.drive.utils.AppConstants;

import foundation.e.drive.work.WorkerUtils;

import foundation.e.drive.work.WorkLauncher;

import timber.log.Timber;



/**
@@ -60,9 +59,9 @@ public class FinishSetupWorker extends Worker { 
    }



    private void enqueueWorkers(@NonNull final Context appContext) {

        final WorkManager workManager = WorkManager.getInstance(appContext);

        WorkerUtils.enqueueOneTimeAppListGenerator(workManager);

        WorkerUtils.enqueueOneTimeFullScan(workManager, false);

        WorkerUtils.enqueuePeriodicFullScan(workManager);

        final WorkLauncher launcher = WorkLauncher.getInstance(appContext);

        launcher.enqueueOneTimeAppListGenerator();

        launcher.enqueueOneTimeFullScan(false);

        launcher.enqueuePeriodicFullScan();

    }

}
 
 No newline at end of file

app/src/main/java/foundation/e/drive/receivers/BootCompletedReceiver.java

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import foundation.e.drive.database.DbHelper; 
import foundation.e.drive.synchronization.SyncProxy;

import foundation.e.drive.utils.AppConstants;

import foundation.e.drive.utils.CommonUtils;

import foundation.e.drive.work.WorkerUtils;

import foundation.e.drive.work.WorkLauncher;

import timber.log.Timber;



/**
@@ -113,8 +113,8 @@ public class BootCompletedReceiver extends BroadcastReceiver { 
            final WorkManager workManager= WorkManager.getInstance(context);

            workManager.cancelAllWork();



            WorkerUtils.enqueuePeriodicFullScan(workManager);

            WorkerUtils.enqueuePeriodicUserInfoFetching(workManager);

            WorkLauncher.getInstance(context).enqueuePeriodicFullScan();

            WorkLauncher.getInstance(context).enqueuePeriodicUserInfoFetching();

        }

    }

app/src/main/java/foundation/e/drive/receivers/DebugCmdReceiver.java

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import foundation.e.drive.models.SyncedFolder; 
import foundation.e.drive.synchronization.SyncProxy;

import foundation.e.drive.synchronization.SyncRequestCollector;

import foundation.e.drive.utils.ReleaseTree;

import foundation.e.drive.work.WorkerUtils;

import foundation.e.drive.work.WorkLauncher;

import timber.log.Timber;



/**
@@ -56,7 +56,7 @@ public class DebugCmdReceiver extends BroadcastReceiver { 
        switch (intent.getAction()) {

            case ACTION_FORCE_SCAN:

                Timber.d("Force Sync intent received");

                WorkerUtils.enqueueOneTimeFullScan(workManager, true);

                WorkLauncher.getInstance(context).enqueueOneTimeFullScan(true);

                break;

            case ACTION_DUMP_DATABASE:

                Timber.d("Dump database intent received");

app/src/main/java/foundation/e/drive/synchronization/SyncProxy.kt

+2 −3
Original line number Diff line number Diff line
@@ -9,12 +9,11 @@ package foundation.e.drive.synchronization 


import android.app.Application

import android.content.Context

import androidx.work.WorkManager

import foundation.e.drive.EdriveApplication

import foundation.e.drive.database.FailedSyncPrefsManager

import foundation.e.drive.models.SyncRequest

import foundation.e.drive.models.SyncWrapper

import foundation.e.drive.work.WorkerUtils

import foundation.e.drive.work.WorkLauncher

import timber.log.Timber

import java.util.concurrent.ConcurrentHashMap

import java.util.concurrent.ConcurrentLinkedQueue
@@ -131,7 +130,7 @@ object SyncProxy: SyncRequestCollector, SyncManager { 
        context.startRecursiveFileObserver()



        if (previousSyncState != SyncState.SYNCHRONIZING) {

            WorkerUtils.enqueueOneTimeSync(WorkManager.getInstance(context))

            WorkLauncher.getInstance(context).enqueueOneTimeSync();

        }

    }