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

Commit a5a5ff6a authored by Vincent Bourgmayer's avatar Vincent Bourgmayer
Browse files

Remove ScreenOffReceiver 

- Remove ScreenOffReceiver.java in foundation.e.drive.receivers package
- Remove "unregisterScreenOffReceiver()" in CommonUtils
- Remove registration code for screenOffReceiver in InitializerService.java and scannerJob.java
parent fcf3b817

app/src/main/java/foundation/e/drive/jobs/ScannerJob.java

+1 −7
Original line number Diff line number Diff line
@@ -11,9 +11,8 @@ package foundation.e.drive.jobs; 
import android.app.job.JobParameters;

import android.app.job.JobService;

import android.content.Intent;

import android.content.IntentFilter;

import android.util.Log;

import foundation.e.drive.receivers.ScreenOffReceiver;



import foundation.e.drive.services.ObserverService;

import foundation.e.drive.utils.CommonUtils;
@@ -27,11 +26,6 @@ public class ScannerJob extends JobService { 
    public boolean onStartJob(JobParameters params) {

        Log.i(TAG, "onStartJob()");



        Log.d(TAG, "RegisterReceiver: screenOffReceiver");

        IntentFilter filter = new IntentFilter(Intent.ACTION_SCREEN_ON);

        filter.addAction(Intent.ACTION_SCREEN_OFF);

        getApplicationContext().registerReceiver(ScreenOffReceiver.getInstance(), filter);



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

        this.startService(observerServiceIntent);

        jobFinished(params, false);

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

deleted100644 → 0
+0 −51
Original line number Diff line number Diff line 
/*

 * Copyright © Vincent Bourgmayer (/e/ foundation).

 * All rights reserved. This program and the accompanying materials

 * are made available under the terms of the GNU Public License v3.0

 * which accompanies this distribution, and is available at

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

 */



package foundation.e.drive.receivers;



import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;

import android.util.Log;

import foundation.e.drive.services.ObserverService;

import foundation.e.drive.utils.CommonUtils;



/**

 * @author Vincent Bourgmayer

 * This is a broadcast receiver which catch "ACTION_SCREEN_OFF" to start  scanning at a moment

 * where the user won't need battery or network.

 */

public class ScreenOffReceiver extends BroadcastReceiver {

    private final String TAG = ScreenOffReceiver.class.getSimpleName();

    private static ScreenOffReceiver instance;



    public static ScreenOffReceiver getInstance(){

        if(instance == null)

            instance = new ScreenOffReceiver();

        return instance;

    }



    /**

     * Private constructor

     */

    private ScreenOffReceiver(){}



    @Override

    public void onReceive(Context context, Intent intent) {

        Log.i(TAG, "onReceive");

        String intentAction = intent.getAction();

        if(intentAction == null){

            Log.e(TAG, "intent Action is null");

        } else if ( intent.getAction().equals(Intent.ACTION_SCREEN_OFF)

                && CommonUtils.haveNetworkConnexion( context ) ) {

            Log.d(TAG, "onReceive: ACTION_SCREEN_OFF");

            Intent cloudIntent = new Intent(context, ObserverService.class);

            context.startService(cloudIntent);

        }

    }

}

app/src/main/java/foundation/e/drive/services/InitializerService.java

+0 −8
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ import android.accounts.AccountManager; 
import android.app.Service;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.SharedPreferences;

import android.os.Build;

import android.os.Environment;
@@ -33,7 +32,6 @@ import java.util.List; 


import foundation.e.drive.models.SyncedFolder;

import foundation.e.drive.operations.CreateInitialFolderRemoteOperation;

import foundation.e.drive.receivers.ScreenOffReceiver;

import foundation.e.drive.utils.AppConstants;

import foundation.e.drive.utils.CommonUtils;
@@ -284,16 +282,10 @@ public class InitializerService extends Service implements OnRemoteOperationList 
        //all folder have been created





        Log.d(TAG, "RegisterReceiver: screenOffReceiver");

        IntentFilter filter = new IntentFilter(Intent.ACTION_SCREEN_ON);

        filter.addAction(Intent.ACTION_SCREEN_OFF);

        getApplicationContext().registerReceiver(ScreenOffReceiver.getInstance(), filter);



        //Immediatly start ObserverService to not have to wait 30 minutes.

        Intent observersServiceIntent = new Intent(getApplicationContext(), foundation.e.drive.services.ObserverService.class);

        startService(observersServiceIntent);





        stopSelf();

    }

app/src/main/java/foundation/e/drive/utils/CommonUtils.java

+1 −18
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import com.owncloud.android.lib.resources.files.FileUtils; 
import java.io.File;

import java.util.concurrent.TimeUnit;



import foundation.e.drive.receivers.ScreenOffReceiver;



import foundation.e.drive.work.FullScanWorker;



import static foundation.e.drive.utils.AppConstants.MEDIASYNC_PROVIDER_AUTHORITY;
@@ -70,23 +70,6 @@ public abstract class CommonUtils { 
        }

    }



    /**

     * Unregister from screeOffReceiver component

     *

     * @param context app context

     * @return true if unregistration was successful or false if it encounter an exception

     */

    public static boolean unregisterScreenOff(Context context) {

        try {

            Log.d("TAG", "unregisterReceiver(screenOffReceiver)");

            context.unregisterReceiver(ScreenOffReceiver.getInstance());

        } catch (IllegalArgumentException e) {

            Log.w(TAG, "Can't unregister screenOffReceiver ");

            return false;

        }

        return true;

    }





    /**

     * This method retrieve Account corresponding to account's name and type