Skip to content

Games: Catch network exceptions in GameDeletePlayAccountFragment to fix :ui crash on SSL handshake failure #3574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DaVinci9196 wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −21
Open

Games: Catch network exceptions in GameDeletePlayAccountFragment to fix :ui crash on SSL handshake failure #3574

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 26 additions & 21 deletions play-services-core/src/main/kotlin/org/microg/gms/games/ui/GameDeletePlayAccountFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,28 +84,33 @@ class GameDeletePlayAccountFragment : Fragment() {

private fun loadIndividualGames() {
lifecycleScope.launchWhenStarted {
val response = withContext(Dispatchers.IO) {
val scopes = arrayListOf(Scope(Scopes.GAMES_LITE), Scope(Scopes.GAMES_FIRSTPARTY))
val authToken = requestGameToken(requireContext(), lastChoosePlayer!!.first, scopes) ?: throw RuntimeException("authToken is null")
getApplicationsFirstPartyClient(requireContext(), authToken).ListApplicationsWithUserDataFirstParty().execute(ListApplicationsWithUserDataRequest.build {
locale = Locale.getDefault().language
androidSdk = "android:${SDK_INT}"
})
}
val dataList = response.firstPartyApplication.map {
GameDataDeleteItem(
iconUrl = it.application?.gameIcon?.url,
gameName = it.application?.gameName,
gameId = it.application?.gameId,
tips = "${it.unlockAchievementsNum} / ${it.application?.achievementsNum} ${requireContext().getString(R.string.games_achievement_list_title)}"
)
}
individualGameRecyclerView.layoutManager = LinearLayoutManager(requireContext())
individualGameRecyclerView.adapter = GameDataDeleteAdapter(dataList) { item ->
showDeleteConfirmationDialog(item)
try {
val response = withContext(Dispatchers.IO) {
val scopes = arrayListOf(Scope(Scopes.GAMES_LITE), Scope(Scopes.GAMES_FIRSTPARTY))
val authToken = requestGameToken(requireContext(), lastChoosePlayer!!.first, scopes) ?: throw RuntimeException("authToken is null")
getApplicationsFirstPartyClient(requireContext(), authToken).ListApplicationsWithUserDataFirstParty().execute(ListApplicationsWithUserDataRequest.build {
locale = Locale.getDefault().language
androidSdk = "android:${SDK_INT}"
})
}
val dataList = response.firstPartyApplication.map {
GameDataDeleteItem(
iconUrl = it.application?.gameIcon?.url,
gameName = it.application?.gameName,
gameId = it.application?.gameId,
tips = "${it.unlockAchievementsNum} / ${it.application?.achievementsNum} ${requireContext().getString(R.string.games_achievement_list_title)}"
)
}
individualGameRecyclerView.layoutManager = LinearLayoutManager(requireContext())
individualGameRecyclerView.adapter = GameDataDeleteAdapter(dataList) { item ->
showDeleteConfirmationDialog(item)
}
individualGameRecyclerView.visibility = View.VISIBLE
loadingBar.visibility = View.GONE
} catch (e: Exception) {
Log.w(TAG, "loadIndividualGames: ", e)
loadingBar.visibility = View.GONE
}
individualGameRecyclerView.visibility = View.VISIBLE
loadingBar.visibility = View.GONE
}
}

Expand Down