Merge pull request #12 from WesleyBranton/Version-2.1

Version 2.1

README.md

@@ -19,6 +19,9 @@ To develop and test the extension, you need to open the "about:debugging" page i
 Further documentation about developing Firefox extensions can be found [here](https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/Your_first_WebExtension).
 
 ## Release Notes
+### Version 2.1
+* **[FIXED]** Restored compatibility on Firefox for Android
+
 ### Version 2.0
 * **[NEW]** Updated encryption algorithm for better security
 * **[NEW]** Can now share messages via links

firefox/background.js

@@ -4,13 +4,21 @@
 
 browser.browserAction.onClicked.addListener(function(){open("/popup/main.html")});
 browser.webRequest.onBeforeRequest.addListener(getMessage,{urls: ["*://*.securesend.local/*","*://securesend.local/*"]},["blocking"]);
+var isAndroid;
+detectOS();
 
 // Open window
 function open(page) {
-	browser.windows.create({
-		type:"popup",
-		url:page
-	});
+	if (!isAndroid) {
+		browser.windows.create({
+			type:"popup",
+			url:page
+		});
+	} else {
+		browser.tabs.create({
+			url:page
+		});
+	}
 }
 
 // Load message URL
@@ -22,3 +30,13 @@ function getMessage(requestDetails) {
 	}
 	return {cancel: true};
 }
+
+// Detect user operating system
+async function detectOS() {
+	var userOS = await browser.runtime.getPlatformInfo();
+	if (userOS.os == 'android') {
+		isAndroid = true;
+	} else {
+		isAndroid = false;
+	}
+}

firefox/manifest.json

@@ -1,7 +1,7 @@
 {
 	"manifest_version": 2,
 	"name": "Secure Send",
-	"version": "2.0",
+	"version": "2.1",
 	"description": "Secure your messages using encryption!",
 	"author": "Wesley Branton",
 
@@ -27,5 +27,5 @@
 		"scripts": ["background.js"]
 	},
 
-	"permissions": ["storage","webRequest","webRequestBlocking","*://*.securesend.local/*","*://securesend.local/*"]
+	"permissions": ["storage","tabs","webRequest","webRequestBlocking","*://*.securesend.local/*","*://securesend.local/*"]
 }