Skip to content

Commit 8b75729

Browse files
committed
refactor: migrate away from deprecated onBackPressed()
1 parent 3129a06 commit 8b75729

File tree

3 files changed

+20
-11
lines changed

3 files changed

+20
-11
lines changed

app/src/main/kotlin/org/fossify/filemanager/activities/DecompressActivity.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,13 @@ class DecompressActivity : SimpleActivity() {
8787
}
8888
}
8989

90-
override fun onBackPressed() {
91-
if (currentPath.isEmpty()) {
92-
super.onBackPressed()
90+
override fun onBackPressedCompat(): Boolean {
91+
return if (currentPath.isEmpty()) {
92+
false
9393
} else {
9494
val newPath = if (currentPath.contains("/")) currentPath.getParentPath() else ""
9595
updateCurrentPath(newPath)
96+
true
9697
}
9798
}
9899

app/src/main/kotlin/org/fossify/filemanager/activities/MainActivity.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,26 +161,30 @@ class MainActivity : SimpleActivity() {
161161
config.lastUsedViewPagerPage = binding.mainViewPager.currentItem
162162
}
163163

164-
override fun onBackPressed() {
164+
override fun onBackPressedCompat(): Boolean {
165165
val currentFragment = getCurrentFragment()
166166
if (binding.mainMenu.isSearchOpen) {
167167
binding.mainMenu.closeSearch()
168+
return true
168169
} else if (currentFragment is RecentsFragment || currentFragment is StorageFragment) {
169-
super.onBackPressed()
170+
return false
170171
} else if ((currentFragment as ItemsFragment).getBreadcrumbs().getItemCount() <= 1) {
171172
if (!wasBackJustPressed && config.pressBackTwice) {
172173
wasBackJustPressed = true
173174
toast(R.string.press_back_again)
174175
Handler().postDelayed({
175176
wasBackJustPressed = false
176177
}, BACK_PRESS_TIMEOUT.toLong())
178+
return true
177179
} else {
178180
appLockManager.lock()
179181
finish()
182+
return true
180183
}
181184
} else {
182185
currentFragment.getBreadcrumbs().removeBreadcrumb()
183186
openPath(currentFragment.getBreadcrumbs().getLastItem().path)
187+
return true
184188
}
185189
}
186190

app/src/main/kotlin/org/fossify/filemanager/activities/ReadTextActivity.kt

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,22 +119,26 @@ class ReadTextActivity : SimpleActivity() {
119119
}
120120
}
121121

122-
override fun onBackPressed() {
122+
override fun onBackPressedCompat(): Boolean {
123123
val hasUnsavedChanges = originalText != binding.readTextView.text.toString()
124-
when {
125-
isSearchActive -> closeSearch()
124+
return when {
125+
isSearchActive -> {
126+
closeSearch()
127+
true
128+
}
126129
hasUnsavedChanges && System.currentTimeMillis() - lastSavePromptTS > SAVE_DISCARD_PROMPT_INTERVAL -> {
127130
lastSavePromptTS = System.currentTimeMillis()
128131
ConfirmationAdvancedDialog(this, "", R.string.save_before_closing, R.string.save, R.string.discard) {
129132
if (it) {
130133
saveText(true)
131134
} else {
132-
super.onBackPressed()
135+
performDefaultBack()
133136
}
134137
}
138+
true
135139
}
136140

137-
else -> super.onBackPressed()
141+
else -> false
138142
}
139143
}
140144

@@ -232,7 +236,7 @@ class ReadTextActivity : SimpleActivity() {
232236
}
233237

234238
if (shouldExitAfterSaving) {
235-
super.onBackPressed()
239+
performDefaultBack()
236240
}
237241
} else {
238242
toast(R.string.unknown_error_occurred)

0 commit comments

Comments
 (0)