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

Commit 1259f7de authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

chore: refactor according to review

parent eb400776

app/src/main/java/com/nextcloud/android/sso/InputStreamBinder.java

+6 −6
Original line number Diff line number Diff line
@@ -334,9 +334,9 @@ public class InputStreamBinder extends IInputStreamService.Stub { 
        }



        OwnCloudClientManagerFactory.setUserAgent(getUserAgent());

        OwnCloudClientManager ownCloudClientManager = OwnCloudClientManagerFactory.getDefaultSingleton();

        OwnCloudAccount ocAccount = new OwnCloudAccount(account, context);

        OwnCloudClient client = ownCloudClientManager.getClientFor(ocAccount, context);

        final OwnCloudClientManager ownCloudClientManager = OwnCloudClientManagerFactory.getDefaultSingleton();

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

        final OwnCloudClient client = ownCloudClientManager.getClientFor(ownCloudAccount, context);



        HttpMethodBase method = buildMethod(request, client.getBaseUri(), requestBodyInputStream);
@@ -408,9 +408,9 @@ public class InputStreamBinder extends IInputStreamService.Stub { 
        }



        OwnCloudClientManagerFactory.setUserAgent(getUserAgent());

        OwnCloudClientManager ownCloudClientManager = OwnCloudClientManagerFactory.getDefaultSingleton();

        OwnCloudAccount ocAccount = new OwnCloudAccount(account, context);

        OwnCloudClient client = ownCloudClientManager.getClientFor(ocAccount, context);

        final OwnCloudClientManager ownCloudClientManager = OwnCloudClientManagerFactory.getDefaultSingleton();

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

        final OwnCloudClient client = ownCloudClientManager.getClientFor(ownCloudAccount, context);



        HttpMethodBase method = buildMethod(request, client.getBaseUri(), requestBodyInputStream);

app/src/main/kotlin/at/bitfire/davdroid/network/PersistentCookieStore.kt

+8 −10
Original line number Diff line number Diff line
@@ -56,9 +56,7 @@ class PersistentCookieStore(context: Context, private val account: Account): Coo 


    private fun getCookieMap(url: HttpUrl): HashMap<String, Cookie> {

        val result = HashMap<String, Cookie>()



            val cookiesString = accountManager.getUserData(account, AccountSettings.COOKIE_KEY)

                ?: return HashMap()

        val cookiesString = accountManager.getUserData(account, AccountSettings.COOKIE_KEY)?: return HashMap()



        val cookies = cookiesString.split(AccountSettings.COOKIE_SEPARATOR.toRegex()).dropLastWhile { it.isEmpty() }

            .toTypedArray()

app/src/main/kotlin/at/bitfire/davdroid/syncadapter/AccountUtils.kt

+2 −2
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ object AccountUtils { 
    }



    fun getOwnCloudBaseUrl(baseURL: String): String {

        if (baseURL.contains("remote.php")) {

        if (baseURL.contains("/remote.php")) {

            return baseURL.split("/remote.php")[0]

        }
@@ -141,7 +141,7 @@ object AccountUtils { 


    fun getAccount(context: Context, userName: String?, requestedBaseUrl: String?): Account? {

        if (userName == null || requestedBaseUrl == null) {

            return null;

            return null

        }



        val baseUrl = getOwnCloudBaseUrl(requestedBaseUrl)