update Firebase, pin Crashlytics pod version to 10.5 to work-around a…

… compiler error in newer versions
irccloud · May 8, 2023 · 95fcd3e · 95fcd3e
1 parent 03577af
commit 95fcd3e
Show file tree

Hide file tree

Showing 15 changed files with 2 additions and 149 deletions.
diff --git a/IRCCloud.xcodeproj/project.pbxproj b/IRCCloud.xcodeproj/project.pbxproj
@@ -3508,7 +3508,6 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-IRCCloud Enterprise/Pods-IRCCloud Enterprise-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/FirebaseCore-framework/FirebaseCore.framework",
-				"${BUILT_PRODUCTS_DIR}/FirebaseCoreDiagnostics-framework/FirebaseCoreDiagnostics.framework",
 				"${BUILT_PRODUCTS_DIR}/FirebaseCoreInternal-framework/FirebaseCoreInternal.framework",
 				"${BUILT_PRODUCTS_DIR}/FirebaseCrashlytics-framework/FirebaseCrashlytics.framework",
 				"${BUILT_PRODUCTS_DIR}/FirebaseInstallations-framework/FirebaseInstallations.framework",
@@ -3526,7 +3525,6 @@
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreDiagnostics.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreInternal.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCrashlytics.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstallations.framework",
@@ -3576,7 +3574,6 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-IRCCloud/Pods-IRCCloud-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/FirebaseCore-framework/FirebaseCore.framework",
-				"${BUILT_PRODUCTS_DIR}/FirebaseCoreDiagnostics-framework/FirebaseCoreDiagnostics.framework",
 				"${BUILT_PRODUCTS_DIR}/FirebaseCoreInternal-framework/FirebaseCoreInternal.framework",
 				"${BUILT_PRODUCTS_DIR}/FirebaseCrashlytics-framework/FirebaseCrashlytics.framework",
 				"${BUILT_PRODUCTS_DIR}/FirebaseInstallations-framework/FirebaseInstallations.framework",
@@ -3594,7 +3591,6 @@
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreDiagnostics.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreInternal.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCrashlytics.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstallations.framework",
@@ -3644,7 +3640,6 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-IRCCloud FLEX/Pods-IRCCloud FLEX-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/FirebaseCore-framework/FirebaseCore.framework",
-				"${BUILT_PRODUCTS_DIR}/FirebaseCoreDiagnostics-framework/FirebaseCoreDiagnostics.framework",
 				"${BUILT_PRODUCTS_DIR}/FirebaseCoreInternal-framework/FirebaseCoreInternal.framework",
 				"${BUILT_PRODUCTS_DIR}/FirebaseCrashlytics-framework/FirebaseCrashlytics.framework",
 				"${BUILT_PRODUCTS_DIR}/FirebaseInstallations-framework/FirebaseInstallations.framework",
@@ -3662,7 +3657,6 @@
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreDiagnostics.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreInternal.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCrashlytics.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstallations.framework",

diff --git a/IRCCloud/Classes/AppDelegate.m b/IRCCloud/Classes/AppDelegate.m
@@ -38,7 +38,6 @@
 #import "FLEXManager.h"
 #endif
 @import Firebase;
-@import FirebaseAnalytics;
 @import FirebaseMessaging;
 
 extern NSURL *__logfile;
@@ -112,7 +111,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 #ifdef CRASHLYTICS_TOKEN
     if([FIROptions defaultOptions]) {
         [FIRApp configure];
-        [FIRAnalytics setUserID:nil];
     }
 #endif
     UNUserNotificationCenter* center = [UNUserNotificationCenter currentNotificationCenter];
