Skip to content

Commit 9ec004c

Browse files
committed
Fix lint warning
1 parent 32a9d54 commit 9ec004c

File tree

6 files changed

+15
-8
lines changed

6 files changed

+15
-8
lines changed

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/CustomTextField.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import androidx.compose.ui.text.input.VisualTransformation
3333
import net.mullvad.mullvadvpn.constant.EMPTY_STRING
3434
import net.mullvad.mullvadvpn.constant.NEWLINE_STRING
3535
import net.mullvad.mullvadvpn.lib.theme.Dimens
36+
import androidx.core.text.isDigitsOnly
3637

3738
@Composable
3839
fun CustomTextField(
@@ -87,12 +88,12 @@ fun CustomTextField(
8788

8889
if (stringChangedSinceLastInvocation) {
8990
val isValidInput =
90-
if (isDigitsOnlyAllowed) TextUtils.isDigitsOnly(newTextFieldValueState.text)
91+
if (isDigitsOnlyAllowed) newTextFieldValueState.text.isDigitsOnly()
9192
else true
9293
if (newTextFieldValueState.text.length <= maxCharLength && isValidInput) {
9394
// Remove any newline chars added by enter key clicks
9495
onValueChanged(
95-
newTextFieldValueState.text.replace(NEWLINE_STRING, EMPTY_STRING)
96+
newTextFieldValueState.text.replace(NEWLINE_STRING, EMPTY_STRING),
9697
)
9798
}
9899
}

android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import androidx.activity.compose.setContent
99
import androidx.activity.enableEdgeToEdge
1010
import androidx.activity.result.contract.ActivityResultContracts
1111
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
12+
import androidx.core.util.Consumer
1213
import androidx.lifecycle.Lifecycle
1314
import androidx.lifecycle.lifecycleScope
1415
import androidx.lifecycle.repeatOnLifecycle
@@ -158,7 +159,9 @@ class MainActivity : ComponentActivity(), AndroidScopeComponent {
158159
callbackFlow<Intent> {
159160
send(intent)
160161

161-
val listener: (Intent) -> Unit = { trySend(it) }
162+
val listener = Consumer<Intent> { intent ->
163+
trySend(intent)
164+
}
162165

163166
addOnNewIntentListener(listener)
164167

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/AppInfoViewModel.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import net.mullvad.mullvadvpn.R
1616
import net.mullvad.mullvadvpn.repository.ChangelogRepository
1717
import net.mullvad.mullvadvpn.ui.VersionInfo
1818
import net.mullvad.mullvadvpn.ui.serviceconnection.AppVersionInfoRepository
19+
import androidx.core.net.toUri
1920

2021
class AppInfoViewModel(
2122
changelogRepository: ChangelogRepository,
@@ -51,7 +52,7 @@ class AppInfoViewModel(
5152
} else {
5253
resources.getString(R.string.download_url)
5354
}
54-
_uiSideEffect.send(AppInfoSideEffect.OpenUri(Uri.parse(uri)))
55+
_uiSideEffect.send(AppInfoSideEffect.OpenUri(uri.toUri()))
5556
}
5657
}
5758

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import net.mullvad.mullvadvpn.usecase.SelectedLocationTitleUseCase
3737
import net.mullvad.mullvadvpn.util.combine
3838
import net.mullvad.mullvadvpn.util.isSuccess
3939
import net.mullvad.mullvadvpn.util.withPrev
40+
import androidx.core.net.toUri
4041

4142
@Suppress("LongParameterList")
4243
class ConnectViewModel(
@@ -190,7 +191,7 @@ class ConnectViewModel(
190191
} else {
191192
resources.getString(R.string.download_url)
192193
}
193-
_uiSideEffect.send(UiSideEffect.OpenUri(Uri.parse(uri)))
194+
_uiSideEffect.send(UiSideEffect.OpenUri(uri.toUri()))
194195
}
195196

196197
fun dismissNewDeviceNotification() {

android/config/lint-baseline.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
id="InvalidPackage"
66
message="Invalid package reference in library; not included in Android: `javax.naming.directory`. Referenced from `io.grpc.internal.JndiResourceResolverFactory.JndiRecordFetcher`.">
77
<location
8-
file="../../../../.gradle/caches/modules-2/files-2.1/io.grpc/grpc-core/1.69.1/d9f6383e1903af6e9502e7c1c8e4fbe28a236321/grpc-core-1.69.1.jar"/>
8+
file="*/caches/modules-2/files-2.1/io.grpc/grpc-core/1.71.0/a7cd1e546cd5518dc6a919e5469712af99fe13b0/grpc-core-1.71.0.jar"/>
99
</issue>
1010

1111
<issue
1212
id="InvalidPackage"
1313
message="Invalid package reference in library; not included in Android: `javax.naming`. Referenced from `io.grpc.internal.JndiResourceResolverFactory.JndiRecordFetcher`.">
1414
<location
15-
file="../../../../.gradle/caches/modules-2/files-2.1/io.grpc/grpc-core/1.69.1/d9f6383e1903af6e9502e7c1c8e4fbe28a236321/grpc-core-1.69.1.jar"/>
15+
file="*/caches/modules-2/files-2.1/io.grpc/grpc-core/1.71.0/a7cd1e546cd5518dc6a919e5469712af99fe13b0/grpc-core-1.71.0.jar"/>
1616
</issue>
1717

1818
<issue

android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/ContextExtensions.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.content.Context
44
import android.content.Intent
55
import android.net.Uri
66
import net.mullvad.mullvadvpn.lib.model.WebsiteAuthToken
7+
import androidx.core.net.toUri
78

89
fun createAccountUri(accountUri: String, websiteAuthToken: WebsiteAuthToken?): Uri {
910
val urlString = buildString {
@@ -13,7 +14,7 @@ fun createAccountUri(accountUri: String, websiteAuthToken: WebsiteAuthToken?): U
1314
append(websiteAuthToken.value)
1415
}
1516
}
16-
return Uri.parse(urlString)
17+
return urlString.toUri()
1718
}
1819

1920
fun Context.openVpnSettings() {

0 commit comments

Comments
 (0)