Delete duplicate function (#4744) (#4748)

Co-authored-by: Paul Beusterien <paulbeusterien@google.com>
firebase · Jan 24, 2020 · b890b1c · b890b1c
1 parent 30c6197
commit b890b1c
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 66 deletions.
diff --git a/FirebaseInAppMessaging/Sources/DefaultUI/Banner/FIRIAMBannerViewController.h b/FirebaseInAppMessaging/Sources/DefaultUI/Banner/FIRIAMBannerViewController.h
@@ -20,7 +20,7 @@
 
 @class FIRInAppMessagingBannerDisplay;
 @class FIRIAMBaseRenderingViewController;
-@protocol FIDTimeFetcher;
+@protocol FIRIAMTimeFetcher;
 @protocol FIRInAppMessagingDisplayDelegate;
 
 NS_ASSUME_NONNULL_BEGIN
@@ -30,6 +30,6 @@ NS_ASSUME_NONNULL_BEGIN
                                  displayMessage:(FIRInAppMessagingBannerDisplay *)bannerMessage
                                 displayDelegate:
                                     (id<FIRInAppMessagingDisplayDelegate>)displayDelegate
-                                    timeFetcher:(id<FIDTimeFetcher>)timeFetcher;
+                                    timeFetcher:(id<FIRIAMTimeFetcher>)timeFetcher;
 @end
 NS_ASSUME_NONNULL_END
diff --git a/FirebaseInAppMessaging/Sources/DefaultUI/Banner/FIRIAMBannerViewController.m b/FirebaseInAppMessaging/Sources/DefaultUI/Banner/FIRIAMBannerViewController.m
@@ -64,7 +64,7 @@ @implementation FIRIAMBannerViewController
                                  displayMessage:(FIRInAppMessagingBannerDisplay *)bannerMessage
                                 displayDelegate:
                                     (id<FIRInAppMessagingDisplayDelegate>)displayDelegate
-                                    timeFetcher:(id<FIDTimeFetcher>)timeFetcher {
+                                    timeFetcher:(id<FIRIAMTimeFetcher>)timeFetcher {
   UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"FIRInAppMessageDisplayStoryboard"
                                                        bundle:resourceBundle];
 

diff --git a/FirebaseInAppMessaging/Sources/DefaultUI/Card/FIRIAMCardViewController.h b/FirebaseInAppMessaging/Sources/DefaultUI/Card/FIRIAMCardViewController.h
@@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN
                                  displayMessage:(FIRInAppMessagingCardDisplay *)cardMessage
                                 displayDelegate:
                                     (id<FIRInAppMessagingDisplayDelegate>)displayDelegate
-                                    timeFetcher:(id<FIDTimeFetcher>)timeFetcher;
+                                    timeFetcher:(id<FIRIAMTimeFetcher>)timeFetcher;
 
 @end
 NS_ASSUME_NONNULL_END
diff --git a/FirebaseInAppMessaging/Sources/DefaultUI/Card/FIRIAMCardViewController.m b/FirebaseInAppMessaging/Sources/DefaultUI/Card/FIRIAMCardViewController.m
@@ -38,7 +38,7 @@ @implementation FIRIAMCardViewController
                                  displayMessage:(FIRInAppMessagingCardDisplay *)cardMessage
                                 displayDelegate:
                                     (id<FIRInAppMessagingDisplayDelegate>)displayDelegate
-                                    timeFetcher:(id<FIDTimeFetcher>)timeFetcher {
+                                    timeFetcher:(id<FIRIAMTimeFetcher>)timeFetcher {
   UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"FIRInAppMessageDisplayStoryboard"
                                                        bundle:resourceBundle];
 

diff --git a/FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMBaseRenderingViewController.h b/FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMBaseRenderingViewController.h
@@ -17,13 +17,13 @@
 #import <UIKit/UIKit.h>
 
 #import <FirebaseInAppMessaging/FIRInAppMessagingRendering.h>
-#import "FIDTimeFetcher.h"
+#import "FIRIAMTimeFetcher.h"
 
 @protocol FIRInAppMessagingDisplayDelegate;
 
 NS_ASSUME_NONNULL_BEGIN
 @interface FIRIAMBaseRenderingViewController : UIViewController
-@property(nonatomic, readwrite) id<FIDTimeFetcher> timeFetcher;
+@property(nonatomic, readwrite) id<FIRIAMTimeFetcher> timeFetcher;
 
 @property(nonatomic, readwrite) id<FIRInAppMessagingDisplayDelegate> displayDelegate;
 

diff --git a/FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMBaseRenderingViewController.m b/FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMBaseRenderingViewController.m
@@ -15,8 +15,8 @@
  */
 
 #import "FIRIAMBaseRenderingViewController.h"
-#import "FIDTimeFetcher.h"
 #import "FIRCore+InAppMessagingDisplay.h"
+#import "FIRIAMTimeFetcher.h"
 
 @interface FIRIAMBaseRenderingViewController ()
 // For fiam messages, it's required to be kMinValidImpressionTime to

diff --git a/FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMDefaultDisplayImpl.m b/FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMDefaultDisplayImpl.m
@@ -20,14 +20,14 @@
 
 #import <FirebaseInAppMessaging/FIRInAppMessaging.h>
 #import <FirebaseInAppMessaging/FIRInAppMessagingRendering.h>
-#import "FIDTimeFetcher.h"
 #import "FIRCore+InAppMessagingDisplay.h"
 #import "FIRIAMBannerViewController.h"
 #import "FIRIAMCardViewController.h"
 #import "FIRIAMDefaultDisplayImpl.h"
 #import "FIRIAMImageOnlyViewController.h"
 #import "FIRIAMModalViewController.h"
 #import "FIRIAMRenderingWindowHelper.h"
+#import "FIRIAMTimeFetcher.h"
 
 @implementation FIRIAMDefaultDisplayImpl
 

diff --git a/FirebaseInAppMessaging/Sources/DefaultUI/ImageOnly/FIRIAMImageOnlyViewController.h b/FirebaseInAppMessaging/Sources/DefaultUI/ImageOnly/FIRIAMImageOnlyViewController.h
@@ -19,7 +19,7 @@
 #import "FIRIAMBaseRenderingViewController.h"
 
 @class FIRInAppMessagingImageOnlyDisplay;
-@protocol FIDTimeFetcher;
+@protocol FIRIAMTimeFetcher;
 @protocol FIRInAppMessagingDisplayDelegate;
 
 NS_ASSUME_NONNULL_BEGIN
@@ -30,6 +30,6 @@ NS_ASSUME_NONNULL_BEGIN
                                      (FIRInAppMessagingImageOnlyDisplay *)imageOnlyMessage
                                 displayDelegate:
                                     (id<FIRInAppMessagingDisplayDelegate>)displayDelegate
-                                    timeFetcher:(id<FIDTimeFetcher>)timeFetcher;
+                                    timeFetcher:(id<FIRIAMTimeFetcher>)timeFetcher;
 @end
 NS_ASSUME_NONNULL_END
diff --git a/FirebaseInAppMessaging/Sources/DefaultUI/ImageOnly/FIRIAMImageOnlyViewController.m b/FirebaseInAppMessaging/Sources/DefaultUI/ImageOnly/FIRIAMImageOnlyViewController.m
@@ -34,7 +34,7 @@ @implementation FIRIAMImageOnlyViewController
                                      (FIRInAppMessagingImageOnlyDisplay *)imageOnlyMessage
                                 displayDelegate:
                                     (id<FIRInAppMessagingDisplayDelegate>)displayDelegate
-                                    timeFetcher:(id<FIDTimeFetcher>)timeFetcher {
+                                    timeFetcher:(id<FIRIAMTimeFetcher>)timeFetcher {
   UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"FIRInAppMessageDisplayStoryboard"
                                                        bundle:resourceBundle];
 

diff --git a/FirebaseInAppMessaging/Sources/DefaultUI/Modal/FIRIAMModalViewController.h b/FirebaseInAppMessaging/Sources/DefaultUI/Modal/FIRIAMModalViewController.h
@@ -28,6 +28,6 @@ NS_ASSUME_NONNULL_BEGIN
                                  displayMessage:(FIRInAppMessagingModalDisplay *)modalMessage
                                 displayDelegate:
                                     (id<FIRInAppMessagingDisplayDelegate>)displayDelegate
-                                    timeFetcher:(id<FIDTimeFetcher>)timeFetcher;
+                                    timeFetcher:(id<FIRIAMTimeFetcher>)timeFetcher;
 @end
 NS_ASSUME_NONNULL_END
diff --git a/FirebaseInAppMessaging/Sources/DefaultUI/Modal/FIRIAMModalViewController.m b/FirebaseInAppMessaging/Sources/DefaultUI/Modal/FIRIAMModalViewController.m
@@ -73,7 +73,7 @@ @implementation FIRIAMModalViewController
                                  displayMessage:(FIRInAppMessagingModalDisplay *)modalMessage
                                 displayDelegate:
                                     (id<FIRInAppMessagingDisplayDelegate>)displayDelegate
-                                    timeFetcher:(id<FIDTimeFetcher>)timeFetcher {
+                                    timeFetcher:(id<FIRIAMTimeFetcher>)timeFetcher {
   UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"FIRInAppMessageDisplayStoryboard"
                                                        bundle:resourceBundle];
 

diff --git a/FirebaseInAppMessaging/Sources/DefaultUI/Util/FIDTimeFetcher.h b/FirebaseInAppMessaging/Sources/DefaultUI/Util/FIDTimeFetcher.h
diff --git a/FirebaseInAppMessaging/Sources/DefaultUI/Util/FIDTimeFetcher.m b/FirebaseInAppMessaging/Sources/DefaultUI/Util/FIDTimeFetcher.m
diff --git a/scripts/if_changed.sh b/scripts/if_changed.sh
@@ -103,7 +103,7 @@ else
       ;;
 
     InAppMessaging-*)
-      check_changes '^(InAppMessaging|Firebase/InAppMessaging|Firebase/InAppMessagingDisplay|InAppMessagingDisplay|'\
+      check_changes '^(FirebaseInAppMessaging|FirebaseInAppMessagingDisplay|'\
 'FirebaseInAppMessaging.podspec|FirebaseInAppMessagingDisplay.podspec|Firebase/InstanceID|FirebaseInstanceID.podspec|'\
 'FirebaseInstallations)'
       ;;