Skip to content

Commit 1e5a8c8

Browse files
committed
Fix timeNextReport
Fix timeNextReport
1 parent 1881762 commit 1e5a8c8

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

app/src/main/java/com/prey/PreyConfig.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1789,10 +1789,14 @@ public void setOrganizationId(String organizationId) {
17891789
public void setTimeNextReport() {
17901790
Calendar cal = Calendar.getInstance();
17911791
cal.setTime(new Date());
1792-
cal.add(Calendar.MINUTE, 2);
1792+
cal.add(Calendar.SECOND, 100);
17931793
saveLong(TIME_NEXT_REPORT, cal.getTimeInMillis());
17941794
}
17951795

1796+
public void removeTimeNextReport() {
1797+
saveLong(TIME_NEXT_REPORT, 0);
1798+
}
1799+
17961800
/**
17971801
* Method that returns if it should request report
17981802
*
@@ -1804,7 +1808,7 @@ public boolean isTimeNextReport() {
18041808
if (timeNextReport == 0)
18051809
return true;
18061810
long timeNow = new Date().getTime();
1807-
return timeNow < timeNextReport;
1811+
return timeNow > timeNextReport;
18081812
}
18091813

18101814
}

app/src/main/java/com/prey/actions/report/ReportService.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,9 @@ public List<HttpDataService> run(Context ctx) {
141141
if (response != null) {
142142
PreyConfig.getPreyConfig(ctx).setLastEvent("report_send");
143143
PreyLogger.d(String.format("REPORT response.getStatusCode():%s", response.getStatusCode()));
144-
PreyConfig.getPreyConfig(ctx).setTimeNextReport();
144+
if (200 == response.getStatusCode() || 201 == response.getStatusCode()) {
145+
PreyConfig.getPreyConfig(ctx).setTimeNextReport();
146+
}
145147
// Check if the response status code is 409 (Conflict)
146148
if (409 == response.getStatusCode()) {
147149
// Reset the report schedule

app/src/main/java/com/prey/json/actions/Report.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ public void get(Context ctx, List<ActionResult> list, JSONObject parameters) {
6464
}
6565
PreyConfig.getPreyConfig(ctx).setIntervalReport("" + interval);
6666
PreyConfig.getPreyConfig(ctx).setExcludeReport(exclude);
67+
PreyConfig.getPreyConfig(ctx).removeTimeNextReport();
6768
PreyWebServices.getInstance().sendNotifyActionResultPreyHttp(ctx,"processed", messageId, UtilJson.makeMapParam("get", "report", "started",reason));
6869
PreyLogger.d("________start ReportScheduled");
6970
ReportScheduled.getInstance(ctx).run();

0 commit comments

Comments
 (0)