fix(apps): implement thread manager

Signed-off-by: Rafa Hernandez <[email protected]>
flyve-mdm · Oct 3, 2018 · abb3f3a · abb3f3a
1 parent ce00727
commit abb3f3a
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/app/src/main/java/org/flyve/mdm/agent/utils/AppThreadManager.java b/app/src/main/java/org/flyve/mdm/agent/utils/AppThreadManager.java
@@ -98,7 +98,6 @@ public void process(Context context) {
                 String versionCode = jsonObj.getString("versionCode");
                 String taskId = jsonObj.getString("taskId");
 
-<<<<<<< HEAD
                 ApplicationData apps = new ApplicationData(context);
                 Application[] appsArray = apps.getApplicationsById(id);
 
@@ -117,13 +116,6 @@ public void process(Context context) {
                 }
             } catch (Exception ex) {
                 FlyveLog.e(ex.getMessage());
-=======
-                // execute the policy
-                PoliciesController policiesController = new PoliciesController(context, this.client);
-                policiesController.installPackage(deployApp, id, versionCode, taskId);
-            } catch (Exception ex) {
-                FlyveLog.e("");
->>>>>>> d8b9c459... fix(apps): add thread manager
             }
         }
     }