From d411b990304cfba0ad60fe817d4ee8937fd2a32d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= Date: Wed, 4 Aug 2021 12:35:33 +0200 Subject: [PATCH] Improve handling of HotspotState's field 'consumed' --- .../briar/android/hotspot/HotspotActivity.java | 1 + .../briarproject/briar/android/hotspot/HotspotState.java | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotActivity.java index 0f19809d7..359b86f2d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotActivity.java @@ -60,6 +60,7 @@ public class HotspotActivity extends BriarActivity // to not lose state on configuration changes if (fm.findFragmentByTag(tag) == null) { if (started.wasNotYetConsumed()) { + started.consume(); showFragment(fm, new HotspotFragment(), tag); } } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotState.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotState.java index be9048618..a152874eb 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotState.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotState.java @@ -57,16 +57,19 @@ abstract class HotspotState { return websiteConfig; } + @UiThread + boolean wasNotYetConsumed() { + return !consumed; + } + /** * Mark this state as consumed, i.e. the UI has already done something * as a result of the state changing to this. This can be used in order * to not repeat actions such as showing fragments on rotation changes. */ @UiThread - boolean wasNotYetConsumed() { - boolean old = consumed; + void consume() { consumed = true; - return !old; } }