Skip to content

Commit 3a2b748

Browse files
committed
SettingsActivity flag added to preserve activity state
Signed-off-by: alperozturk <[email protected]>
1 parent c8de25c commit 3a2b748

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,7 +1303,7 @@ class FileDisplayActivity :
13031303
Log_OC.v(TAG, "onResume() start")
13041304

13051305
super.onResume()
1306-
if (SettingsActivity.onBackPressed) {
1306+
if (SettingsActivity.isBackPressed) {
13071307
Log_OC.d(TAG, "User returned from settings activity, skipping reset content logic")
13081308
return
13091309
}
@@ -2795,7 +2795,7 @@ class FileDisplayActivity :
27952795

27962796
public override fun onStart() {
27972797
super.onStart()
2798-
if (SettingsActivity.onBackPressed) {
2798+
if (SettingsActivity.isBackPressed) {
27992799
Log_OC.d(TAG, "User returned from settings activity, skipping reset content logic")
28002800
return
28012801
}

app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,16 +217,16 @@ public void onCreate(Bundle savedInstanceState) {
217217
}
218218
}
219219

220-
public static boolean onBackPressed = false;
220+
public static boolean isBackPressed = false;
221221

222222
@SuppressLint("GestureBackNavigation")
223223
@Override
224224
public void onBackPressed() {
225-
onBackPressed = true;
225+
isBackPressed = true;
226226
super.onBackPressed();
227227
new Handler(Looper.getMainLooper()).postDelayed(() -> {
228228
Log_OC.d(TAG, "User returned from settings activity, reset onBackPressed flag.");
229-
onBackPressed = false;
229+
isBackPressed = false;
230230
}, 2000);
231231
}
232232

0 commit comments

Comments
 (0)