sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use Conversations 1.x.y as user agent string in http upload and download

This commit is contained in:
Daniel Gultsch 2015-09-23 18:05:51 +02:00
parent 8d90b3fbf1
commit 5a5e0e7121
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
View File

@ -36,8 +36,8 @@ public abstract class AbstractGenerator {
"urn:xmpp:receipts" "urn:xmpp:receipts"
}; };
private String mVersion = null; private String mVersion = null;
public final String IDENTITY_NAME = "Conversations"; protected final String IDENTITY_NAME = "Conversations";
public final String IDENTITY_TYPE = "phone"; protected final String IDENTITY_TYPE = "phone";
private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US); private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
@ -54,7 +54,7 @@ public abstract class AbstractGenerator {
return this.mVersion; return this.mVersion;
} }
protected String getIdentityName() { public String getIdentityName() {
return IDENTITY_NAME + " " + getIdentityVersion(); return IDENTITY_NAME + " " + getIdentityVersion();
} }

2
src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
View File

@ -181,6 +181,7 @@ public class HttpDownloadConnection implements Transferable {
changeStatus(STATUS_CHECKING); changeStatus(STATUS_CHECKING);
HttpURLConnection connection = (HttpURLConnection) mUrl.openConnection(); HttpURLConnection connection = (HttpURLConnection) mUrl.openConnection();
connection.setRequestMethod("HEAD"); connection.setRequestMethod("HEAD");
connection.setRequestProperty("User-Agent", mXmppConnectionService.getIqGenerator().getIdentityName());
if (connection instanceof HttpsURLConnection) { if (connection instanceof HttpsURLConnection) {
mHttpConnectionManager.setupTrustManager((HttpsURLConnection) connection, interactive); mHttpConnectionManager.setupTrustManager((HttpsURLConnection) connection, interactive);
} }
@ -236,6 +237,7 @@ public class HttpDownloadConnection implements Transferable {
if (connection instanceof HttpsURLConnection) { if (connection instanceof HttpsURLConnection) {
mHttpConnectionManager.setupTrustManager((HttpsURLConnection) connection, interactive); mHttpConnectionManager.setupTrustManager((HttpsURLConnection) connection, interactive);
} }
connection.setRequestProperty("User-Agent",mXmppConnectionService.getIqGenerator().getIdentityName());
connection.connect(); connection.connect();
is = new BufferedInputStream(connection.getInputStream()); is = new BufferedInputStream(connection.getInputStream());
file.getParentFile().mkdirs(); file.getParentFile().mkdirs();

1
src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
View File

@ -165,6 +165,7 @@ public class HttpUploadConnection implements Transferable {
connection.setRequestMethod("PUT"); connection.setRequestMethod("PUT");
connection.setFixedLengthStreamingMode((int) file.getExpectedSize()); connection.setFixedLengthStreamingMode((int) file.getExpectedSize());
connection.setRequestProperty("Content-Type", mime == null ? "application/octet-stream" : mime); connection.setRequestProperty("Content-Type", mime == null ? "application/octet-stream" : mime);
connection.setRequestProperty("User-Agent",mXmppConnectionService.getIqGenerator().getIdentityName());
connection.setDoOutput(true); connection.setDoOutput(true);
connection.connect(); connection.connect();
os = connection.getOutputStream(); os = connection.getOutputStream();