@@ -277,8 +275,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
 -(BOOL)continueActivity:(NSUserActivity *)userActivity {
     CLS_LOG(@"Continuing activity type: %@", userActivity.activityType);
-    if([FIROptions defaultOptions])
-        [FIRAnalytics handleUserActivity:userActivity];
 #ifdef ENTERPRISE
     if([userActivity.activityType isEqualToString:@"com.irccloud.enterprise.buffer"])
 #else
@@ -313,8 +309,6 @@ -(BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActi
 }
 
 - (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey, id> *)options {
-    if([FIROptions defaultOptions])
-        [FIRAnalytics handleOpenURL:url];
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 
     if([url.scheme hasPrefix:@"irccloud"]) {
@@ -822,8 +816,6 @@ - (void)application:(UIApplication *)application handleEventsForBackgroundURLSes
         imageUploadCompletionHandler = completionHandler;
     } else {
         CLS_LOG(@"Unrecognized background task: %@", identifier);
-        if([FIROptions defaultOptions])
-            [FIRAnalytics handleEventsForBackgroundURLSession:identifier completionHandler:completionHandler];
         completionHandler();
     }
 }

diff --git a/IRCCloud/Classes/BuffersTableView.m b/IRCCloud/Classes/BuffersTableView.m
@@ -30,7 +30,6 @@
 #import "MainViewController.h"
 #import "NSString+Score.h"
 @import Firebase;
-@import FirebaseAnalytics;
 
 #define TYPE_SERVER 0
 #define TYPE_CHANNEL 1
@@ -238,16 +237,6 @@ -(void)viewWillDisappear:(BOOL)animated {
     [self->_searchText resignFirstResponder];
 }
 
-- (void)viewDidAppear:(BOOL)animated {
-    [super viewDidAppear:animated];
-    if([FIROptions defaultOptions]) {
-        if(animated && self.parentViewController)
-            [FIRAnalytics logEventWithName:kFIREventScreenView parameters:@{kFIRParameterScreenName:NSStringFromClass(self.parentViewController.class)}];
-        else
-            [FIRAnalytics logEventWithName:kFIREventScreenView parameters:@{kFIRParameterScreenName:NSStringFromClass(self.class)}];
-    }
-}
-
 - (NSMutableDictionary *)_addBuffer:(Buffer *)buffer data:(NSMutableArray *)data prefs:(NSDictionary *)prefs server:(Server *)server collapsed:(NSDictionary *)collapsed unread:(int)unread highlights:(int)highlights firstUnreadPosition:(NSInteger *)firstUnreadPosition lastUnreadPosition:(NSInteger *)lastUnreadPosition firstHighlightPosition:(NSInteger *)firstHighlightPosition lastHighlightPosition:(NSInteger *)lastHighlightPosition {
     NSMutableDictionary *entry = nil;
     int type = -1;

diff --git a/IRCCloud/Classes/ImageViewController.m b/IRCCloud/Classes/ImageViewController.m
@@ -263,9 +263,6 @@ -(void)_fetchVideo:(NSURL *)url {
         [self.view addGestureRecognizer:self->_panGesture];
         [self->_progressView removeFromSuperview];
         [self->_movieController.player play];
-        [FIRAnalytics logEventWithName:kFIREventViewItem parameters:@{
-            kFIRParameterContentType:@"Animation"
-        }];
 
         [self scrollViewDidZoom:self->_scrollView];
     }];
@@ -399,9 +396,6 @@ - (void)_parseImageData:(NSData *)data {
             [UIView setAnimationDuration:0.25];
             self->_imageView.alpha = 1;
             [UIView commitAnimations];
-            [FIRAnalytics logEventWithName:kFIREventViewItem parameters:@{
-                kFIRParameterContentType:@"Image"
-            }];
         }];
     } else {
         [[NSOperationQueue mainQueue] addOperationWithBlock:^{

diff --git a/IRCCloud/Classes/LogExportsTableViewController.m b/IRCCloud/Classes/LogExportsTableViewController.m
@@ -565,15 +565,12 @@ -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *
                 }
                 switch(indexPath.row) {
                     case 0:
-                        [FIRAnalytics logEventWithName:@"export_logs" parameters:@{@"type":@"network"}];
                         [self requestExport:self->_server.cid bid:-1];
                         break;
                     case 1:
-                        [FIRAnalytics logEventWithName:@"export_logs" parameters:@{@"type":@"buffer"}];
                         [self requestExport:self->_server.cid bid:self->_buffer.bid];
                         break;
                     case 2:
-                        [FIRAnalytics logEventWithName:@"export_logs" parameters:@{@"type":@"all"}];
                         [self requestExport:-1 bid:-1];
                         break;
                 }

diff --git a/IRCCloud/Classes/LoginSplashViewController.m b/IRCCloud/Classes/LoginSplashViewController.m
@@ -275,12 +275,6 @@ -(void)_loginWithAccessLink {
             self->forgotPasswordLogin.alpha = 0;
             self->forgotPasswordSignup.alpha = 0;
             [((AppDelegate *)([UIApplication sharedApplication].delegate)) showMainView:YES];
-#ifndef ENTERPRISE
-            [FIRAnalytics logEventWithName:kFIREventLogin parameters:@{
-                kFIRParameterMethod:@"access-link",
-                kFIRParameterSuccess:@(1)
-            }];
-#endif
         } else {
             [UIView beginAnimations:nil context:nil];
             self->loginView.alpha = 1;
@@ -289,12 +283,6 @@ -(void)_loginWithAccessLink {
             UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Login Failed" message:@"Invalid access link" preferredStyle:UIAlertControllerStyleAlert];
             [alert addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleCancel handler:nil]];
             [self presentViewController:alert animated:YES completion:nil];
-#ifndef ENTERPRISE
-            [FIRAnalytics logEventWithName:kFIREventLogin parameters:@{
-                kFIRParameterMethod:@"access-link",
-                kFIRParameterSuccess:@(0)
-            }];
-#endif
         }
     }];
 }
