From 6d067eaf094961a158fa4e383bf1f61d30aa705f Mon Sep 17 00:00:00 2001
From: Tim Speckhals <github@timmyrs.de>
Date: Tue, 10 Jul 2018 10:03:35 +0200
Subject: [PATCH] 5.4.1

---
 background.js     | 9 +++++----
 content_script.js | 7 ++++---
 manifest.json     | 2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/background.js b/background.js
index 057dc62..fc2b061 100644
--- a/background.js
+++ b/background.js
@@ -46,14 +46,15 @@ chrome.webRequest.onBeforeRequest.addListener(details=>{
 	}
 	xhr.open("GET","https://api.hell.sh/redirect/"+encodeURIComponent(details.url),false)
 	xhr.send()
-	if(destination)
+	if(destination&&destination!=details.url)
 	{
-		if(destination!=details.url)
-			return{redirectUrl:destination}
+		console.log(details.url+" -> "+destination)
+		return{redirectUrl:destination}
 	}
 },{urls:getTrackerPatterns()},["blocking"])
 
-var getTrackerPatterns=()=>{
+function getTrackerPatterns()
+{
 	let trackerPatterns=[
 	"*://*.bit.ly/*",
 	"*://*.goo.gl/*",
diff --git a/content_script.js b/content_script.js
index 0f80fac..0b13b89 100644
--- a/content_script.js
+++ b/content_script.js
@@ -126,7 +126,7 @@ if(document instanceof HTMLDocument)
 							r=atob(r)
 							r=r.substring(r.length-(r.length-16))
 							r=r.substring(0,r.length-16)
-							if(r&&(r.indexOf("http://")==0||r.indexOf("https://")==0))
+							if(r&&(r.indexOf("http://")==0||r.indexOf("https://")==0)&&encodeURI(r)==r)
 							{
 								showNotification(msgs.timerSkip)
 								safelyNavigate(r)
@@ -257,10 +257,11 @@ if(document instanceof HTMLDocument)
 			location.pathname=location.pathname.split("/t/").join("/saliendo/")
 		})
 		domainBypass("share-online.biz",()=>{
+			let actualWait
 			ODP(this,"wait",{
-				set:_=>{},
+				set:s=>actualWait=s,
 				get:()=>{
-					showNotification(msgs.timerLeap.replace("%secs%","13"))
+					showNotification(msgs.timerLeap.replace("%secs%",actualWait-2))
 					return 2
 				}
 			})
diff --git a/manifest.json b/manifest.json
index 0c5d04f..d0632b5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -9,7 +9,7 @@
 	"name": "Universal Bypass",
 	"description": "__MSG_appDesc__",
 	"homepage_url": "https://universal-bypass.org/",
-	"version": "5.4",
+	"version": "5.4.1",
 	"author": "timmyRS",
 	"minimum_chrome_version": "41",
 	"options_ui": {