Removeonboarding2 (#7052)

Remove obsolete onboarding calls from the SDK.

Author: elenadoty

Crashlytics/CHANGELOG.md

@@ -1,5 +1,6 @@
 # Unreleased
 - [changed] Removed obsolete API calls from upload-symbols
+- [changed] Removed obsolete onboarding calls from the SDK.
 - [changed] Decreased Crashlytics CocoaPods minimum deployment target from iOS 10 to iOS 9
 
 # v7.1.0

Crashlytics/Crashlytics/Controllers/FIRCLSReportManager.m

@@ -59,7 +59,7 @@
 
 #import "Crashlytics/Crashlytics/Models/FIRCLSExecutionIdentifierModel.h"
 #import "Crashlytics/Crashlytics/Models/FIRCLSInstallIdentifierModel.h"
-#import "Crashlytics/Crashlytics/Settings/FIRCLSSettingsOnboardingManager.h"
+#import "Crashlytics/Crashlytics/Settings/FIRCLSSettingsManager.h"
 #import "Crashlytics/Shared/FIRCLSConstants.h"
 
 #import "Crashlytics/Crashlytics/Controllers/FIRCLSReportManager_Private.h"
@@ -171,8 +171,8 @@ @interface FIRCLSReportManager () <FIRCLSNetworkClientDelegate,
 // Settings fetched from the server
 @property(nonatomic, strong) FIRCLSSettings *settings;
 
-// Runs the operations that fetch settings and call onboarding endpoints
-@property(nonatomic, strong) FIRCLSSettingsOnboardingManager *settingsAndOnboardingManager;
+// Runs the operations that fetch settings
+@property(nonatomic, strong) FIRCLSSettingsManager *settingsManager;
 
 @property(nonatomic, strong) GDTCORTransport *googleTransport;
 
@@ -226,12 +226,11 @@ - (instancetype)initWithFileManager:(FIRCLSFileManager *)fileManager
   _settings = settings;
   _appIDModel = appIDModel;
 
-  _settingsAndOnboardingManager =
-      [[FIRCLSSettingsOnboardingManager alloc] initWithAppIDModel:appIDModel
-                                                   installIDModel:self.installIDModel
-                                                         settings:self.settings
-                                                      fileManager:self.fileManager
-                                                      googleAppID:self.googleAppID];
+  _settingsManager = [[FIRCLSSettingsManager alloc] initWithAppIDModel:appIDModel
+                                                        installIDModel:self.installIDModel
+                                                              settings:self.settings
+                                                           fileManager:self.fileManager
+                                                           googleAppID:self.googleAppID];
 
   return self;
 }
