empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Replace XML serializer in plaintext export

Browse source 
Fixes #342

- using regex pattern/matcher to escape chars below 0x0020 and
  above 0xd7ff
- using String.Replace to escape XML entities
- changed XmlPullParser from Xml.newPullParser() to
  XmlPullParserFactory parser to fix import on GB
This commit is contained in:
McLoo 2014-04-15 15:19:10 +02:00 • committed by Moxie Marlinspike
parent 8f85eb1822
commit d429f9113b
1 changed files with 75 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
src/org/thoughtcrime/securesms/database/XmlBackup.java
View file

@ -1,17 +1,17 @@
package org.thoughtcrime.securesms.database; package org.thoughtcrime.securesms.database;
import android.util.Log; import org.whispersystems.textsecure.util.Util;
import android.util.Xml;
import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlSerializer; import org.xmlpull.v1.XmlPullParserFactory;
import java.io.BufferedWriter; import java.io.BufferedWriter;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class XmlBackup { public class XmlBackup {
@ -24,11 +24,14 @@ public class XmlBackup {
private static final String SERVICE_CENTER = "service_center"; private static final String SERVICE_CENTER = "service_center";
private static final String READ = "read"; private static final String READ = "read";
private static final String STATUS = "status"; private static final String STATUS = "status";
private static final String TOA = "toa";
private static final String SC_TOA = "sc_toa";
private static final String LOCKED = "locked";
private final XmlPullParser parser; private final XmlPullParser parser;
public XmlBackup(String path) throws XmlPullParserException, FileNotFoundException { public XmlBackup(String path) throws XmlPullParserException, FileNotFoundException {
this.parser = Xml.newPullParser(); this.parser = XmlPullParserFactory.newInstance().newPullParser();
parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false); parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false);
parser.setInput(new FileInputStream(path), null); parser.setInput(new FileInputStream(path), null);
} }
@ -41,7 +44,7 @@ public class XmlBackup {
String name = parser.getName(); String name = parser.getName();
if (!name.equals("sms")) { if (!name.equalsIgnoreCase("sms")) {
continue; continue;
} }
@ -139,46 +142,81 @@ public class XmlBackup {
public static class Writer { public static class Writer {
private BufferedWriter writer; private static final String XML_HEADER = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?>";
private XmlSerializer serializer; private static final String CREATED_BY = "<!-- File Created By TextSecure -->";
private static final String OPEN_TAG_SMSES = "<smses count=\"%d\">";
private static final String CLOSE_TAG_SMSES = "</smses>";
private static final String OPEN_TAG_SMS = " <sms ";
private static final String CLOSE_EMPTYTAG = "/>";
private static final String OPEN_ATTRIBUTE = "=\"";
private static final String CLOSE_ATTRIBUTE = "\" ";
private static final Pattern PATTERN = Pattern.compile("[^\u0020-\uD7FF]");
private final BufferedWriter bufferedWriter;
public Writer(String path, int count) throws IOException { public Writer(String path, int count) throws IOException {
this.writer = new BufferedWriter(new FileWriter(path)); bufferedWriter = new BufferedWriter(new FileWriter(path, false));
this.serializer = Xml.newSerializer();
this.serializer.setOutput(writer); bufferedWriter.write(XML_HEADER);
this.serializer.setFeature("http://xmlpull.org/v1/doc/features.html#indent-output", true); bufferedWriter.newLine();
this.serializer.startDocument("UTF-8", true); bufferedWriter.write(CREATED_BY);
this.serializer.startTag("", "smses"); bufferedWriter.newLine();
this.serializer.attribute("", "count", count+""); bufferedWriter.write(String.format(OPEN_TAG_SMSES, count));
} }
public void writeItem(XmlBackupItem item) throws IOException { public void writeItem(XmlBackupItem item) throws IOException {
this.serializer.startTag("", "sms"); StringBuilder stringBuilder = new StringBuilder();
this.serializer.attribute("", "protocol", item.getProtocol() + "");
this.serializer.attribute("", "address", item.getAddress()); stringBuilder.append(OPEN_TAG_SMS);
this.serializer.attribute("", "date", item.getDate()+""); appendAttribute(stringBuilder, PROTOCOL, item.getProtocol());
this.serializer.attribute("", "type", item.getType()+""); appendAttribute(stringBuilder, ADDRESS, escapeXML(item.getAddress()));
this.serializer.attribute("", "subject", item.getSubject()+""); appendAttribute(stringBuilder, DATE, item.getDate());
try { appendAttribute(stringBuilder, TYPE, item.getType());
this.serializer.attribute("", "body", item.getBody()+""); appendAttribute(stringBuilder, SUBJECT, escapeXML(item.getSubject()));
} catch (IllegalArgumentException ise) { appendAttribute(stringBuilder, BODY, escapeXML(item.getBody()));
// XXX - Fucking Android. Their serializer includes a bug that doesn't appendAttribute(stringBuilder, TOA, "null");
// handle some unicode characters correctly. appendAttribute(stringBuilder, SC_TOA, "null");
Log.w("XmlBackup", ise); appendAttribute(stringBuilder, SERVICE_CENTER, item.getServiceCenter());
appendAttribute(stringBuilder, READ, item.getRead());
appendAttribute(stringBuilder, STATUS, item.getStatus());
appendAttribute(stringBuilder, LOCKED, 0);
stringBuilder.append(CLOSE_EMPTYTAG);
bufferedWriter.newLine();
bufferedWriter.write(stringBuilder.toString());
} }
this.serializer.attribute("", "toa", null+"");
this.serializer.attribute("", "sc_toa", null+""); private <T> void appendAttribute(StringBuilder stringBuilder, String name, T value) {
this.serializer.attribute("", "service_center", item.getServiceCenter()+""); stringBuilder.append(name).append(OPEN_ATTRIBUTE).append(value).append(CLOSE_ATTRIBUTE);
this.serializer.attribute("", "read", item.getRead()+"");
this.serializer.attribute("" , "status", item.getStatus()+"");
this.serializer.attribute("", "locked", "0");
this.serializer.endTag("", "sms");
} }
public void close() throws IOException { public void close() throws IOException {
this.serializer.endTag("", "smses"); bufferedWriter.newLine();
this.serializer.endDocument(); bufferedWriter.write(CLOSE_TAG_SMSES);
} bufferedWriter.close();
}
private String escapeXML(String s) {
if (Util.isEmpty(s)) return s;
Matcher matcher = PATTERN.matcher( s.replace("&", "&amp;")
.replace("<", "&lt;")
.replace(">", "&gt;")
.replace("\"", "&quot;")
.replace("'", "&apos;"));
StringBuffer st = new StringBuffer();
while (matcher.find()) {
String escaped="";
for (char ch: matcher.group(0).toCharArray()) {
escaped += ("&#" + ((int) ch) + ";");
}
matcher.appendReplacement(st, escaped);
}
matcher.appendTail(st);
return st.toString();
}
} }
} }