Merge pull request #298 from paolostivanin/fix296

Fix importing Aegis plain json
paolostivanin · Jun 14, 2023 · a8d0a17 · a8d0a17
2 parents 8f92e50 + 689b3dd
commit a8d0a17
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
-project(OTPClient VERSION "3.1.7" LANGUAGES "C")
+project(OTPClient VERSION "3.1.8" LANGUAGES "C")
 include(GNUInstallDirs)
 
 configure_file("src/common/version.h.in" "version.h")

diff --git a/data/com.github.paolostivanin.OTPClient.appdata.xml b/data/com.github.paolostivanin.OTPClient.appdata.xml
@@ -84,6 +84,14 @@
   </content_rating>
 
   <releases>
+    <release version="3.1.8" date="2023-06-14">
+      <description>
+        <p>OTPClient 3.1.8 brings a single fix</p>
+        <ul>
+          <li>Fix importing Aegis plain json</li>
+        </ul>
+      </description>
+    </release>
     <release version="3.1.7" date="2023-05-26">
       <description>
         <p>OTPClient 3.1.7 brings many fixes</p>

diff --git a/src/common/aegis.c b/src/common/aegis.c
@@ -53,7 +53,9 @@ get_otps_from_plain_backup (const gchar  *path,
         return NULL;
     }
 
-    GSList *otps = parse_json_data (json_string_value (json_object_get (json, "db")), err);
+    gchar *dumped_json = json_dumps(json_object_get (json, "db"), 0);
+    GSList *otps = parse_json_data (dumped_json, err);
+    gcry_free (dumped_json);
 
     return otps;
 }