@@ -767,17 +755,6 @@ -(IBAction)loginButtonPressed:(id)sender {
                         [d setObject:IRCCLOUD_PATH forKey:@"path"];
                         [d synchronize];
 #ifndef ENTERPRISE
-                        if(nameAlpha) {
-                            [FIRAnalytics logEventWithName:kFIREventSignUp parameters:@{
-                                kFIRParameterMethod:@"email",
-                                kFIRParameterSuccess:@(1)
-                            }];
-                        } else {
-                            [FIRAnalytics logEventWithName:kFIREventLogin parameters:@{
-                                kFIRParameterMethod:@"email",
-                                kFIRParameterSuccess:@(1)
-                            }];
-                        }
                         if(!self->_gotCredentialsFromPasswordManager) {
                             if (@available(macCatalyst 14.0, *)) {
                                 SecAddSharedWebCredential((CFStringRef)@"www.irccloud.com", (__bridge CFStringRef)user, (__bridge CFStringRef)pass, ^(CFErrorRef error) {
@@ -829,35 +806,6 @@ -(IBAction)loginButtonPressed:(id)sender {
                             [[NetworkConnection sharedInstance] sendFeedbackReport:self];
                         }]];
                         [self presentViewController:alert animated:YES completion:nil];
-#ifndef ENTERPRISE
-                        if(nameAlpha) {
-                            if([result objectForKey:@"message"]) {
-                                [FIRAnalytics logEventWithName:kFIREventSignUp parameters:@{
-                                    kFIRParameterMethod:@"email",
-                                    kFIRParameterSuccess:@(0),
-                                    @"failure":[result objectForKey:@"message"]
-                                }];
-                            } else {
-                                [FIRAnalytics logEventWithName:kFIREventSignUp parameters:@{
-                                    kFIRParameterMethod:@"email",
-                                    kFIRParameterSuccess:@(0)
-                                }];
-                            }
-                        } else {
-                            if([result objectForKey:@"message"]) {
-                                [FIRAnalytics logEventWithName:kFIREventLogin parameters:@{
-                                    kFIRParameterMethod:@"email",
-                                    kFIRParameterSuccess:@(0),
-                                    @"failure":[result objectForKey:@"message"]
-                                }];
-                            } else {
-                                [FIRAnalytics logEventWithName:kFIREventLogin parameters:@{
-                                    kFIRParameterMethod:@"email",
-                                    kFIRParameterSuccess:@(0)
-                                }];
-                            }
-                        }
-#endif
                     }
                 };
 

diff --git a/IRCCloud/Classes/MainViewController.m b/IRCCloud/Classes/MainViewController.m
@@ -2053,8 +2053,6 @@ - (void)viewDidAppear:(BOOL)animated {
         [UIApplication sharedApplication].idleTimerDisabled = YES;
 
     self.slidingViewController.view.autoresizesSubviews = NO;
-    if([FIROptions defaultOptions])
-        [FIRAnalytics logEventWithName:kFIREventScreenView parameters:@{kFIRParameterScreenName:NSStringFromClass(self.class)}];
 }
 
 - (void)didReceiveMemoryWarning {
@@ -5667,7 +5665,6 @@ -(void)joinFeedback {
 }
 
 -(void)joinBeta {
-    [FIRAnalytics logEventWithName:@"beta_invite" parameters:nil];
     [(AppDelegate *)([UIApplication sharedApplication].delegate) launchURL:[NSURL URLWithString:@"https://testflight.apple.com/join/MApr7Une"]];
 }
 

diff --git a/IRCCloud/Classes/NetworkConnection.m b/IRCCloud/Classes/NetworkConnection.m
@@ -2776,7 +2776,6 @@ -(void)logout {
         }
     }
     [[ImageCache sharedInstance] purge];
-    [FIRAnalytics resetAnalyticsData];
 #endif
     [self cancelIdleTimer];
 }

