narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

fixed entity time for timezones with minutes !=0

Browse source
This commit is contained in:
Daniel Gultsch 2017-03-10 17:25:43 +01:00
parent 0b11d0f7f2
commit 09d68ae603
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/eu/siacs/conversations/generator/IqGenerator.java
View file

@ -15,6 +15,7 @@ import java.security.cert.CertificateEncodingException;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Set; import java.util.Set;
import java.util.TimeZone; import java.util.TimeZone;
import java.util.UUID; import java.util.UUID;
@ -77,9 +78,16 @@ public class IqGenerator extends AbstractGenerator {
time.addChild("utc").setContent(getTimestamp(now)); time.addChild("utc").setContent(getTimestamp(now));
TimeZone ourTimezone = TimeZone.getDefault(); TimeZone ourTimezone = TimeZone.getDefault();
long offsetSeconds = ourTimezone.getOffset(now) / 1000; long offsetSeconds = ourTimezone.getOffset(now) / 1000;
long offsetMinutes = offsetSeconds % (60 * 60); long offsetMinutes = Math.abs((offsetSeconds % 3600) / 60);
long offsetHours = offsetSeconds / (60 * 60); long offsetHours = offsetSeconds / 3600;
time.addChild("tzo").setContent(String.format("%02d",offsetHours)+":"+String.format("%02d",offsetMinutes)); String hours;
if (offsetHours<0) {
hours = String.format(Locale.US,"%03d",offsetHours);
} else {
hours = String.format(Locale.US,"%02d",offsetHours);
}
String minutes = String.format(Locale.US,"%02d",offsetMinutes);
time.addChild("tzo").setContent(hours+":"+minutes);
return packet; return packet;
} }