From fdf8da1f32837a1efee23ba8799ecdb162d67c08 Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Wed, 27 Dec 2017 23:23:05 +0100
Subject: [PATCH] Pretty print the json of the database if it's exported in
 plain text

---
 app/src/main/java/me/impy/aegis/db/Database.java        | 7 ++++++-
 app/src/main/java/me/impy/aegis/db/DatabaseManager.java | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/me/impy/aegis/db/Database.java b/app/src/main/java/me/impy/aegis/db/Database.java
index 5ecb4bc6..0b061057 100644
--- a/app/src/main/java/me/impy/aegis/db/Database.java
+++ b/app/src/main/java/me/impy/aegis/db/Database.java
@@ -14,6 +14,10 @@ public class Database {
     private long _counter = 0;
 
     public byte[] serialize() throws Exception {
+        return serialize(false);
+    }
+
+    public byte[] serialize(boolean pretty) throws Exception {
         JSONArray array = new JSONArray();
         for (DatabaseEntry e : _entries) {
             array.put(e.serialize());
@@ -23,7 +27,8 @@ public class Database {
         obj.put("version", VERSION);
         obj.put("entries", array);
 
-        return obj.toString().getBytes("UTF-8");
+        String string = pretty ? obj.toString(4) : obj.toString();
+        return string.getBytes("UTF-8");
     }
 
     public void deserialize(byte[] data) throws Exception {
diff --git a/app/src/main/java/me/impy/aegis/db/DatabaseManager.java b/app/src/main/java/me/impy/aegis/db/DatabaseManager.java
index 02cfe27a..d48c14c6 100644
--- a/app/src/main/java/me/impy/aegis/db/DatabaseManager.java
+++ b/app/src/main/java/me/impy/aegis/db/DatabaseManager.java
@@ -111,7 +111,7 @@ public class DatabaseManager {
 
     public String export(boolean encrypt) throws Exception {
         assertState(false, true);
-        byte[] bytes = _db.serialize();
+        byte[] bytes = _db.serialize(!encrypt);
         encrypt = encrypt && getFile().isEncrypted();
         if (encrypt) {
             CryptResult result = _key.encrypt(bytes);