From d87d88250dccd07570c10b37f41054ed44a0ee97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kevin=20R=C3=B6bert?= <dev@xn--rb-fka.it>
Date: Mon, 18 Mar 2019 17:39:47 +0100
Subject: [PATCH] Fix #31

+ Bugfix for Android devices
---
 clearurls.js     |  4 +---
 core_js/tools.js | 56 +++++++++++++++++++++++++++---------------------
 manifest.json    |  2 +-
 3 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/clearurls.js b/clearurls.js
index c5c5d30..d7ecae0 100644
--- a/clearurls.js
+++ b/clearurls.js
@@ -33,14 +33,12 @@ var lastVisited = "";
 
 function start()
 {
-    changeIcon();
-
     /**
     * Save OS Version
     */
     browser.runtime.getPlatformInfo(function(info) {
-
         os = info.os;
+        changeIcon();
 
 
         /**
diff --git a/core_js/tools.js b/core_js/tools.js
index 15f83c0..739a9e0 100644
--- a/core_js/tools.js
+++ b/core_js/tools.js
@@ -1,24 +1,24 @@
 /*
- * ClearURLs
- * Copyright (c) 2017-2019 Kevin Röbert
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+* ClearURLs
+* Copyright (c) 2017-2019 Kevin Röbert
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 /*jshint esversion: 6 */
 /*
- * This script is responsible for some tools.
+* This script is responsible for some tools.
 */
 
 /**
@@ -55,6 +55,10 @@ function reload()
 */
 function checkOSAndroid()
 {
+    browser.runtime.getPlatformInfo().then(function(info) {
+        os = info.os;
+    });
+
     if(os == "android")
     {
         return true;
@@ -75,10 +79,10 @@ function countFields(url)
 }
 
 /**
- * Extract the fields from an url.
- * @param  {String} url URL as String
- * @return {Array}     Fields as array
- */
+* Extract the fields from an url.
+* @param  {String} url URL as String
+* @return {Array}     Fields as array
+*/
 function extractFileds(url)
 {
     return (url.match(/[^\/|\?|&]+=[^\/|\?|&]+/gi) || []);
@@ -158,10 +162,12 @@ function increaseURLCounter()
 */
 function changeIcon()
 {
-    if(storage.globalStatus){
-        browser.browserAction.setIcon({path: "img/clearurls.svg"});
-    } else{
-        browser.browserAction.setIcon({path: "img/clearurls_gray.svg"});
+    if(!checkOSAndroid()) {
+        if(storage.globalStatus){
+            browser.browserAction.setIcon({path: "img/clearurls.svg"});
+        } else{
+            browser.browserAction.setIcon({path: "img/clearurls_gray.svg"});
+        }
     }
 }
 
diff --git a/manifest.json b/manifest.json
index 6d9cfba..64d9b3c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "ClearURLs",
-    "version": "1.5.1a",
+    "version": "1.5.1.5a",
     "author": "Kevin R.",
     "description": "Remove tracking elements form URLs.",
     "homepage_url": "https://gitlab.com/KevinRoebert/ClearUrls",