Move storage into user directory and fix plugin search path

1 files changed, 6 insertions, 1 deletions

diff --git a/plugins/omemo/src/plugin.vala b/plugins/omemo/src/plugin.vala
index 04e02625..d3fee15d 100644
--- a/plugins/omemo/src/plugin.vala
+++ b/plugins/omemo/src/plugin.vala
@@ -9,10 +9,15 @@ public class Plugin : RootInterface, Object {
     public AccountSettingsEntry settings_entry;
 
     public void registered(Dino.Application app) {
+        // FIXME: Legacy import
+        if (FileUtils.test("omemo.db", FileTest.IS_REGULAR)) {
+            FileUtils.rename("omemo.db", Path.build_filename(Application.get_storage_dir(), "omemo.db"));
+        }
+
         try {
             context = new Signal.Context(false);
             this.app = app;
-            this.db = new Database("omemo.db");
+            this.db = new Database(Path.build_filename(Application.get_storage_dir(), "omemo.db"));
             this.list_entry = new EncryptionListEntry(this);
             this.settings_entry = new AccountSettingsEntry(this);
             this.app.plugin_registry.register_encryption_list_entry(list_entry);