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

Commit ec882e3f authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Remove isBound() method 

Indeed, is bound state is redundant with the synchronization service beging set or not.

This commit also fixes possible NPE.
parent a1d2a949

app/src/main/java/foundation/e/drive/FileObservers/FileEventListener.java

+7 −4
Original line number Diff line number Diff line
@@ -105,9 +105,12 @@ public class FileEventListener { 
     */

    private void sendSyncRequestToSynchronizationService(@NonNull SyncRequest request) {

        Timber.d("Sending a SyncRequest for %s", request.getSyncedFileState().getName());

        if (serviceConnection.isBound()) {

            serviceConnection.getSynchronizationService().queueSyncRequest(request);

            serviceConnection.getSynchronizationService().startSynchronization();



        SynchronizationService service = serviceConnection.getSynchronizationService();



        if (service != null) {

            service.queueSyncRequest(request);

            service.startSynchronization();

        } else {

            Timber.d("Impossible to send SyncRequest. FileEventListener is not bound to SynchronizationService");

        }

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

+11 −7
Original line number Diff line number Diff line
@@ -179,8 +179,10 @@ public class ObserverService extends Service implements OnRemoteOperationListene 
            return false;

        }



        final boolean isSyncServicePaused = synchronizationServiceConnection.isBound()

                && synchronizationServiceConnection.getSynchronizationService().pauseSync();

        final SynchronizationService service =

                synchronizationServiceConnection.getSynchronizationService();



        final boolean isSyncServicePaused = service != null && service.pauseSync();

        Timber.d("isSyncServicePaused ? %s", isSyncServicePaused);

        return isSyncServicePaused;

    }
@@ -329,8 +331,9 @@ public class ObserverService extends Service implements OnRemoteOperationListene 


        startScan(false);



        if (synchronizationServiceConnection.isBound()) {

            synchronizationServiceConnection.getSynchronizationService().unPauseSync();

        SynchronizationService service = synchronizationServiceConnection.getSynchronizationService();

        if (service != null) {

            service.unPauseSync();

        }



        if (!syncRequests.isEmpty()) {
@@ -352,9 +355,10 @@ public class ObserverService extends Service implements OnRemoteOperationListene 
     * Send all gathered SyncRequest to SynchronizationService

     */

    private void passSyncRequestsToSynchronizationService() {

        if (synchronizationServiceConnection.isBound()) {

            synchronizationServiceConnection.getSynchronizationService().queueSyncRequests(syncRequests.values());

            synchronizationServiceConnection.getSynchronizationService().startSynchronization();

        SynchronizationService service = synchronizationServiceConnection.getSynchronizationService();

        if (service != null) {

            service.queueSyncRequests(syncRequests.values());

            service.startSynchronization();

        } else {

            Timber.e("ERROR: binding to SynchronizationService lost");

        }

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

+5 −10
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ import timber.log.Timber; 
 */

public class SynchronizationServiceConnection implements ServiceConnection {



    private SynchronizationService synchronizationService;

    private boolean isBound = false;

    @Nullable

    private SynchronizationService synchronizationService = null;

    private boolean attemptingToBind = false;



    @Override
@@ -34,7 +34,6 @@ public class SynchronizationServiceConnection implements ServiceConnection { 
        Timber.tag(SynchronizationServiceConnection.class.getSimpleName())

                .v("binding to SynchronizationService");

        attemptingToBind = false;

        isBound = true;

        final SynchronizationService.SynchronizationBinder binder = (SynchronizationService.SynchronizationBinder) iBinder;

        synchronizationService = binder.getService();

    }
@@ -43,11 +42,7 @@ public class SynchronizationServiceConnection implements ServiceConnection { 
    public void onServiceDisconnected(@Nullable ComponentName componentName) {

        Timber.tag(SynchronizationServiceConnection.class.getSimpleName())

                .v("onServiceDisconnected()");

        isBound = false;

    }



    public boolean isBound() {

        return isBound;

        synchronizationService = null;

    }



    /**
@@ -65,9 +60,9 @@ public class SynchronizationServiceConnection implements ServiceConnection { 
     */

    public void unBind(@NonNull Context context) {

        attemptingToBind = false;

        if (isBound) {

        if (synchronizationService != null) {

            context.unbindService(this);

            isBound = false;

            synchronizationService = null;

        }

    }