From 7105dfe5fa2b87e6dfc8e8b71d383ee961d37baf Mon Sep 17 00:00:00 2001 From: Xcreen Date: Tue, 13 Nov 2018 10:03:51 +0100 Subject: [PATCH] Use constant for start/stop intent --- .../java/net/xcreen/restsms/fragments/HomeFragment.java | 4 ++-- .../java/net/xcreen/restsms/server/ServerService.java | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/net/xcreen/restsms/fragments/HomeFragment.java b/app/src/main/java/net/xcreen/restsms/fragments/HomeFragment.java index 40ac037..05c3ed9 100644 --- a/app/src/main/java/net/xcreen/restsms/fragments/HomeFragment.java +++ b/app/src/main/java/net/xcreen/restsms/fragments/HomeFragment.java @@ -85,11 +85,11 @@ public class HomeFragment extends Fragment { //Set Intent Intent serverIntent = new Intent(v.getContext(), ServerService.class); if(ServerService.isRunning) { - serverIntent.setAction("stop"); + serverIntent.setAction(ServerService.STOP_ACTION); ServerService.isRunning = false; } else{ - serverIntent.setAction("start"); + serverIntent.setAction(ServerService.START_ACTION); ServerService.isRunning = true; //Check if browser should be opened diff --git a/app/src/main/java/net/xcreen/restsms/server/ServerService.java b/app/src/main/java/net/xcreen/restsms/server/ServerService.java index 77f1564..3606c87 100644 --- a/app/src/main/java/net/xcreen/restsms/server/ServerService.java +++ b/app/src/main/java/net/xcreen/restsms/server/ServerService.java @@ -23,6 +23,8 @@ import androidx.core.app.NotificationCompat; public class ServerService extends Service { public static boolean isRunning = false; + public static final String START_ACTION = "start"; + public static final String STOP_ACTION = "stop"; AppContext appContext; @Override @@ -34,13 +36,13 @@ public class ServerService extends Service { @Override public int onStartCommand(Intent intent, int flags, int startId) { String intentAction = intent.getAction(); - if(intentAction != null && intentAction.equals("start")) { + if(intentAction != null && intentAction.equals(START_ACTION)) { //Check if Server is already running or in process if (!appContext.smsServer.isRunning() && !appContext.smsServer.isStopping()) { startService(); } } - else if(intentAction != null && intentAction.equals("stop")){ + else if(intentAction != null && intentAction.equals(STOP_ACTION)){ stopForeground(true); stopSelf(); } @@ -105,7 +107,7 @@ public class ServerService extends Service { finally { //Stop Service Intent serverIntent = new Intent(getApplicationContext(), ServerService.class); - serverIntent.setAction("stop"); + serverIntent.setAction(STOP_ACTION); startService(serverIntent); } }