Avoid starting service twice

Author: devgianlu

app/src/main/java/com/gianlu/aria2android/Aria2/BinService.java

@@ -20,7 +20,6 @@
 import android.os.Messenger;
 
 import com.gianlu.aria2android.BinUtils;
-import com.gianlu.aria2android.BuildConfig;
 import com.gianlu.aria2android.MainActivity;
 import com.gianlu.aria2android.PK;
 import com.gianlu.aria2android.R;
@@ -54,6 +53,11 @@ public class BinService extends Service implements StreamListener.Listener {
     private ShortcutManager shortcutManager;
 
     private void startBin(@NonNull StartConfig config) {
+        if (process != null) {
+            dispatchBroadcast(Action.SERVER_START, null, null);
+            return;
+        }
+
         String cmd = BinUtils.createCommandLine(this, config);
         try {
             process = Runtime.getRuntime().exec(cmd);
@@ -96,11 +100,13 @@ private void startBin(@NonNull StartConfig config) {
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        if (Objects.equals(intent.getAction(), ACTION_START_SERVICE)) {
-            startBin((StartConfig) intent.getSerializableExtra("config"));
-            return super.onStartCommand(intent, flags, startId);
-        } else if (Objects.equals(intent.getAction(), ACTION_STOP_SERVICE)) {
-            stopBin();
+        if (intent != null) {
+            if (Objects.equals(intent.getAction(), ACTION_START_SERVICE)) {
+                startBin((StartConfig) intent.getSerializableExtra("config"));
+                return super.onStartCommand(intent, flags, startId);
+            } else if (Objects.equals(intent.getAction(), ACTION_STOP_SERVICE)) {
+                stopBin();
+            }
         }
 
         stopSelf();
@@ -209,8 +215,6 @@ public void onTerminated() {
 
     @Override
     public void unknownLogLine(@NonNull String line) {
-        if (BuildConfig.DEBUG) System.out.println("UNKNOWN LINE: " + line);
-
         Bundle bundle = new Bundle();
         bundle.putString(Utils.LABEL_LOG_LINE, line);
         AnalyticsApplication.sendAnalytics(Utils.EVENT_UNKNOWN_LOG_LINE, bundle);

app/src/main/java/com/gianlu/aria2android/MainActivity.java

@@ -82,6 +82,7 @@ public void onServiceDisconnected(ComponentName componentName) {
     private MaterialPreferenceCategory notificationsCategory;
     private LinearLayout logsContainer;
     private MessageView logsMessage;
+    private LocalBroadcastManager broadcastManager;
 
     private static boolean isARM() {
         for (String abi : Build.SUPPORTED_ABIS)
@@ -114,8 +115,8 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                 Uri uri = data.getData();
                 if (uri != null) {
                     outputPath.setValue(FileUtil.getFullPathFromTreeUri(uri, this));
-                    int takeFlags = data.getFlags() & (Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
-                    getContentResolver().takePersistableUriPermission(uri, takeFlags);
+                    getContentResolver().takePersistableUriPermission(uri,
+                            data.getFlags() & (Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION));
                 }
             }
         } else {
@@ -166,6 +167,7 @@ protected void onCreate(Bundle savedInstanceState) {
         }
 
         setContentView(R.layout.activity_main);
+        broadcastManager = LocalBroadcastManager.getInstance(this);
 
         MaterialPreferences.instance().setUserInputModule(new LovelyInput.Builder()
                 .addIcon(PK.OUTPUT_DIRECTORY.key(), R.drawable.baseline_folder_24)
@@ -416,7 +418,7 @@ public void askRationale(@NonNull AlertDialog.Builder builder) {
             filter.addAction(action.toString());
 
         receiver = new ServiceBroadcastReceiver();
-        LocalBroadcastManager.getInstance(this).registerReceiver(receiver, filter);
+        broadcastManager.registerReceiver(receiver, filter);
         try {
             bindService(new Intent(this, BinService.class), serviceConnection, BIND_AUTO_CREATE);
             startService(new Intent(this, BinService.class)
@@ -425,7 +427,7 @@ public void askRationale(@NonNull AlertDialog.Builder builder) {
             return true;
         } catch (JSONException ex) {
             Toaster.with(this).message(R.string.failedLoadingOptions).ex(ex).show();
-            LocalBroadcastManager.getInstance(this).unregisterReceiver(receiver);
+            broadcastManager.unregisterReceiver(receiver);
             return false;
         } /*catch (RemoteException ex) {
             Toaster.with(this).message(R.string.failedStarting).ex(ex).show();
@@ -463,6 +465,8 @@ private boolean stopService() {
         startService(new Intent(this, BinService.class)
                 .setAction(BinService.ACTION_STOP_SERVICE));
 
+        broadcastManager.unregisterReceiver(receiver);
+
         Bundle bundle = null;
         if (Prefs.getLong(PK.CURRENT_SESSION_START, -1) != -1) {
             bundle = new Bundle();
@@ -471,7 +475,6 @@ private boolean stopService() {
         }
 
         AnalyticsApplication.sendAnalytics(Utils.ACTION_TURN_OFF, bundle);
-
         return true;
     }
 
@@ -576,15 +579,14 @@ public void onReceive(Context context, final Intent intent) {
                 runOnUiThread(() -> {
                     switch (action) {
                         case SERVER_STATUS:
-                            System.out.println("UPDATE!!");
-                            updateUiStatus(intent.getBooleanExtra("on", false));
+                            updateUiStatus(intent.getBooleanExtra("on", false)); // FIXME: UI changes are not applied
                             break;
                         case SERVER_START:
                             addLog(new Logging.LogLine(Logging.LogLine.Type.INFO, getString(R.string.serverStarted)));
                             break;
                         case SERVER_STOP:
                             addLog(new Logging.LogLine(Logging.LogLine.Type.INFO, getString(R.string.serverStopped)));
-                            LocalBroadcastManager.getInstance(MainActivity.this).unregisterReceiver(receiver);
+                            broadcastManager.unregisterReceiver(receiver);
                             updateUiStatus(false);
                             break;
                         case SERVER_EX: