Merge branch 'onbackpressed_fix' into 'master'
Do edit check in onBackPressed to also catch pressing the system back button See merge request pixeldroid/PixelDroid!287
This commit is contained in:
commit
72b902e522
|
@ -154,11 +154,8 @@ class PhotoEditActivity : BaseActivity() {
|
|||
saving = false
|
||||
}
|
||||
|
||||
override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
||||
|
||||
when(item.itemId) {
|
||||
android.R.id.home -> {
|
||||
if (noEdits()) onBackPressed()
|
||||
override fun onBackPressed() {
|
||||
if (noEdits()) super.onBackPressed()
|
||||
else {
|
||||
val builder = AlertDialog.Builder(this)
|
||||
builder.apply {
|
||||
|
@ -174,6 +171,11 @@ class PhotoEditActivity : BaseActivity() {
|
|||
builder.show()
|
||||
}
|
||||
}
|
||||
|
||||
override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
||||
|
||||
when(item.itemId) {
|
||||
android.R.id.home -> onBackPressed()
|
||||
R.id.action_save -> {
|
||||
saveImageToGallery()
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue