update to SDK 30 and fix deprecations (#2173)

* update to SDk 30 and fix deprecations

* remove unnecessary .run

* revert ViewMediaActivity change
This commit is contained in:
Konrad Pozniak 2021-06-01 19:46:07 +02:00 committed by GitHub
commit 3301643c1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 29 additions and 33 deletions

View file

@ -614,7 +614,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
AlertDialog.Builder(this)
.setTitle(R.string.action_logout)
.setMessage(getString(R.string.action_logout_confirm, activeAccount.fullName))
.setPositiveButton(android.R.string.yes) { _: DialogInterface?, _: Int ->
.setPositiveButton(android.R.string.ok) { _: DialogInterface?, _: Int ->
NotificationHelper.deleteNotificationChannelsForAccount(activeAccount, this)
cacheUpdater.clearForUser(activeAccount.id)
conversationRepository.deleteCacheForAccount(activeAccount.id)
@ -632,7 +632,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
startActivity(intent)
finishWithoutSlideOutAnimation()
}
.setNegativeButton(android.R.string.no, null)
.setNegativeButton(android.R.string.cancel, null)
.show()
}
}