wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use XmlSerializer instead of writing XML tags manually

Browse source
This commit is contained in:
cketti 2011-03-29 05:27:18 +02:00
parent 9a78145e22
commit c36182f586
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/com/fsck/k9/preferences/StorageExporter.java
View file

@ -4,16 +4,16 @@ import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.xmlpull.v1.XmlSerializer;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Environment; import android.os.Environment;
import android.util.Log; import android.util.Log;
import android.util.Xml;
import com.fsck.k9.Account; import com.fsck.k9.Account;
import com.fsck.k9.K9; import com.fsck.k9.K9;
@ -61,12 +61,17 @@ public class StorageExporter {
} }
try { try {
OutputStreamWriter sw = new OutputStreamWriter(os); XmlSerializer serializer = Xml.newSerializer();
PrintWriter pf = new PrintWriter(sw); serializer.setOutput(os, "UTF-8");
pf.println("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
pf.println("<k9settings version=\"" + 1 + "\">"); serializer.startDocument(null, Boolean.valueOf(true));
pf.flush();
// Output with indentation
serializer.setFeature("http://xmlpull.org/v1/doc/features.html#indent-output", true);
// Root tag
serializer.startTag(null, "k9settings");
serializer.attribute(null, "version", "1");
Log.i(K9.LOG_TAG, "Exporting preferences"); Log.i(K9.LOG_TAG, "Exporting preferences");
K9Krypto krypto = new K9Krypto(encryptionKey, K9Krypto.MODE.ENCRYPT); K9Krypto krypto = new K9Krypto(encryptionKey, K9Krypto.MODE.ENCRYPT);
@ -105,17 +110,17 @@ public class StorageExporter {
String valueEnc = krypto.encrypt(value); String valueEnc = krypto.encrypt(value);
String output = keyEnc + ":" + valueEnc; String output = keyEnc + ":" + valueEnc;
//Log.i(K9.LOG_TAG, "For key " + key + ", output is " + output); //Log.i(K9.LOG_TAG, "For key " + key + ", output is " + output);
pf.println(output); serializer.text(output + "\n");
keysExported++; keysExported++;
} }
pf.flush();
Log.i(K9.LOG_TAG, "Exported " + keysExported + " of " + keysEvaluated + " settings."); Log.i(K9.LOG_TAG, "Exported " + keysExported + " of " + keysEvaluated + " settings.");
pf.println("</k9settings>"); serializer.endTag(null, "k9settings");
pf.flush(); serializer.endDocument();
serializer.flush();
} catch (Exception e) { } catch (Exception e) {
throw new StorageImportExportException(e.getLocalizedMessage(), e); throw new StorageImportExportException(e.getLocalizedMessage(), e);
} }