diff --git a/IRCCloud/Classes/PastebinViewController.m b/IRCCloud/Classes/PastebinViewController.m
@@ -86,9 +86,6 @@ -(void)viewWillAppear:(BOOL)animated {
     self->_lineNumbers.enabled = NO;
     self->_lineNumbers.on = YES;
     [self _fetch];
-    [FIRAnalytics logEventWithName:kFIREventViewItem parameters:@{
-        kFIRParameterContentType:@"Pastebin"
-    }];
     [self didMoveToParentViewController:nil];
 }
 

diff --git a/IRCCloud/Classes/SettingsViewController.m b/IRCCloud/Classes/SettingsViewController.m
@@ -494,7 +494,6 @@ -(void)saveButtonPressed:(id)sender {
                 [spinny startAnimating];
                 self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:spinny];
 
-                [FIRAnalytics logEventWithName:@"change_email" parameters:nil];
                 [[NetworkConnection sharedInstance] changeEmail:self->_email.text password:((UITextField *)[alert.textFields objectAtIndex:0]).text handler:^(IRCCloudJSONObject *result) {
                     if([[result objectForKey:@"success"] boolValue]) {
                         [self saveButtonPressed:nil];
@@ -768,7 +767,6 @@ -(void)refresh {
                             [spinny startAnimating];
                             self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:spinny];
 
-                            [FIRAnalytics logEventWithName:@"change_password" parameters:nil];
                             [[NetworkConnection sharedInstance] changePassword:[alert.textFields objectAtIndex:0].text newPassword:[alert.textFields objectAtIndex:0].text handler:^(IRCCloudJSONObject *result) {
                                 if([[result objectForKey:@"success"] boolValue]) {
                                     self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSave target:self action:@selector(saveButtonPressed:)];
@@ -803,7 +801,6 @@ -(void)refresh {
                             [spinny startAnimating];
                             self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:spinny];
 
-                            [FIRAnalytics logEventWithName:@"delete_account" parameters:nil];
                             [[NetworkConnection sharedInstance] deleteAccount:[alert.textFields objectAtIndex:0].text handler:^(IRCCloudJSONObject *result) {
                                 if([[result objectForKey:@"success"] boolValue]) {
                                     [self.tableView endEditing:YES];
@@ -949,19 +946,15 @@ -(void)refresh {
               @{@"title":@"Photo Sharing", @"items":photos},
               @{@"title":@"About", @"items":@[
                         @{@"title":@"Feedback Channel", @"selected":^{[self dismissViewControllerAnimated:YES completion:^{
-                            [FIRAnalytics logEventWithName:@"prefs_url" parameters:@{@"url":@"irc://irc.irccloud.com/%23feedback"}];
                             [(AppDelegate *)([UIApplication sharedApplication].delegate) launchURL:[NSURL URLWithString:@"irc://irc.irccloud.com/%23feedback"]];
                         }];}},
 #ifndef ENTERPRISE
                         @{@"title":@"Become a Beta Tester", @"selected":^{
-                            [FIRAnalytics logEventWithName:@"beta_invite" parameters:nil];
                             [(AppDelegate *)([UIApplication sharedApplication].delegate) launchURL:[NSURL URLWithString:@"https://testflight.apple.com/join/MApr7Une"]];}},
 #endif
                         @{@"title":@"FAQ", @"selected":^{
-                            [FIRAnalytics logEventWithName:@"prefs_url" parameters:@{@"url":@"https://www.irccloud.com/faq"}];
                             [(AppDelegate *)([UIApplication sharedApplication].delegate) launchURL:[NSURL URLWithString:@"https://www.irccloud.com/faq"]];}},
                         @{@"title":@"Version History", @"selected":^{
-                            [FIRAnalytics logEventWithName:@"prefs_url" parameters:@{@"url":@"https://github.com/irccloud/ios/releases"}];
                             [(AppDelegate *)([UIApplication sharedApplication].delegate) launchURL:[NSURL URLWithString:@"https://github.com/irccloud/ios/releases"]];}},
                         @{@"title":@"Open-Source Licenses", @"selected":^{[self.navigationController pushViewController:[[LicenseViewController alloc] init] animated:YES];}},
                         @{@"title":@"Version", @"subtitle":self->_version}

diff --git a/IRCCloud/Classes/URLHandler.m b/IRCCloud/Classes/URLHandler.m
@@ -669,9 +669,6 @@ - (void)launchURL:(NSURL *)url
         player.modalPresentationStyle = UIModalPresentationFullScreen;
         player.player = [[AVPlayer alloc] initWithURL:url];
         [mainViewController presentViewController:player animated:YES completion:nil];
-        [FIRAnalytics logEventWithName:kFIREventViewItem parameters:@{
-            kFIRParameterContentType:@"Video"
-        }];
     } else if(!isCatalyst && [[NSUserDefaults standardUserDefaults] boolForKey:@"videoViewer"] && IS_YOUTUBE(url)) {
         [mainViewController launchURL:url];
     } else if([url.host.lowercaseString isEqualToString:@"maps.apple.com"]) {
@@ -756,10 +753,6 @@ + (UIActivityViewController *)activityControllerForItems:(NSArray *)items type:(
                 activityType = [activityType substringFromIndex:25];
             if([activityType hasPrefix:@"com.apple."])
                 activityType = [activityType substringFromIndex:10];
-            [FIRAnalytics logEventWithName:kFIREventShare parameters:@{
-                kFIRParameterMethod:activityType,
-                kFIRParameterContentType:type
-            }];
         }
     };
     return activityController;

diff --git a/IRCCloud/Classes/UsersTableView.m b/IRCCloud/Classes/UsersTableView.m
@@ -352,16 +352,6 @@ - (void)viewWillAppear:(BOOL)animated {
     [self.tableView reloadData];
 }
 
-- (void)viewDidAppear:(BOOL)animated {
-    [super viewDidAppear:animated];
-    if([FIROptions defaultOptions]) {
-        if(animated && self.parentViewController)
-            [FIRAnalytics logEventWithName:kFIREventScreenView parameters:@{kFIRParameterScreenName:NSStringFromClass(self.parentViewController.class)}];
-        else
-            [FIRAnalytics logEventWithName:kFIREventScreenView parameters:@{kFIRParameterScreenName:NSStringFromClass(self.class)}];
-    }
-}
-
 - (void)didMoveToParentViewController:(UIViewController *)parent {
     [self refresh];
     self->_refreshTimer = nil;

diff --git a/IRCCloud/Classes/YouTubeViewController.m b/IRCCloud/Classes/YouTubeViewController.m
@@ -188,10 +188,6 @@ - (void)viewDidLoad {
     self->_activity.hidesWhenStopped = YES;
     [self->_activity startAnimating];
     [self.view addSubview:self->_activity];
-
-    [FIRAnalytics logEventWithName:kFIREventViewItem parameters:@{
-        kFIRParameterContentType:@"Youtube"
-    }];
 }
 
 -(void)_YTWrapperTapped {
-Original file line number
+Diff line change
@@ Expand Up / @@ -2776,7 +2776,6 @@ -(void)logout { @@
             }
         }
         [[ImageCache sharedInstance] purge];
-        [FIRAnalytics resetAnalyticsData];
     #endif
         [self cancelIdleTimer];
     }
@@ Expand Down @@