From efcfbe258407b152efa86964aff4484965abec65 Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Sat, 20 Apr 2013 12:14:44 -0400
Subject: [PATCH] Fixed popup appearance.

[FIXED]     Appearance of popup when copying emergency password.
---
 MasterPassword/ObjC/iOS/MPUnlockViewController.h         | 2 +-
 MasterPassword/ObjC/iOS/MPUnlockViewController.m         | 6 ++++--
 MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/MasterPassword/ObjC/iOS/MPUnlockViewController.h b/MasterPassword/ObjC/iOS/MPUnlockViewController.h
index 452b2338..96857591 100644
--- a/MasterPassword/ObjC/iOS/MPUnlockViewController.h
+++ b/MasterPassword/ObjC/iOS/MPUnlockViewController.h
@@ -35,7 +35,7 @@
 @property (weak, nonatomic) IBOutlet UILabel *emergencyCounter;
 @property (weak, nonatomic) IBOutlet UIActivityIndicatorView *emergencyActivity;
 @property (weak, nonatomic) IBOutlet UIButton *emergencyPassword;
-@property (weak, nonatomic) IBOutlet UIView *contentTipContainer;
+@property (weak, nonatomic) IBOutlet UIView *emergencyContentTipContainer;
 
 @property (nonatomic, strong) UIColor *avatarShadowColor;
 
diff --git a/MasterPassword/ObjC/iOS/MPUnlockViewController.m b/MasterPassword/ObjC/iOS/MPUnlockViewController.m
index 61f730c9..92ce773b 100644
--- a/MasterPassword/ObjC/iOS/MPUnlockViewController.m
+++ b/MasterPassword/ObjC/iOS/MPUnlockViewController.m
@@ -141,6 +141,8 @@
     [self.emergencyTypeControl addTargetBlock:^(id sender, UIControlEvents event) {
         [self updateEmergencyPassword];
     }                        forControlEvents:UIControlEventValueChanged];
+    self.emergencyContentTipContainer.alpha = 0;
+    self.emergencyContentTipContainer.hidden = NO;
     self.marqueeTipTexts = @[ @"Tap and hold to delete or reset user.",
                               @"Shake for emergency generator." ];
 
@@ -883,13 +885,13 @@
     [UIPasteboard generalPasteboard].string = [self.emergencyPassword titleForState:UIControlStateNormal];
 
     [UIView animateWithDuration:0.3f animations:^{
-        self.contentTipContainer.alpha = 1;
+        self.emergencyContentTipContainer.alpha = 1;
     }                completion:^(BOOL finished) {
         if (finished) {
             dispatch_time_t popTime = dispatch_time( DISPATCH_TIME_NOW, 5 * NSEC_PER_SEC );
             dispatch_after( popTime, dispatch_get_main_queue(), ^(void) {
                 [UIView animateWithDuration:0.2f animations:^{
-                    self.contentTipContainer.alpha = 0;
+                    self.emergencyContentTipContainer.alpha = 0;
                 }];
             } );
         }
diff --git a/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard b/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard
index d1b6e531..7e4370b5 100644
--- a/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard
+++ b/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard
@@ -1617,9 +1617,9 @@ You could use the word wall for  inspiration in finding a memorable master passw
                     <connections>
                         <outlet property="avatarTemplate" destination="Ten-ig-gog" id="0ZZ-z5-d5m"/>
                         <outlet property="avatarsView" destination="Blg-F1-9NA" id="2NL-jU-IMI"/>
-                        <outlet property="contentTipContainer" destination="sD9-hR-UAI" id="RiP-k1-7dk"/>
                         <outlet property="createPasswordTipView" destination="xWL-xQ-KjX" id="Pa1-Bk-pW2"/>
                         <outlet property="emergencyActivity" destination="3Ax-91-gVM" id="UfN-vk-k0Z"/>
+                        <outlet property="emergencyContentTipContainer" destination="sD9-hR-UAI" id="RiP-k1-7dk"/>
                         <outlet property="emergencyCounter" destination="TJC-xD-fjQ" id="jrf-nb-soB"/>
                         <outlet property="emergencyCounterStepper" destination="D49-fo-7FA" id="hj2-CL-zxq"/>
                         <outlet property="emergencyGeneratorContainer" destination="KNa-Xb-RuE" id="6jt-vU-L2Q"/>