From 6703fa3652445ee15ccbc739c525f0c27fc444c6 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Sat, 9 May 2015 11:02:34 -0400 Subject: [PATCH] rename to FDroidApp.restartLocalRepoServiceIfRunning() for clarity This method handles checking if the service is running, and only restarts it if it was running. --- F-Droid/src/org/fdroid/fdroid/FDroidApp.java | 7 +++++-- .../src/org/fdroid/fdroid/net/WifiStateChangeService.java | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java index a5a929e46..a64d837af 100644 --- a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java +++ b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java @@ -67,7 +67,7 @@ public class FDroidApp extends Application { // for the local repo on this device, all static since there is only one public static int port; public static String ipAddressString; - public static String ssid ; + public static String ssid; public static String bssid; public static final Repo repo = new Repo(); public static Set selectedApps = null; // init in SelectLocalAppsFragment @@ -337,7 +337,10 @@ public class FDroidApp extends Application { app.stopService(new Intent(app, LocalRepoService.class)); } - public static void restartLocalRepoService() { + /** + * Handles checking if the {@link LocalRepoService} is running, and only restarts it if it was running. + */ + public static void restartLocalRepoServiceIfRunning() { if (localRepoServiceMessenger != null) { try { Message msg = Message.obtain(null, LocalRepoService.RESTART, LocalRepoService.RESTART, 0); diff --git a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java index 934dd46ed..8e470e33c 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java +++ b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java @@ -127,7 +127,7 @@ public class WifiStateChangeService extends Service { Intent intent = new Intent(BROADCAST); LocalBroadcastManager.getInstance(WifiStateChangeService.this).sendBroadcast(intent); WifiStateChangeService.this.stopSelf(); - FDroidApp.restartLocalRepoService(); + FDroidApp.restartLocalRepoServiceIfRunning(); } }