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

Commit 6086ab5b authored by Vincent Bourgmayer's avatar Vincent Bourgmayer
Browse files

fix typo in haveNetworkConnection() method name

parent 25212bc8

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

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ public class ScreenOffReceiver extends BroadcastReceiver { 
        if(intentAction == null){

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

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

                && CommonUtils.haveNetworkConnexion( context ) ) {

                && CommonUtils.haveNetworkConnection( 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/ObserverService.java

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ public class ObserverService extends Service implements OnRemoteOperationListene 
        }



        //check for the case where intent has been launched by initializerService

        if (!CommonUtils.haveNetworkConnexion(this)) {

        if (!CommonUtils.haveNetworkConnection(this)) {

            Log.w(TAG, "There is no Internet connexion.");

            return super.onStartCommand( intent, flags, startId );

        }

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

+1 −2
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import foundation.e.drive.operations.UploadFileOperation; 
import foundation.e.drive.utils.AppConstants;

import foundation.e.drive.utils.CommonUtils;

import foundation.e.drive.utils.DavClientProvider;

import foundation.e.drive.utils.ServiceExceptionHandler;



/**

 * @author Vincent Bourgmayer
@@ -110,7 +109,7 @@ public class OperationManagerService extends Service implements OnRemoteOperatio 
            }

        }

        //start the new Job

        if( !mThreadWorkingState[threadIndex] && CommonUtils.haveNetworkConnexion( getApplicationContext() ) ) { //check if the thread corresponding to threadIndex isn't already working

        if( !mThreadWorkingState[threadIndex] && CommonUtils.haveNetworkConnection( getApplicationContext() ) ) { //check if the thread corresponding to threadIndex isn't already working



            ComparableOperation operation = this.mOperationsQueue.poll(); //return null if deque is empty

            if (operation != null) {

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

+4 −4
Original line number Diff line number Diff line
@@ -196,13 +196,13 @@ public abstract class CommonUtils { 
    }



    /**

     * Tell if there is internet connexion

     * Tell if there is internet connection

     *

     * @param context Activity or service which are calling this method

     * @return True if there is connexion, false either

     * @return True if there is connection, false either

     */

    public static boolean haveNetworkConnexion(Context context) {

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

    public static boolean haveNetworkConnection(Context context) {

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



        ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);

        NetworkCapabilities capabilities = cm.getNetworkCapabilities(cm.getActiveNetwork());