aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-07-02 13:11:29 +0200
committerChristian Schneppe <christian@pix-art.de>2016-07-02 13:11:29 +0200
commit165a00c6172f38025386b61692324b58eed0b046 (patch)
treef9a86ce0c931c12acdfe3945d534e9153fedccba /src/main/java/eu/siacs/conversations/services
parentf14380ca53948784d3c8397d8eee882742fc1520 (diff)
some little updater changes and code cleanup
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/services/CheckAppVersionService.java3
-rw-r--r--src/main/java/eu/siacs/conversations/services/UpdaterWebService.java7
2 files changed, 3 insertions, 7 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/CheckAppVersionService.java b/src/main/java/eu/siacs/conversations/services/CheckAppVersionService.java
index dc57745f1..52962a314 100644
--- a/src/main/java/eu/siacs/conversations/services/CheckAppVersionService.java
+++ b/src/main/java/eu/siacs/conversations/services/CheckAppVersionService.java
@@ -33,11 +33,10 @@ public class CheckAppVersionService extends HttpServlet {
myObj.addProperty("success", false);
myObj.addProperty("latestVersionCode", 2);
myObj.addProperty("latestVersion", "1.0.0");
+ myObj.addProperty("changelog", "");
myObj.addProperty("filesize", "");
myObj.addProperty("appURI", "");
out.println(myObj.toString());
out.close();
-
}
-
}
diff --git a/src/main/java/eu/siacs/conversations/services/UpdaterWebService.java b/src/main/java/eu/siacs/conversations/services/UpdaterWebService.java
index d7044d73a..dbeaee2b8 100644
--- a/src/main/java/eu/siacs/conversations/services/UpdaterWebService.java
+++ b/src/main/java/eu/siacs/conversations/services/UpdaterWebService.java
@@ -29,8 +29,8 @@ public class UpdaterWebService extends IntentService {
public static final String RESPONSE_MESSAGE = "";
private String URL = null;
- public static final int REGISTRATION_TIMEOUT = 3 * 1000;
- public static final int WAIT_TIMEOUT = 30 * 1000;
+ public static final int REGISTRATION_TIMEOUT = Config.SOCKET_TIMEOUT;
+ public static final int WAIT_TIMEOUT = Config.CONNECT_TIMEOUT;
public UpdaterWebService() {
super("UpdaterWebService");
@@ -89,14 +89,11 @@ public class UpdaterWebService extends IntentService {
responseMessage = "";
}
-
Intent broadcastIntent = new Intent();
broadcastIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
broadcastIntent.setAction(UpdateReceiver.PROCESS_RESPONSE);
broadcastIntent.addCategory(Intent.CATEGORY_DEFAULT);
broadcastIntent.putExtra(RESPONSE_MESSAGE, responseMessage);
sendBroadcast(broadcastIntent);
-
}
-
} \ No newline at end of file