From 8ab9861969f75881ffb60b033e4f26c9bdd67de5 Mon Sep 17 00:00:00 2001 From: jahorton Date: Mon, 27 Jan 2020 11:54:09 +0700 Subject: [PATCH] change(ios): A bit more tidy-up --- .../LanguagePicker/LanguageDetailViewController.swift | 8 ++------ .../Classes/LanguagePicker/LanguageViewController.swift | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/ios/engine/KMEI/KeymanEngine/Classes/LanguagePicker/LanguageDetailViewController.swift b/ios/engine/KMEI/KeymanEngine/Classes/LanguagePicker/LanguageDetailViewController.swift index b0b201d1b3..8ece6c0b0d 100644 --- a/ios/engine/KMEI/KeymanEngine/Classes/LanguagePicker/LanguageDetailViewController.swift +++ b/ios/engine/KMEI/KeymanEngine/Classes/LanguagePicker/LanguageDetailViewController.swift @@ -7,7 +7,6 @@ // import UIKit -import Reachability private let toolbarButtonTag = 100 private let toolbarLabelTag = 101 @@ -196,10 +195,6 @@ class LanguageDetailViewController: UITableViewController, UIAlertViewDelegate { Alerts.showConnectionErrorAlert(in: self, handler: Alerts.popToNevigationRootHandler(for: self)) } - private func showDownloadErrorAlert() { - Alerts.showDownloadErrorAlert(in: self, handler: Alerts.popToNevigationRootHandler(for: self)) - } - private func keyboardDownloadStarted() { log.info("keyboardDownloadStarted: LanguageDetailViewController") view.isUserInteractionEnabled = false @@ -208,7 +203,8 @@ class LanguageDetailViewController: UITableViewController, UIAlertViewDelegate { private func keyboardDownloadFailed() { log.info("keyboardDownloadFailed: LanguageDetailViewController") - showDownloadErrorAlert() + Alerts.showDownloadErrorAlert(in: self, handler: Alerts.popToNevigationRootHandler(for: self)) + view.isUserInteractionEnabled = true navigationItem.setHidesBackButton(false, animated: true) } diff --git a/ios/engine/KMEI/KeymanEngine/Classes/LanguagePicker/LanguageViewController.swift b/ios/engine/KMEI/KeymanEngine/Classes/LanguagePicker/LanguageViewController.swift index 0da76f2085..fa81251935 100644 --- a/ios/engine/KMEI/KeymanEngine/Classes/LanguagePicker/LanguageViewController.swift +++ b/ios/engine/KMEI/KeymanEngine/Classes/LanguagePicker/LanguageViewController.swift @@ -7,7 +7,6 @@ // import QuartzCore import UIKit -import Reachability private let activityViewTag = -2 private let toolbarButtonTag = 100 @@ -246,7 +245,8 @@ class LanguageViewController: UITableViewController, UIAlertViewDelegate { } private func keyboardDownloadFailed() { - showDownloadErrorAlert() + Alerts.showDownloadErrorAlert(in: self, handler: Alerts.popToNevigationRootHandler(for: self)) + view.isUserInteractionEnabled = true navigationItem.setHidesBackButton(false, animated: true) } @@ -308,10 +308,6 @@ class LanguageViewController: UITableViewController, UIAlertViewDelegate { private func showConnectionErrorAlert() { Alerts.showConnectionErrorAlert(in: self, handler: Alerts.popToNevigationRootHandler(for: self)) } - - private func showDownloadErrorAlert() { - Alerts.showDownloadErrorAlert(in: self, handler: Alerts.popToNevigationRootHandler(for: self)) - } } // MARK: - KeyboardRepositoryDelegate