Merge pull request #4455 from wsnipex/online-check

get rid of non DNS online check

diff --git a/language/English (US)/strings.po b/language/English (US)/strings.po
index 3f16390..2397af7 100644 (file)
--- a/language/English (US)/strings.po
+++ b/language/English (US)/strings.po
@@ -4385,10 +4385,6 @@ msgctxt "#13271"
 msgid "CPU Usage:"
 msgstr "CPU Usage:"
 
-msgctxt "#13274"
-msgid "Connected, but no DNS is available."
-msgstr "Connected, but no DNS is available."
-
 msgctxt "#13275"
 msgid "Hard Disk"
 msgstr "Hard Disk"

diff --git a/xbmc/filesystem/CurlFile.cpp b/xbmc/filesystem/CurlFile.cpp
index 9e3d598..f891a24 100644 (file)
--- a/xbmc/filesystem/CurlFile.cpp
+++ b/xbmc/filesystem/CurlFile.cpp
@@ -868,12 +868,9 @@ bool CCurlFile::Download(const CStdString& strURL, const CStdString& strFileName
 }
 
 // Detect whether we are "online" or not! Very simple and dirty!
-bool CCurlFile::IsInternet(bool checkDNS /* = true */)
+bool CCurlFile::IsInternet()
 {
   CStdString strURL = "http://www.google.com";
-  if (!checkDNS)
-    strURL = "http://74.125.19.103"; // www.google.com ip
-
   bool found = Exists(strURL);
   Close();
 

diff --git a/xbmc/filesystem/CurlFile.h b/xbmc/filesystem/CurlFile.h
index ead7662..1ac061f 100644 (file)
--- a/xbmc/filesystem/CurlFile.h
+++ b/xbmc/filesystem/CurlFile.h
@@ -67,7 +67,7 @@ namespace XFILE
       bool Get(const CStdString& strURL, CStdString& strHTML);
       bool ReadData(CStdString& strHTML);
       bool Download(const CStdString& strURL, const CStdString& strFileName, LPDWORD pdwSize = NULL);
-      bool IsInternet(bool checkDNS = true);
+      bool IsInternet();
       void Cancel();
       void Reset();
       void SetUserAgent(CStdString sUserAgent)                   { m_userAgent = sUserAgent; }

diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp
index cf5991a..cfb402c 100644 (file)
--- a/xbmc/utils/SystemInfo.cpp
+++ b/xbmc/utils/SystemInfo.cpp
@@ -99,8 +99,6 @@ CSysData::INTERNET_STATE CSysInfoJob::GetInternetState()
   XFILE::CCurlFile http;
   if (http.IsInternet())
     return CSysData::CONNECTED;
-  if (http.IsInternet(false))
-    return CSysData::NO_DNS;
   return CSysData::DISCONNECTED;
 }
 
@@ -207,8 +205,6 @@ CStdString CSysInfo::TranslateInfo(int info) const
   case SYSTEM_INTERNET_STATE:
     if (m_info.internetState == CSysData::CONNECTED)
       return g_localizeStrings.Get(13296);
-    else if (m_info.internetState == CSysData::NO_DNS)
-      return g_localizeStrings.Get(13274);
     else
       return g_localizeStrings.Get(13297);
   case SYSTEM_BATTERY_LEVEL:

diff --git a/xbmc/utils/SystemInfo.h b/xbmc/utils/SystemInfo.h
index 4c411ce..c167961 100644 (file)
--- a/xbmc/utils/SystemInfo.h
+++ b/xbmc/utils/SystemInfo.h
@@ -35,7 +35,7 @@
 class CSysData
 {
 public:
-  enum INTERNET_STATE { UNKNOWN, CONNECTED, NO_DNS, DISCONNECTED };
+  enum INTERNET_STATE { UNKNOWN, CONNECTED, DISCONNECTED };
   CSysData()
   {
     Reset();