Skip to content

Commit 29d8872

Browse files
authored
Merge branch 'dev' into aboutlibs-deprecation
2 parents e0b58c1 + 762f80f commit 29d8872

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

app/src/main/java/at/bitfire/icsdroid/ui/InfoActivity.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import androidx.compose.ui.text.style.TextAlign
4343
import androidx.compose.ui.tooling.preview.Preview
4444
import androidx.compose.ui.unit.dp
4545
import androidx.core.graphics.drawable.toBitmap
46+
import androidx.core.net.toUri
4647
import androidx.core.text.HtmlCompat
4748
import androidx.datastore.preferences.core.edit
4849
import at.bitfire.icsdroid.BuildConfig
@@ -54,7 +55,6 @@ import at.bitfire.icsdroid.service.ComposableStartupService
5455
import at.bitfire.icsdroid.service.ComposableStartupService.Companion.FLAG_DONATION_DIALOG
5556
import at.bitfire.icsdroid.ui.partials.ExtendedTopAppBar
5657
import at.bitfire.icsdroid.ui.partials.GenericAlertDialog
57-
import at.bitfire.icsdroid.ui.theme.setContentThemed
5858
import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer
5959
import com.mikepenz.aboutlibraries.ui.compose.rememberLibraries
6060
import kotlinx.coroutines.runBlocking
@@ -88,18 +88,18 @@ class InfoActivity: AppCompatActivity() {
8888
}
8989

9090
private fun showWebSite() {
91-
launchUri(Uri.parse("https://icsx5.bitfire.at/?pk_campaign=icsx5-app&pk_kwd=info-activity"))
91+
launchUri("https://icsx5.bitfire.at/?pk_campaign=icsx5-app&pk_kwd=info-activity".toUri())
9292
}
9393

9494
private fun showMastodon() {
95-
launchUri(Uri.parse("https://fosstodon.org/@davx5app"))
95+
launchUri("https://fosstodon.org/@davx5app".toUri())
9696
}
9797

9898
private fun launchUri(uri: Uri) {
9999
val intent = Intent(Intent.ACTION_VIEW, uri)
100100
try {
101101
startActivity(intent)
102-
} catch (e: ActivityNotFoundException) {
102+
} catch (_: ActivityNotFoundException) {
103103
Toast.makeText(this, getString(R.string.no_browser), Toast.LENGTH_LONG).show()
104104
Log.w(Constants.TAG, "No browser to view $uri")
105105
}

0 commit comments

Comments
 (0)