expo-cellular 4.0.0 → 4.1.0

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 4.1.0 — 2021-12-03
+
+### 💡 Others
+
+- Removed legacy Objective-C implementation and changed the pod name to `ExpoCellular`. ([#15082](https://github.com/expo/expo/pull/15082) by [@tsapeta](https://github.com/tsapeta))
+
 ## 4.0.0 — 2021-09-28
 
 ### 🛠 Breaking changes

package/README.md

@@ -13,7 +13,7 @@ For managed [managed](https://docs.expo.io/versions/latest/introduction/managed-
 
 # Installation in bare React Native projects
 
-For bare React Native projects, you must ensure that you have [installed and configured the `react-native-unimodules` package](https://github.com/expo/expo/tree/master/packages/react-native-unimodules) before continuing.
+For bare React Native projects, you must ensure that you have [installed and configured the `expo` package](https://docs.expo.dev/bare/installing-expo-modules/) before continuing.
 
 ### Add the package to your npm dependencies
 

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven'
 
 group = 'host.exp.exponent'
-version = '4.0.0'
+version = '4.1.0'
 
 buildscript {
   // Simple helper that allows the root project to override versions declared by this library.
@@ -53,11 +53,15 @@ android {
     targetCompatibility JavaVersion.VERSION_1_8
   }
 
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_1_8
+  }
+
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 30)
     versionCode 11
-    versionName '4.0.0'
+    versionName '4.1.0'
   }
   lintOptions {
     abortOnError false

package/android/src/main/java/expo/modules/cellular/CellularModule.kt

@@ -6,68 +6,62 @@ import android.net.sip.SipManager
 import android.os.Build
 import android.telephony.TelephonyManager
 import android.util.Log
-import expo.modules.core.ExportedModule
-import expo.modules.core.Promise
-import expo.modules.core.interfaces.ExpoMethod
-import expo.modules.core.interfaces.RegistryLifecycleListener
-import java.util.*
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
 
-class CellularModule(private val mContext: Context) : ExportedModule(mContext), RegistryLifecycleListener {
-  override fun getName(): String = "ExpoCellular"
+const val moduleName = "ExpoCellular"
 
-  private fun telephonyManager() =
-    (mContext.getSystemService(Context.TELEPHONY_SERVICE) as? TelephonyManager).takeIf {
-      it?.simState == TelephonyManager.SIM_STATE_READY
+class CellularModule : Module() {
+  override fun definition() = ModuleDefinition {
+    name(moduleName)
+    constants {
+      val telephonyManager = telephonyManager()
+      mapOf(
+        "allowsVoip" to SipManager.isVoipSupported(context),
+        "isoCountryCode" to telephonyManager?.simCountryIso,
+        "carrier" to telephonyManager?.simOperatorName,
+        "mobileCountryCode" to telephonyManager?.simOperator?.substring(0, 3),
+        "mobileNetworkCode" to telephonyManager?.simOperator?.substring(3)
+      )
     }
 
-  override fun getConstants() =
-    HashMap<String, Any?>().apply {
-      val telephonyManager = telephonyManager()
-      put("allowsVoip", SipManager.isVoipSupported(mContext))
-      put("isoCountryCode", telephonyManager?.simCountryIso)
-      put("carrier", telephonyManager?.simOperatorName)
-      put("mobileCountryCode", telephonyManager?.simOperator?.substring(0, 3))
-      put("mobileNetworkCode", telephonyManager?.simOperator?.substring(3))
+    function("getCellularGenerationAsync") {
+      try {
+        getCurrentGeneration()
+      } catch (e: SecurityException) {
+        Log.w(moduleName, "READ_PHONE_STATE permission is required to acquire network type", e)
+        CellularGeneration.UNKNOWN.value
+      }
     }
 
-  @ExpoMethod
-  fun getCellularGenerationAsync(promise: Promise) {
-    try {
-      promise.resolve(getCurrentGeneration())
-    } catch (e: SecurityException) {
-      Log.w(name, "READ_PHONE_STATE permission is required to acquire network type", e)
-      promise.resolve(CellularGeneration.UNKNOWN.value)
+    function("allowsVoipAsync") {
+      SipManager.isVoipSupported(context)
     }
-  }
 
-  @ExpoMethod
-  fun allowsVoipAsync(promise: Promise) {
-    promise.resolve(SipManager.isVoipSupported(mContext))
-  }
+    function("getIsoCountryCodeAsync") {
+      telephonyManager()?.simCountryIso
+    }
 
-  @ExpoMethod
-  fun getIsoCountryCodeAsync(promise: Promise) {
-    val telephonyManager = telephonyManager()
-    promise.resolve(telephonyManager?.simCountryIso)
-  }
+    function("getCarrierNameAsync") {
+      telephonyManager()?.simOperatorName
+    }
 
-  @ExpoMethod
-  fun getCarrierNameAsync(promise: Promise) {
-    val telephonyManager = telephonyManager()
-    promise.resolve(telephonyManager?.simOperatorName)
-  }
+    function("getMobileCountryCodeAsync") {
+      telephonyManager()?.simOperator?.substring(0, 3)
+    }
 
-  @ExpoMethod
-  fun getMobileCountryCodeAsync(promise: Promise) {
-    val telephonyManager = telephonyManager()
-    promise.resolve(telephonyManager?.simOperator?.substring(0, 3))
+    function("getMobileNetworkCodeAsync") {
+      telephonyManager()?.simOperator?.substring(3)
+    }
   }
 
-  @ExpoMethod
-  fun getMobileNetworkCodeAsync(promise: Promise) {
-    val telephonyManager = telephonyManager()
-    promise.resolve(telephonyManager?.simOperator?.substring(3))
-  }
+  private fun telephonyManager() =
+    (context.getSystemService(Context.TELEPHONY_SERVICE) as? TelephonyManager).takeIf {
+      it?.simState == TelephonyManager.SIM_STATE_READY
+    }
+
+  private val context
+    get() = requireNotNull(appContext.reactContext)
 
   @SuppressLint("MissingPermission")
   private fun getCurrentGeneration(): Int {

package/build/ExpoCellular.web.js

@@ -16,10 +16,7 @@ export default {
         return null;
     },
     async getCellularGenerationAsync() {
-        const connection = navigator['connection'] ||
-            navigator['mozConnection'] ||
-            navigator['webkitConnection'] ||
-            null;
+        const connection = navigator.connection || navigator.mozConnection || navigator.webkitConnection || null;
         if (connection !== null) {
             switch (connection.effectiveType) {
                 case 'slow-2g':

package/build/ExpoCellular.web.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoCellular.web.js","sourceRoot":"","sources":["../src/ExpoCellular.web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,eAAe;IACb,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,OAAO;QACT,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,KAAK,CAAC,0BAA0B;QAC9B,MAAM,UAAU,GACd,SAAS,CAAC,YAAY,CAAC;YACvB,SAAS,CAAC,eAAe,CAAC;YAC1B,SAAS,CAAC,kBAAkB,CAAC;YAC7B,IAAI,CAAC;QACP,IAAI,UAAU,KAAK,IAAI,EAAE;YACvB,QAAQ,UAAU,CAAC,aAAa,EAAE;gBAChC,KAAK,SAAS,CAAC;gBACf,KAAK,IAAI;oBACP,OAAO,kBAAkB,CAAC,WAAW,CAAC;gBACxC,KAAK,IAAI;oBACP,OAAO,kBAAkB,CAAC,WAAW,CAAC;gBACxC,KAAK,IAAI;oBACP,OAAO,kBAAkB,CAAC,WAAW,CAAC;gBACxC;oBACE,OAAO,kBAAkB,CAAC,OAAO,CAAC;aACrC;SACF;aAAM;YACL,OAAO,kBAAkB,CAAC,OAAO,CAAC;SACnC;IACH,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,KAAK,CAAC,sBAAsB;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,KAAK,CAAC,mBAAmB;QACvB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,KAAK,CAAC,yBAAyB;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,KAAK,CAAC,yBAAyB;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAC","sourcesContent":["import { CellularGeneration } from './Cellular.types';\n\nexport default {\n  get allowsVoip(): null {\n    return null;\n  },\n  get carrier(): null {\n    return null;\n  },\n  get isoCountryCode(): null {\n    return null;\n  },\n  get mobileCountryCode(): null {\n    return null;\n  },\n  get mobileNetworkCode(): null {\n    return null;\n  },\n  async getCellularGenerationAsync(): Promise<CellularGeneration> {\n    const connection =\n      navigator['connection'] ||\n      navigator['mozConnection'] ||\n      navigator['webkitConnection'] ||\n      null;\n    if (connection !== null) {\n      switch (connection.effectiveType) {\n        case 'slow-2g':\n        case '2g':\n          return CellularGeneration.CELLULAR_2G;\n        case '3g':\n          return CellularGeneration.CELLULAR_3G;\n        case '4g':\n          return CellularGeneration.CELLULAR_4G;\n        default:\n          return CellularGeneration.UNKNOWN;\n      }\n    } else {\n      return CellularGeneration.UNKNOWN;\n    }\n  },\n\n  async allowsVoipAsync(): Promise<boolean | null> {\n    return null;\n  },\n  async getIsoCountryCodeAsync(): Promise<string | null> {\n    return null;\n  },\n  async getCarrierNameAsync(): Promise<string | null> {\n    return null;\n  },\n  async getMobileCountryCodeAsync(): Promise<string | null> {\n    return null;\n  },\n  async getMobileNetworkCodeAsync(): Promise<string | null> {\n    return null;\n  },\n};\n"]}
+{"version":3,"file":"ExpoCellular.web.js","sourceRoot":"","sources":["../src/ExpoCellular.web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,eAAe;IACb,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,OAAO;QACT,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,KAAK,CAAC,0BAA0B;QAC9B,MAAM,UAAU,GACd,SAAS,CAAC,UAAU,IAAI,SAAS,CAAC,aAAa,IAAI,SAAS,CAAC,gBAAgB,IAAI,IAAI,CAAC;QACxF,IAAI,UAAU,KAAK,IAAI,EAAE;YACvB,QAAQ,UAAU,CAAC,aAAa,EAAE;gBAChC,KAAK,SAAS,CAAC;gBACf,KAAK,IAAI;oBACP,OAAO,kBAAkB,CAAC,WAAW,CAAC;gBACxC,KAAK,IAAI;oBACP,OAAO,kBAAkB,CAAC,WAAW,CAAC;gBACxC,KAAK,IAAI;oBACP,OAAO,kBAAkB,CAAC,WAAW,CAAC;gBACxC;oBACE,OAAO,kBAAkB,CAAC,OAAO,CAAC;aACrC;SACF;aAAM;YACL,OAAO,kBAAkB,CAAC,OAAO,CAAC;SACnC;IACH,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,KAAK,CAAC,sBAAsB;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,KAAK,CAAC,mBAAmB;QACvB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,KAAK,CAAC,yBAAyB;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,KAAK,CAAC,yBAAyB;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAC","sourcesContent":["import { CellularGeneration } from './Cellular.types';\n\nexport default {\n  get allowsVoip(): null {\n    return null;\n  },\n  get carrier(): null {\n    return null;\n  },\n  get isoCountryCode(): null {\n    return null;\n  },\n  get mobileCountryCode(): null {\n    return null;\n  },\n  get mobileNetworkCode(): null {\n    return null;\n  },\n  async getCellularGenerationAsync(): Promise<CellularGeneration> {\n    const connection =\n      navigator.connection || navigator.mozConnection || navigator.webkitConnection || null;\n    if (connection !== null) {\n      switch (connection.effectiveType) {\n        case 'slow-2g':\n        case '2g':\n          return CellularGeneration.CELLULAR_2G;\n        case '3g':\n          return CellularGeneration.CELLULAR_3G;\n        case '4g':\n          return CellularGeneration.CELLULAR_4G;\n        default:\n          return CellularGeneration.UNKNOWN;\n      }\n    } else {\n      return CellularGeneration.UNKNOWN;\n    }\n  },\n\n  async allowsVoipAsync(): Promise<boolean | null> {\n    return null;\n  },\n  async getIsoCountryCodeAsync(): Promise<string | null> {\n    return null;\n  },\n  async getCarrierNameAsync(): Promise<string | null> {\n    return null;\n  },\n  async getMobileCountryCodeAsync(): Promise<string | null> {\n    return null;\n  },\n  async getMobileNetworkCodeAsync(): Promise<string | null> {\n    return null;\n  },\n};\n"]}

package/expo-module.config.json

@@ -3,5 +3,8 @@
   "platforms": ["ios", "android", "web"],
   "ios": {
     "modulesClassNames": ["CellularModule"]
+  },
+  "android": {
+    "modulesClassNames": ["expo.modules.cellular.CellularModule"]
   }
 }

package/ios/{EXCellular/CellularModule.swift → CellularModule.swift}

@@ -4,25 +4,32 @@ import ExpoModulesCore
 public class CellularModule: Module {
   public func definition() -> ModuleDefinition {
     name("ExpoCellular")
+
     constants {
       Self.getCurrentCellularInfo()
     }
-    method("getCellularGenerationAsync") { () -> Int in
+
+    function("getCellularGenerationAsync") { () -> Int in
       Self.currentCellularGeneration().rawValue
     }
-    method("allowsVoipAsync") { () -> Bool? in
+
+    function("allowsVoipAsync") { () -> Bool? in
       Self.currentCarrier()?.allowsVOIP
     }
-    method("getIsoCountryCodeAsync") { () -> String? in
+
+    function("getIsoCountryCodeAsync") { () -> String? in
       Self.currentCarrier()?.isoCountryCode
     }
-    method("getCarrierNameAsync") { () -> String? in
+
+    function("getCarrierNameAsync") { () -> String? in
       Self.currentCarrier()?.carrierName
     }
-    method("getMobileCountryCodeAsync") { () -> String? in
+
+    function("getMobileCountryCodeAsync") { () -> String? in
       Self.currentCarrier()?.mobileCountryCode
     }
-    method("getMobileNetworkCodeAsync") { () -> String? in
+
+    function("getMobileNetworkCodeAsync") { () -> String? in
       Self.currentCarrier()?.mobileNetworkCode
     }
   }

package/ios/{EXCellular.podspec → ExpoCellular.podspec}

@@ -3,7 +3,7 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, '..', 'package.json')))
 
 Pod::Spec.new do |s|
-  s.name           = 'EXCellular'
+  s.name           = 'ExpoCellular'
   s.version        = package['version']
   s.summary        = package['description']
   s.description    = package['description']
@@ -19,13 +19,14 @@ Pod::Spec.new do |s|
 
   # Swift/Objective-C compatibility
   s.pod_target_xcconfig = {
-    'DEFINES_MODULE' => 'YES'
+    'DEFINES_MODULE' => 'YES',
+    'SWIFT_COMPILATION_MODE' => 'wholemodule'
   }
 
   if !$ExpoUseSources&.include?(package['name']) && ENV['EXPO_USE_SOURCE'].to_i == 0 && File.exist?("#{s.name}.xcframework") && Gem::Version.new(Pod::VERSION) >= Gem::Version.new('1.10.0')
-    s.source_files = "#{s.name}/**/*.h"
+    s.source_files = "**/*.h"
     s.vendored_frameworks = "#{s.name}.xcframework"
   else
-    s.source_files = "#{s.name}/**/*.{h,m,swift}"
+    s.source_files = "**/*.{h,m,swift}"
   end
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-cellular",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "Provides information about the user’s cellular service provider",
   "main": "build/Cellular.js",
   "types": "build/Cellular.d.ts",
@@ -29,8 +29,12 @@
   "author": "650 Industries, Inc.",
   "license": "MIT",
   "homepage": "https://docs.expo.dev/versions/latest/sdk/cellular/",
+  "dependencies": {},
   "devDependencies": {
     "expo-module-scripts": "^2.0.0"
   },
-  "gitHead": "1fffde73411ee7a642b98f1506a8de921805d52b"
+  "peerDependencies": {
+    "expo": "*"
+  },
+  "gitHead": "2e5c6983b86d5ecfca028ba64002897d8adc2cc4"
 }

package/plugin/build/withCellular.js

@@ -9,4 +9,4 @@ const withCellular = (config) => {
     ]);
     return config;
 };
-exports.default = config_plugins_1.createRunOncePlugin(withCellular, pkg.name, pkg.version);
+exports.default = (0, config_plugins_1.createRunOncePlugin)(withCellular, pkg.name, pkg.version);

package/src/ExpoCellular.web.ts

@@ -18,10 +18,7 @@ export default {
   },
   async getCellularGenerationAsync(): Promise<CellularGeneration> {
     const connection =
-      navigator['connection'] ||
-      navigator['mozConnection'] ||
-      navigator['webkitConnection'] ||
-      null;
+      navigator.connection || navigator.mozConnection || navigator.webkitConnection || null;
     if (connection !== null) {
       switch (connection.effectiveType) {
         case 'slow-2g':

package/src/ts-declarations/lib.dom.d.ts

@@ -0,0 +1,18 @@
+// Expose this file as a module (see https://stackoverflow.com/a/59499895/4337317)
+export {};
+
+/**
+ * Handle deprecations and missing typings that not available in the main lib.dom.d.ts file.
+ */
+declare global {
+  type EffectiveConnectionType = '2g' | '3g' | '4g' | 'slow-2g';
+
+  interface NetworkInformation {
+    readonly effectiveType: EffectiveConnectionType;
+  }
+
+  interface Navigator {
+    readonly mozConnection?: NetworkInformation;
+    readonly webkitConnection?: NetworkInformation;
+  }
+}

package/android/src/main/java/expo/modules/cellular/CellularPackage.kt

@@ -1,9 +0,0 @@
-package expo.modules.cellular
-
-import android.content.Context
-import expo.modules.core.BasePackage
-
-class CellularPackage : BasePackage() {
-  override fun createExportedModules(context: Context) =
-    listOf(CellularModule(context))
-}

package/ios/EXCellular/EXCellularModule.h

@@ -1,23 +0,0 @@
-//  Copyright © 2018 650 Industries. All rights reserved.
-
-#import <ExpoModulesCore/EXExportedModule.h>
-#import <ExpoModulesCore/EXModuleRegistryConsumer.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-// Keep this enum in sync with JavaScript
-// Based on the EffectiveConnectionType enum described in the W3C Network Information API spec
-// (https://wicg.github.io/netinfo/).
-typedef NS_ENUM(NSInteger, EXCellularGeneration) {
-  EXCellularGenerationUnknown = 0,
-  EXCellularGeneration2G,
-  EXCellularGeneration3G,
-  EXCellularGeneration4G,
-  EXCellularGeneration5G,
-};
-
-@interface EXCellularModule : EXExportedModule <EXModuleRegistryConsumer>
-
-@end
-
-NS_ASSUME_NONNULL_END

package/ios/EXCellular/EXCellularModule.m

@@ -1,153 +0,0 @@
-// Copyright 2018-present 650 Industries. All rights reserved.
-
-#import <EXCellular/EXCellularModule.h>
-
-#import <CoreTelephony/CTCarrier.h>
-#import <CoreTelephony/CTTelephonyNetworkInfo.h>
-
-
-@interface EXCellularModule ()
-
-@property (nonatomic, weak) EXModuleRegistry *moduleRegistry;
-
-@end
-
-@implementation EXCellularModule
-
-EX_EXPORT_MODULE(ExpoCellular);
-
-- (void)setModuleRegistry:(EXModuleRegistry *)moduleRegistry
-{
-  _moduleRegistry = moduleRegistry;
-}
-
-- (NSDictionary *)constantsToExport
-{
-  CTCarrier *carrier = [self carrier];
-
-  return [self getCurrentCellularInfo];
-}
-
-EX_EXPORT_METHOD_AS(getCellularGenerationAsync, getCellularGenerationAsyncWithResolver:(EXPromiseResolveBlock)resolve rejecter:(EXPromiseRejectBlock)reject)
-{
-  resolve(@([[self class] getCellularGeneration]));
-}
-
-EX_EXPORT_METHOD_AS(allowsVoipAsync, allowsVoipAsyncWithResolver:(EXPromiseResolveBlock)resolve rejecter:(EXPromiseRejectBlock)reject)
-{
-  resolve(@([self allowsVoip]));
-}
-
-EX_EXPORT_METHOD_AS(getIsoCountryCodeAsync, getIsoCountryCodeAsyncWithResolver:(EXPromiseResolveBlock)resolve rejecter:(EXPromiseRejectBlock)reject)
-{
-  resolve([self getIsoCountryCode]);
-}
-
-EX_EXPORT_METHOD_AS(getCarrierNameAsync, getCarrierNameAsyncWithResolver:(EXPromiseResolveBlock)resolve rejecter:(EXPromiseRejectBlock)reject)
-{
-  resolve([self getCarrierName]);
-}
-
-EX_EXPORT_METHOD_AS(getMobileCountryCodeAsync, getMobileCountryCodeAsyncWithResolver:(EXPromiseResolveBlock)resolve rejecter:(EXPromiseRejectBlock)reject)
-{
-  resolve([self getMobileCountryCode]);
-}
-
-EX_EXPORT_METHOD_AS(getMobileNetworkCodeAsync, getMobileNetworkCodeAsyncWithResolver:(EXPromiseResolveBlock)resolve rejecter:(EXPromiseRejectBlock)reject)
-{
-  resolve([self getMobileNetworkCode]);
-}
-
-+ (EXCellularGeneration)getCellularGeneration
-{
-  CTTelephonyNetworkInfo *netinfo = [[CTTelephonyNetworkInfo alloc] init];
-  NSString *serviceCurrentRadioAccessTechnology;
-  if (@available(iOS 12.0, *)) {
-    serviceCurrentRadioAccessTechnology = netinfo.serviceCurrentRadioAccessTechnology.allValues.firstObject;
-  } else {
-    // Fallback on earlier versions
-    serviceCurrentRadioAccessTechnology = netinfo.currentRadioAccessTechnology;
-  }
-
-  if (netinfo) {
-    if ([serviceCurrentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyGPRS] ||
-        [serviceCurrentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyEdge] ||
-        [serviceCurrentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyCDMA1x]) {
-      return EXCellularGeneration2G;
-    } else if ([serviceCurrentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyWCDMA] ||
-               [serviceCurrentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyHSDPA] ||
-               [serviceCurrentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyHSUPA] ||
-               [serviceCurrentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyCDMAEVDORev0] ||
-               [serviceCurrentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyCDMAEVDORevA] ||
-               [serviceCurrentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyCDMAEVDORevB] ||
-               [serviceCurrentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyeHRPD]) {
-      return EXCellularGeneration3G;
-    } else if ([serviceCurrentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyLTE]) {
-      return EXCellularGeneration4G;
-    } else if (@available(iOS 14.1, *) &&
-               ([serviceCurrentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyNRNSA] ||
-                [serviceCurrentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyNR])) {
-      return EXCellularGeneration5G;
-    }
-  }
-  return EXCellularGenerationUnknown;
-}
-
-
-- (CTCarrier *)carrier
-{
-  CTTelephonyNetworkInfo *netinfo = [[CTTelephonyNetworkInfo alloc] init];
-
-  if (@available(iOS 12.0, *)) {
-    for (NSString *key in netinfo.serviceSubscriberCellularProviders) {
-      CTCarrier *carrier = netinfo.serviceSubscriberCellularProviders[key];
-      if (carrier.carrierName != nil) {
-        return carrier;
-      }
-    }
-
-    return [[netinfo.serviceSubscriberCellularProviders objectEnumerator] nextObject];
-  }
-
-  return netinfo.subscriberCellularProvider;
-}
-
-- (NSDictionary *)getCurrentCellularInfo
-{
-  CTCarrier *carrier = [self carrier];
-
-  return @{
-    @"allowsVoip": @(carrier.allowsVOIP),
-    @"carrier": EXNullIfNil(carrier.carrierName),
-    @"isoCountryCode": EXNullIfNil(carrier.isoCountryCode),
-    @"mobileCountryCode": EXNullIfNil(carrier.mobileCountryCode),
-    @"mobileNetworkCode": EXNullIfNil(carrier.mobileNetworkCode),
-  };
-}
-
-- (BOOL)allowsVoip
-{
-  return [self carrier].allowsVOIP;
-}
-
-- (NSString *)getIsoCountryCode
-{
-  return [self carrier].isoCountryCode;
-}
-
-- (NSString *)getCarrierName
-{
-  return [self carrier].carrierName;
-}
-
-- (NSString *)getMobileCountryCode
-{
-  return [self carrier].mobileCountryCode;
-}
-
-- (NSString *)getMobileNetworkCode
-{
-  return [self carrier].mobileNetworkCode;
-}
-
-@end