From a56935bc3d714f5ef34de793536c5561d7111030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= Date: Thu, 18 Feb 2021 13:20:27 +0100 Subject: [PATCH] Move simulation of slowness into LifecycleManager --- .../bramble/lifecycle/LifecycleManagerImpl.java | 7 +++++++ .../briar/android/controller/BriarControllerImpl.java | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/bramble-core/src/main/java/org/briarproject/bramble/lifecycle/LifecycleManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/lifecycle/LifecycleManagerImpl.java index fc1259d2a..c35ffef59 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/lifecycle/LifecycleManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/lifecycle/LifecycleManagerImpl.java @@ -179,6 +179,13 @@ class LifecycleManagerImpl implements LifecycleManager, MigrationListener { LOG.info("Stopping services"); state = STOPPING; eventBus.broadcast(new LifecycleEvent(STOPPING)); + LOG.info("Sleeping a bit to simulate slowness"); + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + LOG.info("Done simulating slowness"); for (Service s : services) { long start = now(); s.stopService(); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/controller/BriarControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/controller/BriarControllerImpl.java index cc486dee1..65c3efec4 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/controller/BriarControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/controller/BriarControllerImpl.java @@ -146,11 +146,6 @@ public class BriarControllerImpl implements BriarController { // Shut down the service and wait for it to shut down LOG.info("Shutting down service"); service.shutdown(); - try { - Thread.sleep(5000); - } catch (InterruptedException e) { - e.printStackTrace(); - } service.waitForShutdown(); } catch (InterruptedException e) { LOG.warning("Interrupted while waiting for service");