to manage OperationManagerService

app/src/main/java/foundation/e/drive/services/ObserverService.java

@@ -137,13 +137,6 @@ public class ObserverService extends Service implements OnRemoteOperationListene
         //check OperationManagerService isn't working
         if (prefs.getBoolean(AppConstants.KEY_OMS_IS_WORKING, false)) {
             Log.w(TAG, "OperationManagerService is still performing some operation");
-
-            getApplicationContext().stopService(new Intent(getApplicationContext(), OperationManagerService.class));
-
-            startOperationManagerService();
-
-
-            //return super.onStartCommand(intent, flags, startId);
         }
 
         //Check a minimum delay has been respected between two start.
@@ -345,8 +338,14 @@ public class ObserverService extends Service implements OnRemoteOperationListene
 
             //After everything has been scanned. Send Intent to OperationmanagerService with data in bundle
             if (operationsForIntent != null && !operationsForIntent.isEmpty()) {
+                Intent OMSIntent = new Intent(this, OperationManagerService.class);
+                for (Map.Entry<Integer, Parcelable> entry : operationsForIntent.entrySet()) {
+                    OMSIntent.putExtra(entry.getKey() + "", entry.getValue());
+                }
+
+                OMSIntent.putExtra("account", mAccount);
+                startService(OMSIntent);
 
-                startOperationManagerService();
 
 
             } else {
@@ -363,15 +362,7 @@ public class ObserverService extends Service implements OnRemoteOperationListene
         }
     }
 
-    private void startOperationManagerService() {
-        Intent OMSIntent = new Intent(this, OperationManagerService.class);
-        for (Map.Entry<Integer, Parcelable> entry : operationsForIntent.entrySet()) {
-            OMSIntent.putExtra(entry.getKey() + "", entry.getValue());
-        }
 
-        OMSIntent.putExtra("account", mAccount);
-        startService(OMSIntent);
-    }
 
     /**
      * Method to get Id of SyncedFolder to scan