Fixes for asynchronous writing of useragents.xml in UserAgentSwitcher…

…Importer.reset()
keithbowes · Sep 2, 2017 · ac83801 · ac83801
1 parent 44992e2
commit ac83801
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/chrome/content/useragentswitcher/useragentswitcher.js b/chrome/content/useragentswitcher/useragentswitcher.js
@@ -139,8 +139,8 @@ var UserAgentSwitcher =
 		{
 			var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
 
-			UserAgentSwitcherImporter.installUserAgents();
-			UserAgentSwitcherImporter.import(UserAgentSwitcherImporter.importTypeMenu, UserAgentSwitcherImporter.getUserAgentFileLocation(), true);
+			if (!UserAgentSwitcherImporter.installUserAgents())
+				UserAgentSwitcherImporter.import(UserAgentSwitcherImporter.importTypeMenu, UserAgentSwitcherImporter.getUserAgentFileLocation(), true);
 
 			// If the observer service is set
 			if(observerService)

diff --git a/chrome/content/useragentswitcher/xml/import.js b/chrome/content/useragentswitcher/xml/import.js
@@ -434,22 +434,25 @@ var UserAgentSwitcherImporter =
 		}
 	},
 
-	   // Installs the user agents
-	   installUserAgents: function()
-	   {
-			   // If the user agent directory does not exist
-			   if(!this.getUserAgentDirectoryLocation().exists())
-			   {
-					   this.createUserAgentDirectory();
-			   }
-
-			   // If the user agent file does not exist
-			   if(!this.getUserAgentFileLocation().exists())
-			   {
-					   this.createUserAgentFile();
-					   this.reset();
-			   }
-	   },
+	// Installs the user agents
+	installUserAgents: function()
+	{
+		// If the user agent directory does not exist
+		if(!this.getUserAgentDirectoryLocation().exists())
+		{
+			this.createUserAgentDirectory();
+		}
+
+		// If the user agent file does not exist
+		if(!this.getUserAgentFileLocation().exists())
+		{
+			this.createUserAgentFile();
+			this.reset();
+			return true;
+		}
+
+		return false;
+	},
 
 	// Populates a user agent
 	populateUserAgent: function(userAgent, userAgentElement)
@@ -575,6 +578,7 @@ var UserAgentSwitcherImporter =
 			var outputStream = FileUtils.openFileOutputStream(userAgentFile, FileUtils.RDWR | FileUtils.MODE_TRUNCATE | FileUtils.PERMS_FILE);
 			outputStream.write(request.responseText, request.responseText.length);
 			outputStream.close();
+			UserAgentSwitcherImporter.import(UserAgentSwitcherImporter.importTypeMenu, UserAgentSwitcherImporter.getUserAgentFileLocation(), true);
 		}
 
 		request.send();