Skip to content

Commit f492d0d

Browse files
authored
Fixed deprecations (#592)
Signed-off-by: Arnau Mora <arnyminerz@proton.me>
1 parent 59a0fcb commit f492d0d

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

app/src/main/java/at/bitfire/icsdroid/AsyncUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ suspend fun Call.executeAsync(): Response = suspendCancellableCoroutine { contin
2626
}
2727

2828
override fun onResponse(call: Call, response: Response) {
29-
continuation.resume(value = response, onCancellation = { call.cancel() })
29+
continuation.resume(value = response, onCancellation = { _, _, _ -> call.cancel() })
3030
}
3131
})
3232
}

app/src/main/java/at/bitfire/icsdroid/ui/views/CalendarListActivity.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import androidx.compose.runtime.getValue
1212
import androidx.compose.runtime.mutableStateOf
1313
import androidx.compose.runtime.remember
1414
import androidx.compose.runtime.setValue
15+
import androidx.core.content.IntentCompat
1516
import at.bitfire.icsdroid.PermissionUtils
1617
import at.bitfire.icsdroid.SyncWorker
1718
import at.bitfire.icsdroid.model.SubscriptionsModel
@@ -20,6 +21,8 @@ import at.bitfire.icsdroid.ui.InfoActivity
2021
import at.bitfire.icsdroid.ui.partials.AlertDialog
2122
import at.bitfire.icsdroid.ui.screen.CalendarListScreen
2223
import at.bitfire.icsdroid.ui.theme.setContentThemed
24+
import at.bitfire.icsdroid.ui.views.CalendarListActivity.Companion.EXTRA_ERROR_MESSAGE
25+
import at.bitfire.icsdroid.ui.views.CalendarListActivity.Companion.EXTRA_THROWABLE
2326
import java.util.ServiceLoader
2427

2528
class CalendarListActivity: AppCompatActivity() {
@@ -91,7 +94,7 @@ class CalendarListActivity: AppCompatActivity() {
9194
if (showingErrorMessage) {
9295
AlertDialog(
9396
intent.getStringExtra(EXTRA_ERROR_MESSAGE)!!,
94-
intent.getSerializableExtra(EXTRA_THROWABLE) as? Throwable
97+
IntentCompat.getSerializableExtra(intent, EXTRA_THROWABLE, Throwable::class.java)
9598
) { showingErrorMessage = false }
9699
}
97100

0 commit comments

Comments
 (0)