@@ -360,7 +359,7 @@ - (FBLPromise *)deleteUnsentReports {
     FIRCLSDebugLog(@"Unsent reports will be uploaded at startup");
     FIRCLSDataCollectionToken *dataCollectionToken = [FIRCLSDataCollectionToken validToken];
 
-    [self beginSettingsAndOnboardingWithToken:dataCollectionToken waitForSettingsRequest:NO];
+    [self beginSettingsWithToken:dataCollectionToken waitForSettingsRequest:NO];
 
     [self beginReportUploadsWithToken:dataCollectionToken
                preexistingReportPaths:preexistingReportPaths
@@ -398,8 +397,8 @@ - (FBLPromise *)deleteUnsentReports {
                  BOOL waitForSetting =
                      !self.settings.shouldUseNewReportEndpoint && !self.settings.orgID;
 
-                 [self beginSettingsAndOnboardingWithToken:dataCollectionToken
-                                    waitForSettingsRequest:waitForSetting];
+                 [self beginSettingsWithToken:dataCollectionToken
+                       waitForSettingsRequest:waitForSetting];
 
                  [self beginReportUploadsWithToken:dataCollectionToken
                             preexistingReportPaths:preexistingReportPaths
@@ -454,16 +453,16 @@ - (void)checkAndRotateInstallUUIDIfNeededWithReport:(FIRCLSInternalReport *)repo
   }];
 }
 
-- (void)beginSettingsAndOnboardingWithToken:(FIRCLSDataCollectionToken *)token
-                     waitForSettingsRequest:(BOOL)waitForSettings {
+- (void)beginSettingsWithToken:(FIRCLSDataCollectionToken *)token
+        waitForSettingsRequest:(BOOL)waitForSettings {
   if (self.settings.isCacheExpired) {
     // This method can be called more than once if the user calls
     // SendUnsentReports again, so don't repeat the settings fetch
     static dispatch_once_t settingsFetchOnceToken;
     dispatch_once(&settingsFetchOnceToken, ^{
-      [self.settingsAndOnboardingManager beginSettingsAndOnboardingWithGoogleAppId:self.googleAppID
-                                                                             token:token
-                                                                 waitForCompletion:waitForSettings];
+      [self.settingsManager beginSettingsWithGoogleAppId:self.googleAppID
+                                                   token:token
+                                       waitForCompletion:waitForSettings];
     });
   }
 }

Crashlytics/Crashlytics/Models/FIRCLSSettings.h

@@ -76,16 +76,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property(nonatomic, nullable, readonly) NSString *fetchedBundleID;
 
-/**
- * Indicates whether the app needs onboarding
- */
-@property(nonatomic, readonly) BOOL appNeedsOnboarding;
-
-/**
- * Indicates whether the app needs an update
- */
-@property(nonatomic, readonly) BOOL appUpdateRequired;
-
 /**
  * When this is false, Crashlytics will not start up
  */

Crashlytics/Crashlytics/Models/FIRCLSSettings.m

@@ -261,20 +261,6 @@ - (nullable NSString *)fetchedBundleID {
   return self.fabricSettings[@"bundle_id"];
 }
 
-#pragma mark - Onboarding / Update
-
-- (NSString *)appStatus {
-  return self.appSettings[@"status"];
-}
-
-- (BOOL)appNeedsOnboarding {
-  return [self.appStatus isEqualToString:@"new"];
-}
-
-- (BOOL)appUpdateRequired {
-  return [[self.appSettings objectForKey:@"update_required"] boolValue];
-}
-
 #pragma mark - On / Off Switches
 
 - (BOOL)errorReportingEnabled {

Crashlytics/Crashlytics/Settings/FIRCLSSettingsOnboardingManager.h renamed to Crashlytics/Crashlytics/Settings/FIRCLSSettingsManager.h

@@ -29,10 +29,9 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /**
- * Use this class to retrieve remote settings for the application from crashlytics backend, and
- * onboard the application on the server.
+ * Use this class to retrieve remote settings for the application from crashlytics backend.
  */
-@interface FIRCLSSettingsOnboardingManager : NSObject
+@interface FIRCLSSettingsManager : NSObject
 
 /**
  * Designated Initializer.
@@ -46,13 +45,13 @@ NS_ASSUME_NONNULL_BEGIN
 + (instancetype)new NS_UNAVAILABLE;
 
 /**
- * This method kicks off downloading settings and onboarding for the app.
+ * This method kicks off downloading settings for the app.
  * @param googleAppID (required) GMP id for the app.
  * @param token (required) Data collection token signifying we can make network calls
  */
-- (void)beginSettingsAndOnboardingWithGoogleAppId:(NSString *)googleAppID
-                                            token:(FIRCLSDataCollectionToken *)token
-                                waitForCompletion:(BOOL)waitForCompletion;
+- (void)beginSettingsWithGoogleAppId:(NSString *)googleAppID
+                               token:(FIRCLSDataCollectionToken *)token
+                   waitForCompletion:(BOOL)waitForCompletion;
 
 @end
 

Crashlytics/Crashlytics/Settings/FIRCLSSettingsOnboardingManager.m renamed to Crashlytics/Crashlytics/Settings/FIRCLSSettingsManager.m

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "Crashlytics/Crashlytics/Settings/FIRCLSSettingsOnboardingManager.h"
+#import "Crashlytics/Crashlytics/Settings/FIRCLSSettingsManager.h"
 
 #import "Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionToken.h"
 #import "Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h"
@@ -22,25 +22,19 @@
 #import "Crashlytics/Crashlytics/Models/FIRCLSSettings.h"
 #import "Crashlytics/Crashlytics/Settings/Models/FIRCLSApplicationIdentifierModel.h"
 #import "Crashlytics/Crashlytics/Settings/Operations/FIRCLSDownloadAndSaveSettingsOperation.h"
-#import "Crashlytics/Crashlytics/Settings/Operations/FIRCLSOnboardingOperation.h"
 #import "Crashlytics/Shared/FIRCLSConstants.h"
 #import "Crashlytics/Shared/FIRCLSNetworking/FIRCLSFABNetworkClient.h"
 #import "Crashlytics/Shared/FIRCLSNetworking/FIRCLSURLBuilder.h"
 
-@interface FIRCLSSettingsOnboardingManager () <FIRCLSDownloadAndSaveSettingsOperationDelegate,
-                                               FIRCLSOnboardingOperationDelegate>
+@interface FIRCLSSettingsManager () <FIRCLSDownloadAndSaveSettingsOperationDelegate>
 
 @property(nonatomic, strong) FIRCLSApplicationIdentifierModel *appIDModel;
 @property(nonatomic, strong) FIRCLSInstallIdentifierModel *installIDModel;
 
 @property(nonatomic, strong) FIRCLSSettings *settings;
 
-@property(nonatomic, nullable, strong) FIRCLSOnboardingOperation *onboardingOperation;
 @property(nonatomic, strong) FIRCLSFileManager *fileManager;
 
-// set to YES once onboarding call has been made.
-@property(nonatomic) BOOL hasAttemptedAppConfigure;
-
 @property(nonatomic) NSDictionary *configuration;
 @property(nonatomic) NSDictionary *defaultConfiguration;
 @property(nonatomic, copy) NSString *googleAppID;
@@ -49,7 +43,7 @@ @interface FIRCLSSettingsOnboardingManager () <FIRCLSDownloadAndSaveSettingsOper
 
 @end
 
-@implementation FIRCLSSettingsOnboardingManager
+@implementation FIRCLSSettingsManager
 
 - (instancetype)initWithAppIDModel:(FIRCLSApplicationIdentifierModel *)appIDModel
                     installIDModel:(FIRCLSInstallIdentifierModel *)installIDModel
@@ -72,9 +66,9 @@ - (instancetype)initWithAppIDModel:(FIRCLSApplicationIdentifierModel *)appIDMode
   return self;
 }
 
-- (void)beginSettingsAndOnboardingWithGoogleAppId:(NSString *)googleAppID
-                                            token:(FIRCLSDataCollectionToken *)token
-                                waitForCompletion:(BOOL)waitForCompletion {
+- (void)beginSettingsWithGoogleAppId:(NSString *)googleAppID
+                               token:(FIRCLSDataCollectionToken *)token
+                   waitForCompletion:(BOOL)waitForCompletion {
   NSParameterAssert(googleAppID);
 
   self.googleAppID = googleAppID;
@@ -93,10 +87,8 @@ - (void)beginSettingsAndOnboardingWithGoogleAppId:(NSString *)googleAppID
 #pragma mark Helper methods
 
 /**
- * Makes a settings download request. If the request fails, the error is handled silently(with a log
- * statement). If the server response indicates onboarding is needed, an onboarding request is sent
- * to the server. If the onboarding request fails, the error is handled silently(with a log
- * statement).
+ * Makes a settings download request. If the request fails, the error is handled silently (with a
+ * log statement).
  */
 - (void)beginSettingsDownload:(FIRCLSDataCollectionToken *)token
             waitForCompletion:(BOOL)waitForCompletion {
@@ -126,56 +118,10 @@ - (void)beginSettingsDownload:(FIRCLSDataCollectionToken *)token
   }
 }
 
-- (void)beginOnboarding:(BOOL)appCreate
-         endpointString:(NSString *)endpoint
-                  token:(FIRCLSDataCollectionToken *)token {
-  [self.onboardingOperation cancel];
-
-  self.onboardingOperation =
-      [[FIRCLSOnboardingOperation alloc] initWithDelegate:self
-                                             shouldCreate:appCreate
-                                              googleAppID:self.googleAppID
-                         kitVersionsByKitBundleIdentifier:self.kitVersionsByKitBundleIdentifier
-                                       appIdentifierModel:self.appIDModel
-                                           endpointString:endpoint
-                                            networkClient:self.networkClient
-                                                    token:token
-                                                 settings:self.settings];
-
-  [self.onboardingOperation startWithToken:token];
-}
-
 - (void)finishNetworkingSession {
   [self.networkClient invalidateAndCancel];
 }
 
-#pragma mark FIRCLSOnboardingOperationDelegate methods
-
-- (void)onboardingOperation:(FIRCLSOnboardingOperation *)operation
-    didCompleteAppCreationWithError:(nullable NSError *)error {
-  if (error) {
-    FIRCLSErrorLog(@"Unable to complete application configure: %@", error);
-    [self finishNetworkingSession];
-    return;
-  }
-  self.onboardingOperation = nil;
-  FIRCLSDebugLog(@"Completed configure");
-
-  // now, go get settings, as they can change (and it completes the onboarding process)
-  [self beginSettingsDownload:operation.token waitForCompletion:NO];
-}
-
-- (void)onboardingOperation:(FIRCLSOnboardingOperation *)operation
-    didCompleteAppUpdateWithError:(nullable NSError *)error {
-  [self finishNetworkingSession];
-  if (error) {
-    FIRCLSErrorLog(@"Unable to complete application update: %@", error);
-    return;
-  }
-  self.onboardingOperation = nil;
-  FIRCLSDebugLog(@"Completed application update");
-}
-
 #pragma mark FIRCLSDownloadAndSaveSettingsOperationDelegate methods
 
 - (void)operation:(FIRCLSDownloadAndSaveSettingsOperation *)operation
@@ -199,32 +145,6 @@ - (void)operation:(FIRCLSDownloadAndSaveSettingsOperation *)operation
   NSTimeInterval currentTimestamp = [NSDate timeIntervalSinceReferenceDate];
   [self.settings cacheSettingsWithGoogleAppID:self.googleAppID currentTimestamp:currentTimestamp];
 
-  // only try this once
-  if (self.hasAttemptedAppConfigure) {
-    FIRCLSDebugLog(@"App already onboarded in this run of the app");
-    [self finishNetworkingSession];
-    return;
-  }
-
-  // Onboarding is still needed in Firebase, here are the backend app states -
-  // 1. When the app is created in the Firebase console, app state: built (client settings call
-  // returns app status: new)
-  // 2. After onboarding call is made, app state: build_configured
-  // 3. Another settings call is triggered after onboarding, app state: activated
-  if ([self.settings appNeedsOnboarding]) {
-    FIRCLSDebugLog(@"Starting onboarding with app create");
-    self.hasAttemptedAppConfigure = YES;
-    [self beginOnboarding:YES endpointString:FIRCLSConfigureEndpoint token:operation.token];
-    return;
-  }
-
-  if ([self.settings appUpdateRequired]) {
-    FIRCLSDebugLog(@"Starting onboarding with app update");
-    self.hasAttemptedAppConfigure = YES;
-    [self beginOnboarding:NO endpointString:FIRCLSConfigureEndpoint token:operation.token];
-    return;
-  }
-
   // we're all set!
   [self finishNetworkingSession];
 }

Crashlytics/Crashlytics/Settings/Operations/FIRCLSNetworkOperation.m

@@ -44,7 +44,7 @@ - (instancetype)initWithGoogleAppID:(NSString *)googleAppID
 }
 
 - (void)startWithToken:(FIRCLSDataCollectionToken *)token {
-  // Settings and Onboarding are considered data collection, so we must only
+  // Settings is considered data collection, so we must only
   // call this with a valid token
   if (![token isValid]) {
     FIRCLSErrorLog(@"Skipping network operation with invalid data collection token");