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

Commit 6871e555 authored by Vincent Bourgmayer's avatar Vincent Bourgmayer
Browse files

Merge branch '299-step-4-periodicScan-as-worker' into 'main' 

[eDrive][persisted=false] STEP 4 periodic scan as worker

See merge request !257
parents aeedeedf 05364b79

app/src/main/AndroidManifest.xml

+0 −3
Original line number Diff line number Diff line
@@ -83,9 +83,6 @@ 
            android:exported="true"

            android:label="@string/account_setting_metered_network"

            tools:ignore="ExportedContentProvider" />

        <service

            android:name=".services.ObserverService"

            android:enabled="true" />

        <service android:name=".services.SynchronizationService" />

        <receiver

            android:name=".receivers.BootCompletedReceiver"

app/src/main/java/foundation/e/drive/work/AccountUserInfoWorker.java→app/src/main/java/foundation/e/drive/account/AccountUserInfoWorker.java

+1 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * which accompanies this distribution, and is available at

 * http://www.gnu.org/licenses/gpl.html

 */

package foundation.e.drive.work;

package foundation.e.drive.account;



import static foundation.e.drive.utils.AppConstants.ACCOUNT_DATA_ALIAS_KEY;

import static foundation.e.drive.utils.AppConstants.ACCOUNT_DATA_EMAIL;
@@ -40,7 +40,6 @@ import java.util.ArrayList; 


import foundation.e.drive.R;

import foundation.e.drive.activity.AccountsActivity;

import foundation.e.drive.operations.GetAliasOperation;

import foundation.e.drive.utils.AppConstants;

import foundation.e.drive.utils.CommonUtils;

import foundation.e.drive.utils.DavClientProvider;

app/src/main/java/foundation/e/drive/operations/GetAliasOperation.java→app/src/main/java/foundation/e/drive/account/GetAliasOperation.java

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * http://www.gnu.org/licenses/gpl.html

 */



package foundation.e.drive.operations;

package foundation.e.drive.account;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

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

+5 −6
Original line number Diff line number Diff line
@@ -104,13 +104,12 @@ class AccountAddedReceiver() : BroadcastReceiver() { 
    private fun registerSetupWorkers(context: Context): Boolean {

        val rootFolderSetupWorkers = generateRootFolderSetupWorkers(context) ?: return false

        val getUserInfoRequest = getOneTimeWorkRequest(WorkType.ONE_TIME_USER_INFO, null)

        val firstStartRequest = getOneTimeWorkRequest(WorkType.FIRST_START, null)



        val finishSetupRequest = getOneTimeWorkRequest(WorkType.ONE_TIME_FINISH_SETUP, null)

        val workManager = WorkManager.getInstance(context)



        workManager.beginWith(getUserInfoRequest)

            .then(rootFolderSetupWorkers)

            .then(firstStartRequest)

            .then(finishSetupRequest)

            .enqueue()

        return true

    }
@@ -125,11 +124,11 @@ class AccountAddedReceiver() : BroadcastReceiver() { 


        val workRequests: MutableList<OneTimeWorkRequest> = ArrayList()

        for (folder in rootSyncedFolderList) {

            val createRemoteFolderWorkRequest = getOneTimeWorkRequest(

                WorkType.CREATE_REMOTE_DIR,

            val rootFolderSetupWorkRequest = getOneTimeWorkRequest(

                WorkType.ONE_TIME_ROOT_FOLDER_SETUP,

                folder

            )

            workRequests.add(createRemoteFolderWorkRequest)

            workRequests.add(rootFolderSetupWorkRequest)

        }

        return workRequests

    }

app/src/main/java/foundation/e/drive/account/receivers/AccountRemoveCallbackReceiver.java

+1 −5
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import java.io.File; 
import foundation.e.drive.EdriveApplication;

import foundation.e.drive.database.DbHelper;

import foundation.e.drive.database.FailedSyncPrefsManager;

import foundation.e.drive.services.ObserverService;

import foundation.e.drive.services.SynchronizationService;

import foundation.e.drive.utils.AppConstants;

import foundation.e.drive.utils.DavClientProvider;
@@ -95,9 +94,6 @@ public class AccountRemoveCallbackReceiver extends BroadcastReceiver { 
    }



    private void stopAllServices(@NonNull Context applicationContext) {

        Intent observerServiceIntent = new Intent(applicationContext, ObserverService.class);

        boolean observerServiceStopResult = applicationContext.stopService(observerServiceIntent);

        Timber.d("stop ObserverService: %s", observerServiceStopResult);



        Intent synchronizationServiceIntent = new Intent(applicationContext, SynchronizationService.class);

        boolean syncServiceStopResult = applicationContext.stopService(synchronizationServiceIntent);
@@ -111,7 +107,7 @@ public class AccountRemoveCallbackReceiver extends BroadcastReceiver { 
                    .remove(AccountManager.KEY_ACCOUNT_TYPE)

                    .remove(SETUP_COMPLETED)

                    .remove(INITIAL_FOLDER_NUMBER)

                    .remove(AppConstants.KEY_LAST_SYNC_TIME)

                    .remove(AppConstants.KEY_LAST_SCAN_TIME)

                    .apply();

        }