Merge pull request #124 from prey/support-android-7

Fix, event stopped wipe
prey · Mar 31, 2017 · bec59a9 · bec59a9
2 parents 537ec17 + 3939247
commit bec59a9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/app/src/main/java/com/prey/actions/observer/ActionsController.java b/app/src/main/java/com/prey/actions/observer/ActionsController.java
@@ -105,6 +105,11 @@ public List<HttpDataService> runActionJson(Context ctx, List<JSONObject> jsonObj
         try {
             for(int i=0;jsonObjectList!=null&&i<jsonObjectList.size();i++){
                 JSONObject jsonObject=jsonObjectList.get(i);
+                try {
+                    jsonObject = jsonObject.getJSONObject("cmd");
+                }catch(Exception e){
+
+                }
                 PreyLogger.d("jsonObject:"+jsonObject);
                 String nameAction = jsonObject.getString("target");
                 String methodAction = jsonObject.getString("command");

diff --git a/app/src/main/java/com/prey/actions/wipe/WipeThread.java b/app/src/main/java/com/prey/actions/wipe/WipeThread.java
@@ -34,22 +34,23 @@ public void run() {
         try{
             if(deleteSD){
                 WipeUtil.deleteSD();
+                if(!wipe){
+                    PreyWebServices.getInstance().sendNotifyActionResultPreyHttp(ctx, UtilJson.makeMapParam("start","wipe","stopped",null));
+                }
             }
         }catch(Exception e){
+            PreyWebServices.getInstance().sendNotifyActionResultPreyHttp(ctx, UtilJson.makeMapParam("start","wipe","failed",e.getMessage()));
+            PreyLogger.e("Error Wipe:"+e.getMessage(), e);
         }
         try{
             if (wipe&&preyConfig.isFroyoOrAbove()){
                 PreyLogger.d("Wiping the device!!");
+                PreyWebServices.getInstance().sendNotifyActionResultPreyHttp(ctx, UtilJson.makeMapParam("start","wipe","stopped",null));
                 FroyoSupport.getInstance(ctx).wipe();
             }
-        }catch(Exception e){
-            PreyLogger.e("Error Wipe1:"+e.getMessage(), e);
-        }
-        try{
-            PreyWebServices.getInstance().sendNotifyActionResultPreyHttp(ctx, UtilJson.makeMapParam("start","wipe","stopped",null));
         }catch(Exception e){
             PreyWebServices.getInstance().sendNotifyActionResultPreyHttp(ctx, UtilJson.makeMapParam("start","wipe","failed",e.getMessage()));
-            PreyLogger.e("Error Wipe2:"+e.getMessage(), e);
+            PreyLogger.e("Error Wipe:"+e.getMessage(), e);
         }
     }