AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[iOS] fix "no internet" popup in catalog

Browse source
This commit is contained in:
Aleksey Belouosv 2019-09-02 16:28:37 +03:00 • committed by Aleksey Belousov
parent bb20ac4c88
commit 6fb8cd93b2
3 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
iphone/Maps/Bookmarks/Catalog/CatalogConnectionErrorView.xib
View file

@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14865.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14819.2"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@ -62,7 +60,6 @@
</connections>
</button>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="kyS-Dc-8Qc" secondAttribute="trailing" id="2gU-Ct-ccl"/>
<constraint firstAttribute="trailing" secondItem="dSI-8v-q0T" secondAttribute="trailing" constant="5" id="5lL-7g-AdH"/>
@ -77,6 +74,9 @@
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
<point key="canvasLocation" x="53.623188405797109" y="56.584821428571423"/>
</view>
</objects>

22
iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift
View file

@ -68,6 +68,11 @@ final class CatalogWebViewController: WebViewController {
fwdButton.isEnabled = false
noInternetView = CatalogConnectionErrorView(frame: .zero, actionCallback: { [weak self] in
guard let self = self else { return }
if !FrameworkHelper.isNetworkConnected() {
self.noInternetView.isHidden = false
return
}
self.noInternetView.isHidden = true
self.loadingIndicator.startAnimating()
if self.webView.url != nil {
@ -108,8 +113,14 @@ final class CatalogWebViewController: WebViewController {
progressView.centerYAnchor.constraint(equalTo: progressBgView.centerYAnchor).isActive = true
progressBgView.widthAnchor.constraint(equalToConstant: 48).isActive = true
progressBgView.heightAnchor.constraint(equalToConstant: 48).isActive = true
noInternetView.isHidden = true
let connected = FrameworkHelper.isNetworkConnected()
if !connected {
Statistics.logEvent("Bookmarks_Downloaded_Catalogue_error",
withParameters: [kStatError : "no_internet"])
}
noInternetView.isHidden = connected
noInternetView.translatesAutoresizingMaskIntoConstraints = false
view.addSubview(noInternetView)
noInternetView.centerXAnchor.constraint(equalTo: view.centerXAnchor).isActive = true
@ -195,21 +206,16 @@ final class CatalogWebViewController: WebViewController {
override func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
loadingIndicator.stopAnimating()
if let error = error as NSError?, error.code == NSURLErrorCancelled {
return
}
Statistics.logEvent("Bookmarks_Downloaded_Catalogue_error",
withParameters: [kStatError : kStatUnknown])
noInternetView.isHidden = false
}
override func webView(_ webView: WKWebView,
didFailProvisionalNavigation navigation: WKNavigation!,
withError error: Error) {
loadingIndicator.stopAnimating()
Statistics.logEvent("Bookmarks_Downloaded_Catalogue_error",
withParameters: [kStatError : kStatUnknown])
loadingIndicator.stopAnimating()
noInternetView.isHidden = false
}
private func showSubscribe() {

9
iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.swift
View file

@ -52,16 +52,9 @@ class DownloadedBookmarksViewController: MWMViewController {
}
@IBAction func onDownloadBookmarks(_ sender: Any) {
if MWMPlatform.networkConnectionType() == .none {
MWMAlertViewController.activeAlert().presentNoConnectionAlert();
Statistics.logEvent("Bookmarks_Downloaded_Catalogue_error",
withParameters: [kStatError : "no_internet"])
return
}
Statistics.logEvent(kStatCatalogOpen, withParameters: [kStatFrom: kStatDownloaded])
let webViewController = CatalogWebViewController.catalogFromAbsoluteUrl(nil, utm: .bookmarksPageCatalogButton)
MapViewController.topViewController().navigationController?.pushViewController(webViewController,
animated: true)
MapViewController.topViewController().navigationController?.pushViewController(webViewController, animated: true)
}
private func reloadData() {