Skip to content

Commit 3983c06

Browse files
committed
use kotlin fun interface for get request builder
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
1 parent 786b805 commit 3983c06

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

app/src/androidTest/java/com/nextcloud/client/network/ConnectivityServiceImplIT.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import android.content.Context
1212
import com.nextcloud.client.account.UserAccountManagerImpl
1313
import com.nextcloud.client.core.ClockImpl
1414
import com.nextcloud.client.network.ConnectivityServiceImpl.GetRequestBuilder
15+
import com.nextcloud.operations.GetMethod
1516
import com.owncloud.android.AbstractOnServerIT
1617
import org.junit.Assert.assertFalse
1718
import org.junit.Assert.assertTrue
@@ -23,7 +24,7 @@ class ConnectivityServiceImplIT : AbstractOnServerIT() {
2324
val accountManager = targetContext.getSystemService(Context.ACCOUNT_SERVICE) as AccountManager
2425
val userAccountManager = UserAccountManagerImpl(targetContext, accountManager)
2526
val clientFactory = ClientFactoryImpl(targetContext)
26-
val requestBuilder = GetRequestBuilder()
27+
val requestBuilder = GetRequestBuilder { url -> GetMethod(url, false) }
2728
val walledCheckCache = WalledCheckCache(ClockImpl())
2829

2930
val sut = ConnectivityServiceImpl(

app/src/main/java/com/nextcloud/client/network/ConnectivityServiceImpl.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import java.net.ConnectException
2626
import java.net.SocketTimeoutException
2727
import java.net.UnknownHostException
2828
import javax.net.ssl.SSLException
29-
import kotlin.jvm.functions.Function1
3029

3130
@Suppress("TooGenericExceptionCaught", "ReturnCount")
3231
class ConnectivityServiceImpl(
@@ -87,9 +86,8 @@ class ConnectivityServiceImpl(
8786
}
8887
}
8988

90-
class GetRequestBuilder : Function1<String, GetMethod> {
91-
@Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE")
92-
override fun invoke(url: String) = GetMethod(url, false)
89+
fun interface GetRequestBuilder {
90+
operator fun invoke(url: String): GetMethod
9391
}
9492

9593
init {

app/src/main/java/com/nextcloud/client/network/NetworkModule.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import android.content.Context;
1010

1111
import com.nextcloud.client.account.UserAccountManager;
12+
import com.nextcloud.operations.GetMethod;
1213

1314
import javax.inject.Singleton;
1415

@@ -26,7 +27,7 @@ ConnectivityService connectivityService(Context context,
2627
return new ConnectivityServiceImpl(context,
2728
accountManager,
2829
clientFactory,
29-
new ConnectivityServiceImpl.GetRequestBuilder(),
30+
url -> new GetMethod(url, false),
3031
walledCheckCache
3132
);
3233
}

0 commit comments

Comments
 (0)