Skip to content

Commit dc7ffca

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

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
@@ -1294,7 +1294,7 @@ class FileDisplayActivity :
12941294
Log_OC.v(TAG, "onResume() start")
12951295

12961296
super.onResume()
1297-
if (SettingsActivity.onBackPressed) {
1297+
if (SettingsActivity.isBackPressed) {
12981298
Log_OC.d(TAG, "User returned from settings activity, skipping reset content logic")
12991299
return
13001300
}
@@ -2784,7 +2784,7 @@ class FileDisplayActivity :
27842784

27852785
public override fun onStart() {
27862786
super.onStart()
2787-
if (SettingsActivity.onBackPressed) {
2787+
if (SettingsActivity.isBackPressed) {
27882788
Log_OC.d(TAG, "User returned from settings activity, skipping reset content logic")
27892789
return
27902790
}

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
@@ -213,16 +213,16 @@ public void onCreate(Bundle savedInstanceState) {
213213
}
214214
}
215215

216-
public static boolean onBackPressed = false;
216+
public static boolean isBackPressed = false;
217217

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

0 commit comments

Comments
 (0)