Changeset f2a2d5

Timestamp:

Sep 9, 2018, 6:02:52 PM (4 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

d4e540

Parents:

13e2d2

Message:

moved reading of rdf to add AccountManager? observer

Location:

content

Files:

• vI_overlay.js (modified) (4 diffs)
• vI_upgrade.js (modified) (1 diff)

content/vI_overlay.js

@@ -28 +28 @@
 
     let Log = vI.setupLogging("virtualIdentity.overlay");
-
+    var rdfDatasource;
+    
     Components.utils.import("resource://v_identity/vI_rdfDatasource.js", virtualIdentityExtension);
     Components.utils.import("resource://v_identity/vI_account.js", virtualIdentityExtension);
@@ -39 +40 @@
       if (addon) {
         vI.extensionVersion = addon.version;
-        Log.debug("current version = " + vI.extensionVersion);
       }
     });
@@ -45 +45 @@
 
     function extensionInit() {
-      Log.debug("init")
-      vI.upgrade.quickUpgrade();
+      rdfDatasource = new vI.rdfDatasource(window, "virtualIdentity_0.10.rdf", false); // create this for upgrade and keep it to permanatly enable accountManager observer
+      vI.upgrade.quickUpgrade(rdfDatasource);
 
       if (vI.vIprefs.get("error_console")) {
@@ -59 +59 @@
 
     addEventListener('messagepane-loaded', extensionInit, true);
-    Log.debug("init rdfDatasource");
-    var rdfDatasource = vI.rdfDatasourceAccess(window);
-    Log.debug("init rdfDatasource done");
   }
 });

content/vI_upgrade.js

@@ -38 +38 @@
       rdfDatasource: null,
 
-      quickUpgrade: function (currentVersion) {
-        upgrade.rdfDatasource = new vI.rdfDatasource(window, "virtualIdentity_0.10.rdf", true);
+      quickUpgrade: function (rdfDatasource) {
+        upgrade.rdfDatasource = rdfDatasource;
         if (upgrade.rdfDatasource.extUpgradeRequired())
           upgrade.extUpgrade();
         upgrade.rdfDatasource.refreshAccountInfo();
-        upgrade.rdfDatasource.clean();
         return true;
       },