From 131c3af8732773d6f755ab796041ba851f8f8840 Mon Sep 17 00:00:00 2001
From: Yishi Lin <yishilin14@gmail.com>
Date: Wed, 22 Mar 2017 00:22:47 +0800
Subject: [PATCH] Refresh the password table after getting the next HOTP
 password.

---
 .../PasswordDetailTableViewController.swift   | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/pass/Controllers/PasswordDetailTableViewController.swift b/pass/Controllers/PasswordDetailTableViewController.swift
index ba3f278..2273e24 100644
--- a/pass/Controllers/PasswordDetailTableViewController.swift
+++ b/pass/Controllers/PasswordDetailTableViewController.swift
@@ -106,6 +106,7 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
             self.passwordStore.pgpKeyPassphrase = passphrase
         }
         DispatchQueue.global(qos: .userInitiated).async {
+            // decrypt password
             do {
                 self.password = try self.passwordEntity!.decrypt(passphrase: passphrase)!
             } catch {
@@ -118,22 +119,25 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
                 }
                 return
             }
-            
-            let password = self.password!
-            DispatchQueue.main.async { [weak self] in
-                self?.showPassword(password: password)
-            }
+            // display password
+            self.showPassword()
         }
     }
     
-    func showPassword(password: Password) {
-        setTableData()
-        self.tableView.reloadData()
-        indicator.stopAnimating()
-        editUIBarButtonItem.isEnabled = true
-        if let urlString = password.getURLString() {
-            if self.passwordEntity?.image == nil{
-                self.updatePasswordImage(urlString: urlString)
+    func showPassword() {
+        DispatchQueue.main.async { [weak self] in
+            self?.indicator.stopAnimating()
+            self?.setTableData()
+            UIView.performWithoutAnimation {
+                self?.tableView.reloadData()
+                // add layoutIfNeeded solves the "flickering problem" during refresh
+                self?.tableView.layoutIfNeeded()
+            }
+            self?.editUIBarButtonItem.isEnabled = true
+            if let urlString = self?.password?.getURLString() {
+                if self?.passwordEntity?.image == nil{
+                    self?.updatePasswordImage(urlString: urlString)
+                }
             }
         }
     }
@@ -384,6 +388,7 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
 
     private func addNotificationObservers() {
         NotificationCenter.default.addObserver(self, selector: #selector(setShouldPopCurrentView), name: .passwordStoreChangeDiscarded, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(showPassword), name: .passwordStoreUpdated, object: nil)
     }
     
     func setShouldPopCurrentView() {