Depend on Google Utlities for device platform + Add Model information to session events. (#10508)

Author: visumickey

FirebaseSessions.podspec

@@ -39,12 +39,11 @@ Pod::Spec.new do |s|
     base_dir + 'Protogen/**/*.{c,h,m,mm}',
   ]
 
-  s.ios.framework = 'CoreTelephony'
   s.dependency 'FirebaseCore', '~> 10.0'
   s.dependency 'FirebaseCoreExtension', '~> 10.0'
   s.dependency 'FirebaseInstallations', '~> 10.0'
   s.dependency 'GoogleDataTransport', '~> 9.2'
-  s.dependency 'GoogleUtilities/Environment', '~> 7.8'
+  s.dependency 'GoogleUtilities/Environment', '~> 7.10'
   s.dependency 'nanopb', '>= 2.30908.0', '< 2.30910.0'
 
   s.pod_target_xcconfig = {

FirebaseSessions/Sources/ApplicationInfo.swift

@@ -38,6 +38,9 @@ protocol ApplicationInfoProtocol {
   /// Crashlytics-specific device / OS filter values.
   var osName: String { get }
 
+  /// Model of the device
+  var deviceModel: String { get }
+
   /// Validated Mobile Country Code and Mobile Network Code
   var mccMNC: String { get }
 
@@ -67,10 +70,15 @@ class ApplicationInfo: ApplicationInfoProtocol {
   }
 
   var osName: String {
-    // TODO: Update once https://github.com/google/GoogleUtilities/pull/89 is released
-    // to production, update this to GULAppEnvironmentUtil.appleDevicePlatform() and update
-    // the podfile to depend on the newest version of GoogleUtilities
-    return GULAppEnvironmentUtil.applePlatform()
+    return GULAppEnvironmentUtil.appleDevicePlatform()
+  }
+
+  var deviceModel: String {
+    #if targetEnvironment(simulator)
+      return GULAppEnvironmentUtil.deviceSimulatorModel() ?? ""
+    #else
+      return GULAppEnvironmentUtil.deviceModel() ?? ""
+    #endif // targetEnvironment(simulator)
   }
 
   var mccMNC: String {

FirebaseSessions/Sources/NanoPB/FIRSESNanoPBHelpers.h

@@ -82,12 +82,6 @@ BOOL FIRSESIsPBDataEqual(pb_bytes_array_t* _Nullable pbArray, NSData* _Nullable
 /// Swift does not support c-style macros.
 pb_size_t FIRSESGetAppleApplicationInfoTag(void);
 
-/// Returns the cellular mobile country code (mnc) if CoreTelephony is supported, otherwise nil
-NSString* _Nullable FIRSESNetworkMobileCountryCode(void);
-
-/// Returns the cellular mobile network code (mnc) if CoreTelephony is supported, otherwise nil
-NSString* _Nullable FIRSESNetworkMobileNetworkCode(void);
-
 /// Returns the validated MccMnc if it is available, or nil if the device does not support telephone
 NSString* _Nullable FIRSESValidateMccMnc(NSString* _Nullable mcc, NSString* _Nullable mnc);
 

FirebaseSessions/Sources/NanoPB/FIRSESNanoPBHelpers.m

@@ -15,6 +15,8 @@
 
 #import <Foundation/Foundation.h>
 
+#import <GoogleUtilities/GULNetworkInfo.h>
+
 #import "FirebaseSessions/Sources/NanoPB/FIRSESNanoPBHelpers.h"
 
 #import "FirebaseSessions/Protogen/nanopb/sessions.nanopb.h"
@@ -155,35 +157,6 @@ pb_size_t FIRSESGetAppleApplicationInfoTag(void) {
   return firebase_appquality_sessions_ApplicationInfo_apple_app_info_tag;
 }
 
-#ifdef TARGET_HAS_MOBILE_CONNECTIVITY
-CTTelephonyNetworkInfo *_Nullable FIRSESNetworkInfo(void) {
-  static CTTelephonyNetworkInfo *networkInfo;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    networkInfo = [[CTTelephonyNetworkInfo alloc] init];
-  });
-  return networkInfo;
-}
-#endif
-
-NSString *_Nullable FIRSESNetworkMobileCountryCode(void) {
-#ifdef TARGET_HAS_MOBILE_CONNECTIVITY
-  CTTelephonyNetworkInfo *networkInfo = FIRSESNetworkInfo();
-  CTCarrier *provider = networkInfo.subscriberCellularProvider;
-  return provider.mobileCountryCode;
-#endif
-  return nil;
-}
-
-NSString *_Nullable FIRSESNetworkMobileNetworkCode(void) {
-#ifdef TARGET_HAS_MOBILE_CONNECTIVITY
-  CTTelephonyNetworkInfo *networkInfo = FIRSESNetworkInfo();
-  CTCarrier *provider = networkInfo.subscriberCellularProvider;
-  return provider.mobileNetworkCode;
-#endif
-  return nil;
-}
-
 NSString *_Nullable FIRSESValidateMccMnc(NSString *_Nullable mcc, NSString *_Nullable mnc) {
   // These are both nil if the target does not support mobile connectivity
   if (mcc == nil && mnc == nil) {

FirebaseSessions/Sources/NetworkInfo.swift

@@ -14,6 +14,9 @@
 // limitations under the License.
 
 import Foundation
+
+@_implementationOnly import GoogleUtilities
+
 protocol NetworkInfoProtocol {
   var mobileCountryCode: String? { get }
 
@@ -22,10 +25,10 @@ protocol NetworkInfoProtocol {
 
 class NetworkInfo: NetworkInfoProtocol {
   var mobileCountryCode: String? {
-    return FIRSESNetworkMobileCountryCode()
+    return GULNetworkInfo.getNetworkMobileCountryCode()
   }
 
   var mobileNetworkCode: String? {
-    return FIRSESNetworkMobileNetworkCode()
+    return GULNetworkInfo.getNetworkMobileNetworkCode()
   }
 }

FirebaseSessions/Sources/SessionStartEvent.swift

@@ -39,7 +39,7 @@ class SessionStartEvent: NSObject, GDTCOREventDataObject {
     proto.application_info.app_id = makeProtoString(appInfo.appID)
     proto.application_info.session_sdk_version = makeProtoString(appInfo.sdkVersion)
     proto.application_info.log_environment = convertLogEnvironment(environment: appInfo.environment)
-//    proto.application_info.device_model = makeProtoString(appInfo.deviceModel)
+    proto.application_info.device_model = makeProtoString(appInfo.deviceModel)
 //    proto.application_info.development_platform_name;
 //    proto.application_info.development_platform_version;
 

FirebaseSessions/Tests/TestApp/Podfile.lock

@@ -0,0 +1,79 @@
+PODS:
+  - FirebaseCore (10.2.0):
+    - FirebaseCoreInternal (~> 10.0)
+    - GoogleUtilities/Environment (~> 7.8)
+    - GoogleUtilities/Logger (~> 7.8)
+  - FirebaseCoreExtension (10.2.0):
+    - FirebaseCore (~> 10.0)
+  - FirebaseCoreInternal (10.2.0):
+    - "GoogleUtilities/NSData+zlib (~> 7.8)"
+  - FirebaseInstallations (10.2.0):
+    - FirebaseCore (~> 10.0)
+    - GoogleUtilities/Environment (~> 7.8)
+    - GoogleUtilities/UserDefaults (~> 7.8)
+    - PromisesObjC (~> 2.1)
+  - FirebaseSessions (10.0.0):
+    - FirebaseCore (~> 10.0)
+    - FirebaseCoreExtension (~> 10.0)
+    - FirebaseInstallations (~> 10.0)
+    - GoogleDataTransport (~> 9.2)
+    - GoogleUtilities/Environment (~> 7.10)
+    - nanopb (< 2.30910.0, >= 2.30908.0)
+  - GoogleDataTransport (9.2.0):
+    - GoogleUtilities/Environment (~> 7.7)
+    - nanopb (< 2.30910.0, >= 2.30908.0)
+    - PromisesObjC (< 3.0, >= 1.2)
+  - GoogleUtilities/Environment (7.10.0):
+    - PromisesObjC (< 3.0, >= 1.2)
+  - GoogleUtilities/Logger (7.10.0):
+    - GoogleUtilities/Environment
+  - "GoogleUtilities/NSData+zlib (7.10.0)"
+  - GoogleUtilities/UserDefaults (7.10.0):
+    - GoogleUtilities/Logger
+  - nanopb (2.30909.0):
+    - nanopb/decode (= 2.30909.0)
+    - nanopb/encode (= 2.30909.0)
+  - nanopb/decode (2.30909.0)
+  - nanopb/encode (2.30909.0)
+  - PromisesObjC (2.1.1)
+
+DEPENDENCIES:
+  - FirebaseCore (from `../../../`)
+  - FirebaseCoreExtension (from `../../../`)
+  - FirebaseCoreInternal (from `../../../`)
+  - FirebaseInstallations (from `../../../`)
+  - FirebaseSessions (from `../../../`)
+
+SPEC REPOS:
+  trunk:
+    - GoogleDataTransport
+    - GoogleUtilities
+    - nanopb
+    - PromisesObjC
+
+EXTERNAL SOURCES:
+  FirebaseCore:
+    :path: "../../../"
+  FirebaseCoreExtension:
+    :path: "../../../"
+  FirebaseCoreInternal:
+    :path: "../../../"
+  FirebaseInstallations:
+    :path: "../../../"
+  FirebaseSessions:
+    :path: "../../../"
+
+SPEC CHECKSUMS:
+  FirebaseCore: 813838072b797b64f529f3c2ee35e696e5641dd1
+  FirebaseCoreExtension: d08b424832917cf13612021574399afbbedffeef
+  FirebaseCoreInternal: 091bde13e47bb1c5e9fe397634f3593dc390430f
+  FirebaseInstallations: 004915af170935e3a583faefd5f8bc851afc220f
+  FirebaseSessions: 154d37bbda55072f2d6b6d0013778bf69d2e2e52
+  GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f
+  GoogleUtilities: bad72cb363809015b1f7f19beb1f1cd23c589f95
+  nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
+  PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb
+
+PODFILE CHECKSUM: 1a003bf06c05ee635d13a4c6a952942ff7e13dd0
+
+COCOAPODS: 1.11.3

FirebaseSessions/Tests/Unit/Mocks/MockApplicationInfo.swift

@@ -26,6 +26,8 @@ class MockApplicationInfo: ApplicationInfoProtocol {
 
   var osName: String = ""
 
+  var deviceModel: String = ""
+
   var mccMNC: String = ""
 
   var environment: DevEnvironment = .prod
@@ -35,6 +37,7 @@ class MockApplicationInfo: ApplicationInfoProtocol {
   static let testSDKVersion = "testSDKVersion"
   static let testOSName = "ios"
   static let testMCCMNC = "testMCCMNC"
+  static let testDeviceModel = "testDeviceModel"
   static let testEnvironment: DevEnvironment = .prod
 
   func mockAllInfo() {
@@ -43,6 +46,7 @@ class MockApplicationInfo: ApplicationInfoProtocol {
     sdkVersion = MockApplicationInfo.testSDKVersion
     osName = MockApplicationInfo.testOSName
     mccMNC = MockApplicationInfo.testMCCMNC
+    deviceModel = MockApplicationInfo.testDeviceModel
     environment = MockApplicationInfo.testEnvironment
   }
 }

FirebaseSessions/Tests/Unit/SessionStartEventTests.swift

@@ -86,6 +86,11 @@ class SessionStartEventTests: XCTestCase {
         expected: MockApplicationInfo.testBundleID,
         fieldName: "bundle_short_version"
       )
+      assertEqualProtoString(
+        proto.application_info.device_model,
+        expected: MockApplicationInfo.testDeviceModel,
+        fieldName: "device_model"
+      )
       assertEqualProtoString(
         proto.application_info.apple_app_info.mcc_mnc,
         expected: MockApplicationInfo.testMCCMNC,