Skip to content

Commit cdaac1f

Browse files
committed
Fix lint warning
1 parent 4b977c0 commit cdaac1f

File tree

6 files changed

+12
-9
lines changed

6 files changed

+12
-9
lines changed

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package net.mullvad.mullvadvpn.compose.textfield
22

3-
import android.text.TextUtils
43
import androidx.compose.foundation.layout.Row
54
import androidx.compose.foundation.layout.fillMaxWidth
65
import androidx.compose.foundation.layout.padding
@@ -30,6 +29,7 @@ import androidx.compose.ui.text.input.KeyboardCapitalization
3029
import androidx.compose.ui.text.input.KeyboardType
3130
import androidx.compose.ui.text.input.TextFieldValue
3231
import androidx.compose.ui.text.input.VisualTransformation
32+
import androidx.core.text.isDigitsOnly
3333
import net.mullvad.mullvadvpn.constant.EMPTY_STRING
3434
import net.mullvad.mullvadvpn.constant.NEWLINE_STRING
3535
import net.mullvad.mullvadvpn.lib.theme.Dimens
@@ -87,8 +87,7 @@ fun CustomTextField(
8787

8888
if (stringChangedSinceLastInvocation) {
8989
val isValidInput =
90-
if (isDigitsOnlyAllowed) TextUtils.isDigitsOnly(newTextFieldValueState.text)
91-
else true
90+
if (isDigitsOnlyAllowed) newTextFieldValueState.text.isDigitsOnly() else true
9291
if (newTextFieldValueState.text.length <= maxCharLength && isValidInput) {
9392
// Remove any newline chars added by enter key clicks
9493
onValueChanged(

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

+2-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,7 @@ class MainActivity : ComponentActivity(), AndroidScopeComponent {
158159
callbackFlow<Intent> {
159160
send(intent)
160161

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

163164
addOnNewIntentListener(listener)
164165

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package net.mullvad.mullvadvpn.viewmodel
22

33
import android.content.res.Resources
44
import android.net.Uri
5+
import androidx.core.net.toUri
56
import androidx.lifecycle.ViewModel
67
import androidx.lifecycle.viewModelScope
78
import kotlinx.coroutines.channels.Channel
@@ -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
@@ -2,6 +2,7 @@ package net.mullvad.mullvadvpn.viewmodel
22

33
import android.content.res.Resources
44
import android.net.Uri
5+
import androidx.core.net.toUri
56
import androidx.lifecycle.ViewModel
67
import androidx.lifecycle.viewModelScope
78
import kotlinx.coroutines.FlowPreview
@@ -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
@@ -3,6 +3,7 @@ package net.mullvad.mullvadvpn.lib.common.util
33
import android.content.Context
44
import android.content.Intent
55
import android.net.Uri
6+
import androidx.core.net.toUri
67
import net.mullvad.mullvadvpn.lib.model.WebsiteAuthToken
78

89
fun createAccountUri(accountUri: String, websiteAuthToken: WebsiteAuthToken?): Uri {
@@ -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)