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

Commit 25dfbcb5 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

chore: refactor according to review

parent 671381b3

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

+5 −5
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ public class DavClientProvider { 
        OwnCloudClientManagerFactory.setUserAgent(AppConstants.USER_AGENT);



        try {

            OwnCloudClientManager ownCloudClientManager = OwnCloudClientManagerFactory.getDefaultSingleton();

            OwnCloudAccount ocAccount = new OwnCloudAccount(account, context);

            final OwnCloudClientManager ownCloudClientManager = OwnCloudClientManagerFactory.getDefaultSingleton();

            final OwnCloudAccount ocAccount = new OwnCloudAccount(account, context);

            return ownCloudClientManager.getClientFor(ocAccount, context);

        } catch (AccountUtils.AccountNotFoundException | OperationCanceledException |

                 AuthenticatorException | IOException exception) {
@@ -69,8 +69,8 @@ public class DavClientProvider { 
        OwnCloudClientManagerFactory.setUserAgent(AppConstants.USER_AGENT);



        try {

            OwnCloudClientManager ownCloudClientManager = OwnCloudClientManagerFactory.getDefaultSingleton();

            OwnCloudAccount ocAccount = new OwnCloudAccount(account, context);

            final OwnCloudClientManager ownCloudClientManager = OwnCloudClientManagerFactory.getDefaultSingleton();

            final OwnCloudAccount ocAccount = new OwnCloudAccount(account, context);

            return ownCloudClientManager.getNextcloudClientFor(ocAccount, context);

        } catch (AccountUtils.AccountNotFoundException | OperationCanceledException |

                 AuthenticatorException | IOException exception) {
@@ -81,7 +81,7 @@ public class DavClientProvider { 
    }



    public void cleanUp() {

        OwnCloudClientManager ownCloudClientManager = OwnCloudClientManagerFactory.getDefaultSingleton();

        final OwnCloudClientManager ownCloudClientManager = OwnCloudClientManagerFactory.getDefaultSingleton();

        ownCloudClientManager.removeClientForByName(null);

    }

app/src/test/java/foundation/e/drive/synchronization/StateMachineTest.kt

+4 −4
Original line number Diff line number Diff line
@@ -54,10 +54,10 @@ class StateMachineTest { 
        StateMachine.currentState = PERIODIC_SCAN



        val result = StateMachine.changeState(IDLE)

        Assert.assertTrue("Changing state from PERIODIC_SCAN to IDLE returned true", result)

        Assert.assertTrue("Changing state from PERIODIC_SCAN to IDLE returned false", result)



        val currentState = StateMachine.currentState

        Assert.assertEquals("Current state should be but is $currentState", IDLE, currentState)

        Assert.assertEquals("Current state should be IDLE but is $currentState", IDLE, currentState)

    }



    @Test
@@ -87,7 +87,7 @@ class StateMachineTest { 
        StateMachine.currentState = LISTENING_FILES



        val result = StateMachine.changeState(IDLE)

        Assert.assertTrue("Changing state from LISTENING_FILES to IDLE returned true", result)

        Assert.assertTrue("Changing state from LISTENING_FILES to IDLE returned false", result)



        val currentState = StateMachine.currentState

        Assert.assertEquals("Current state should be IDLE but is $currentState", IDLE, currentState)
@@ -142,7 +142,7 @@ class StateMachineTest { 
        StateMachine.currentState = SYNCHRONIZING



        val result = StateMachine.changeState(IDLE)

        Assert.assertTrue("Changing state from SYNCHRONIZING to IDLE returned true", result)

        Assert.assertTrue("Changing state from SYNCHRONIZING to IDLE returned false", result)



        val currentState = StateMachine.currentState

        Assert.assertEquals("Current state should be IDLE but is $currentState", IDLE, currentState)