From b8b283588f59db539715217aba164a380e053ea5 Mon Sep 17 00:00:00 2001
From: "Thiago Marcos P. Santos" <thiago@mapbox.com>
Date: Mon, 7 Mar 2016 22:10:41 -0300
Subject: [core] Remove goOffline() from DefaultFileSource

Use the newly added NetworkStatus::Set().
---
 platform/default/default_file_source.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'platform/default/default_file_source.cpp')

diff --git a/platform/default/default_file_source.cpp b/platform/default/default_file_source.cpp
index 24297374c9..80666ca122 100644
--- a/platform/default/default_file_source.cpp
+++ b/platform/default/default_file_source.cpp
@@ -1,5 +1,6 @@
 #include <mbgl/storage/default_file_source.hpp>
 #include <mbgl/storage/asset_file_source.hpp>
+#include <mbgl/storage/network_status.hpp>
 #include <mbgl/storage/online_file_source.hpp>
 #include <mbgl/storage/offline_database.hpp>
 #include <mbgl/storage/offline_download.hpp>
@@ -39,7 +40,7 @@ public:
                 callback(*offlineResponse);
             }
 
-            if (!impl->offline) {
+            if (NetworkStatus::Get() == NetworkStatus::Status::Online) {
                 onlineRequest = impl->onlineFileSource.request(revalidation, [=] (Response onlineResponse) {
                     impl->offlineDatabase.put(revalidation, onlineResponse);
                     callback(onlineResponse);
@@ -121,10 +122,6 @@ public:
         offlineDatabase.put(resource, response);
     }
 
-    void goOffline() {
-        offline = true;
-    }
-
 private:
     OfflineDownload& getDownload(int64_t regionID) {
         auto it = downloads.find(regionID);
@@ -139,7 +136,6 @@ private:
     OnlineFileSource onlineFileSource;
     std::unordered_map<FileRequest*, std::unique_ptr<Task>> tasks;
     std::unordered_map<int64_t, std::unique_ptr<OfflineDownload>> downloads;
-    bool offline = false;
 };
 
 DefaultFileSource::DefaultFileSource(const std::string& cachePath,
@@ -219,8 +215,4 @@ void DefaultFileSource::put(const Resource& resource, const Response& response)
     thread->invokeSync(&Impl::put, resource, response);
 }
 
-void DefaultFileSource::goOffline() {
-    thread->invokeSync(&Impl::goOffline);
-}
-
 } // namespace mbgl
-- 
cgit v1.2.1