From 8fe88cc53a783e2e79257ea462d05c08d61a04e8 Mon Sep 17 00:00:00 2001
From: Chris Li <chris@kiwix.org>
Date: Sun, 27 Nov 2016 16:45:38 -0500
Subject: [PATCH] commit

---
 Kiwix-iOS/Controller/Main/MainDelegates.swift   | 17 ++++++++++-------
 .../Others/TableOfContentsController.swift      |  8 ++------
 Kiwix-iOS/Info.plist                            |  2 +-
 Kiwix-iOSWidgets/Bookmarks/Info.plist           |  2 +-
 Kiwix/Operations/ArticleOperation.swift         |  1 +
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Kiwix-iOS/Controller/Main/MainDelegates.swift b/Kiwix-iOS/Controller/Main/MainDelegates.swift
index 1b3f5ce3..8990d4a5 100644
--- a/Kiwix-iOS/Controller/Main/MainDelegates.swift
+++ b/Kiwix-iOS/Controller/Main/MainDelegates.swift
@@ -167,6 +167,15 @@ extension MainController: ButtonDelegates {
     }
     
     func didLongPressBookmarkButton() {
+        func indexArticle(article: Article) {
+            if article.isBookmarked {
+                CSSearchableIndex.default().indexSearchableItems([article.searchableItem], completionHandler: nil)
+            } else {
+                guard let url = article.url else {return}
+                CSSearchableIndex.default().deleteSearchableItems(withIdentifiers: [url.absoluteString], completionHandler: nil)
+            }
+        }
+        
         guard let url = webView.request?.url,
             let article = Article.fetch(url: url, context: AppDelegate.persistentContainer.viewContext) else {return}
         article.isBookmarked = !article.isBookmarked
@@ -175,13 +184,7 @@ extension MainController: ButtonDelegates {
         controllers.bookmarkHUD.bookmarkAdded = article.isBookmarked
         buttons.bookmark.isHighlighted = article.isBookmarked
         
-        if article.isBookmarked {
-            CSSearchableIndex.default().indexSearchableItems([article.searchableItem], completionHandler: nil)
-        } else {
-            if let url = article.url {
-                CSSearchableIndex.default().deleteSearchableItems(withIdentifiers: [url.absoluteString], completionHandler: nil)
-            }
-        }
+        indexArticle(article: article)
     }
 }
 
diff --git a/Kiwix-iOS/Controller/Others/TableOfContentsController.swift b/Kiwix-iOS/Controller/Others/TableOfContentsController.swift
index 72af4dae..343eed9a 100644
--- a/Kiwix-iOS/Controller/Others/TableOfContentsController.swift
+++ b/Kiwix-iOS/Controller/Others/TableOfContentsController.swift
@@ -12,10 +12,10 @@ import DZNEmptyDataSet
 class TableOfContentsController: UIViewController, UITableViewDelegate, UITableViewDataSource, DZNEmptyDataSetSource, DZNEmptyDataSetDelegate {
     
     @IBOutlet weak var tableView: UITableView!
-    fileprivate let visibleHeaderIndicator = UIView()
+    private let visibleHeaderIndicator = UIView()
     
     weak var delegate: TableOfContentsDelegate?
-    fileprivate var headinglevelMin = 0
+    private var headinglevelMin = 0
     
     var headings = [HTMLHeading]() {
         didSet {
@@ -138,10 +138,6 @@ class TableOfContentsController: UIViewController, UITableViewDelegate, UITableV
         return NSAttributedString(string: text, attributes: attributes)
     }
     
-    func verticalOffset(forEmptyDataSet scrollView: UIScrollView!) -> CGFloat {
-        return 0.0
-    }
-    
     func spaceHeight(forEmptyDataSet scrollView: UIScrollView!) -> CGFloat {
         return 30.0
     }
diff --git a/Kiwix-iOS/Info.plist b/Kiwix-iOS/Info.plist
index 11cd88ae..d08cedcd 100644
--- a/Kiwix-iOS/Info.plist
+++ b/Kiwix-iOS/Info.plist
@@ -49,7 +49,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.8.3468</string>
+	<string>1.8.3479</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/Kiwix-iOSWidgets/Bookmarks/Info.plist b/Kiwix-iOSWidgets/Bookmarks/Info.plist
index aeda3330..f9e62e9c 100644
--- a/Kiwix-iOSWidgets/Bookmarks/Info.plist
+++ b/Kiwix-iOSWidgets/Bookmarks/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.8.3468</string>
+	<string>1.8.3479</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionMainStoryboard</key>
diff --git a/Kiwix/Operations/ArticleOperation.swift b/Kiwix/Operations/ArticleOperation.swift
index 482a8090..3edf9a2c 100644
--- a/Kiwix/Operations/ArticleOperation.swift
+++ b/Kiwix/Operations/ArticleOperation.swift
@@ -78,6 +78,7 @@ class ArticleLoadOperation: Procedure {
         
         OperationQueue.main.addOperation {
             _ = main.searchBar.resignFirstResponder()
+            main.hideTableOfContents(animated: true)
             main.presentingViewController?.dismiss(animated: self.animated, completion: nil)
             main.hideWelcome()