fix incompatibility with FossaMail 38.2

lieser · Mar 31, 2018 · 109736b · 109736b
1 parent 2df75bd
commit 109736b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,7 @@
+1.7.1 [2018-03-31]
+------------------
+ - fix incompatibility with FossaMail 38.2
+
 1.7.0 [2017-07-22]
 ------------------
  - libunbound resolver: added ability to specify multiple trust anchors

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2016 Philippe Lieser
+Copyright (c) 2013-2018 Philippe Lieser
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/install.rdf b/install.rdf
@@ -6,7 +6,7 @@
 	<Description about="urn:mozilla:install-manifest">
 		<em:id>dkim_verifier@pl</em:id>
 		<em:type>2</em:type> <!-- Extensions -->
-		<em:version>1.7.0</em:version>
+		<em:version>1.7.1</em:version>
 
 		<em:name>DKIM Verifier</em:name>
 		<em:description>Verifies the DKIM-Signature of an e-mail.</em:description>

diff --git a/modules/ModuleGetter.jsm b/modules/ModuleGetter.jsm
@@ -1,9 +1,9 @@
 /*
  * ModuleGetter.jsm
  *
- * Version: 1.0.1 (10 November 2016)
+ * Version: 1.0.2 (31 March 2018)
  *
- * Copyright (c) 2013-2016 Philippe Lieser
+ * Copyright (c) 2013-2018 Philippe Lieser
  *
  * This software is licensed under the terms of the MIT License.
  *
@@ -44,7 +44,9 @@ var ModuleGetter = {
 			try {
 				var temp = {};
 
-				if (Services.vc.compare(Services.appinfo.platformVersion, "24.0-1") >= 0) {
+				if (Services.vc.compare(Services.appinfo.platformVersion, "24.0-1") >= 0 ||
+					Services.appinfo.name == "FossaMail")
+				{
 					Cu.import("resource://services-common/utils.js", temp);
 				} else {
 					Cu.import("resource://dkim_verifier/mozilla/utils.js", temp);
@@ -72,7 +74,9 @@ var ModuleGetter = {
 			try {
 				var temp = {};
 
-				if (Services.vc.compare(Services.appinfo.platformVersion, "27.0-1") >= 0) {
+				if (Services.vc.compare(Services.appinfo.platformVersion, "27.0-1") >= 0 ||
+					Services.appinfo.name == "FossaMail")
+				{
 					Cu.import("resource://gre/modules/Log.jsm", temp);
 				} else if (Services.vc.compare(Services.appinfo.platformVersion, "24.0-1") >= 0) {
 					Cu.import("resource://services-common/log4moz.js", temp);
@@ -109,7 +113,9 @@ var ModuleGetter = {
 			try {
 				var temp = {};
 
-				if (Services.vc.compare(Services.appinfo.platformVersion, "24.0-1") >= 0) {
+				if (Services.vc.compare(Services.appinfo.platformVersion, "24.0-1") >= 0 ||
+					Services.appinfo.name == "FossaMail")
+				{
 					Cu.import("resource://gre/modules/osfile.jsm", temp);
 				} else {
 					if (Services.appinfo.OS === "WINNT") {
@@ -143,7 +149,9 @@ var ModuleGetter = {
 			try {
 				var temp = {};
 
-				if (Services.vc.compare(Services.appinfo.platformVersion, "24.0-1") >= 0) {
+				if (Services.vc.compare(Services.appinfo.platformVersion, "24.0-1") >= 0 ||
+					Services.appinfo.name == "FossaMail")
+				{
 					Cu.import("resource://gre/modules/Promise.jsm", temp);
 				} else {
 					Cu.import("resource://gre/modules/commonjs/promise/core.js", temp);
@@ -170,7 +178,9 @@ var ModuleGetter = {
 			try {
 				var temp = {};
 
-				if (Services.vc.compare(Services.appinfo.platformVersion, "20.0-1") >= 0) {
+				if (Services.vc.compare(Services.appinfo.platformVersion, "20.0-1") >= 0 ||
+					Services.appinfo.name == "FossaMail")
+				{
 					Cu.import("resource://gre/modules/Sqlite.jsm", temp);
 				} else {
 					Cu.import("resource://dkim_verifier/mozilla/Sqlite.jsm", temp);