Remove usages of deprecated 'utils.ios.getter' function #1324

Author: EddyVerbruggen

src/admob/admob.ios.ts

@@ -1,6 +1,5 @@
 import { device } from "tns-core-modules/platform/platform";
 import { DeviceType } from "tns-core-modules/ui/enums/enums";
-import { ios as iOSUtils } from "tns-core-modules/utils/utils";
 import { firebase } from "../firebase-common";
 import { BannerOptions, InterstitialOptions, PreloadRewardedVideoAdOptions, ShowRewardedVideoAdOptions } from "./admob";
 import { AD_SIZE, BANNER_DEFAULTS, rewardedVideoCallbacks } from "./admob-common";
@@ -26,7 +25,7 @@ export function showBanner(arg: BannerOptions): Promise<any> {
         firebase.admob.adView = null;
       }
 
-      BANNER_DEFAULTS.view = iOSUtils.getter(UIApplication, UIApplication.sharedApplication).keyWindow.rootViewController.view;
+      BANNER_DEFAULTS.view = UIApplication.sharedApplication.keyWindow.rootViewController.view;
       const settings = firebase.merge(arg, BANNER_DEFAULTS);
       _bannerOptions = settings;
       const view = settings.view;
@@ -61,8 +60,8 @@ export function showBanner(arg: BannerOptions): Promise<any> {
         adRequest.keywords = settings.keywords;
       }
 
-      firebase.admob.adView.rootViewController = iOSUtils.getter(UIApplication, UIApplication.sharedApplication).keyWindow.rootViewController;
-      // var statusbarFrame = iOSUtils.getter(UIApplication, UIApplication.sharedApplication).statusBarFrame;
+      firebase.admob.adView.rootViewController = UIApplication.sharedApplication.keyWindow.rootViewController;
+      // var statusbarFrame = UIApplication.sharedApplication.statusBarFrame;
 
       firebase.admob.adView.loadRequest(adRequest);
 
@@ -141,7 +140,7 @@ export function showInterstitial(arg?: InterstitialOptions): Promise<any> {
       // if no arg is passed, the interstitial has probably been preloaded
       if (!arg) {
         if (firebase.admob.interstitialView) {
-          firebase.admob.interstitialView.presentFromRootViewController(iOSUtils.getter(UIApplication, UIApplication.sharedApplication).keyWindow.rootViewController);
+          firebase.admob.interstitialView.presentFromRootViewController(UIApplication.sharedApplication.keyWindow.rootViewController);
           resolve();
         } else {
           reject("Please call 'preloadInterstitial' first");
@@ -158,7 +157,7 @@ export function showInterstitial(arg?: InterstitialOptions): Promise<any> {
           reject(error.localizedDescription);
         } else {
           // now we can safely show it
-          firebase.admob.interstitialView.presentFromRootViewController(iOSUtils.getter(UIApplication, UIApplication.sharedApplication).keyWindow.rootViewController);
+          firebase.admob.interstitialView.presentFromRootViewController(UIApplication.sharedApplication.keyWindow.rootViewController);
           resolve();
         }
         CFRelease(delegate);
@@ -268,7 +267,7 @@ export function showRewardedVideoAd(arg?: ShowRewardedVideoAdOptions): Promise<a
         rewardedVideoCallbacks.onCompleted = arg.onCompleted;
       }
 
-      firebase.admob.rewardedAdVideoView.presentFromRootViewController(iOSUtils.getter(UIApplication, UIApplication.sharedApplication).keyWindow.rootViewController);
+      firebase.admob.rewardedAdVideoView.presentFromRootViewController(UIApplication.sharedApplication.keyWindow.rootViewController);
       resolve();
 
     } catch (ex) {
@@ -315,7 +314,7 @@ function _getBannerType(size): any {
     // return kGADAdSizeSkyscraper;
     return {"size": {"width": 120, "height": 600}, "flags": 0};
   } else if (size === AD_SIZE.SMART_BANNER || size === AD_SIZE.FLUID) {
-    const orientation = iOSUtils.getter(UIDevice, UIDevice.currentDevice).orientation;
+    const orientation = UIDevice.currentDevice.orientation;
     const isIPad = device.deviceType === DeviceType.Tablet;
     if (orientation === UIDeviceOrientation.Portrait || orientation === UIDeviceOrientation.PortraitUpsideDown) {
       // return kGADAdSizeSmartBannerPortrait;

src/messaging/messaging.ios.ts

@@ -1,15 +1,10 @@
-import * as application from "tns-core-modules/application/application";
 import * as applicationSettings from "tns-core-modules/application-settings";
-import { ios as iOSUtils } from "tns-core-modules/utils/utils";
+import * as application from "tns-core-modules/application/application";
 import { device } from "tns-core-modules/platform/platform";
-import { firebaseUtils } from "../utils";
-import { firebase } from "../firebase-common";
-import {
-  IosInteractiveNotificationAction,
-  IosInteractiveNotificationCategory,
-  IosInteractiveNotificationType
-} from "./messaging";
 import { MessagingOptions } from "../firebase";
+import { firebase } from "../firebase-common";
+import { firebaseUtils } from "../utils";
+import { IosInteractiveNotificationAction, IosInteractiveNotificationCategory, IosInteractiveNotificationType } from "./messaging";
 
 let _notificationActionTakenCallback: Function;
 let _pendingNotifications: Array<any> = [];
@@ -235,9 +230,8 @@ export function registerForInteractivePush(model?: PushNotificationModel): void
     nativeCategories.push(nativeCategory);
   });
 
-  const center = iOSUtils.getter(UNUserNotificationCenter, UNUserNotificationCenter.currentNotificationCenter);
   const nsSetCategories = <NSSet<UNNotificationCategory>>new NSSet(<any>nativeCategories);
-  center.setNotificationCategories(nsSetCategories);
+  UNUserNotificationCenter.currentNotificationCenter().setNotificationCategories(nsSetCategories);
 
   if (model.onNotificationActionTakenCallback) {
     _addOnNotificationActionTakenCallback(model.onNotificationActionTakenCallback);
@@ -341,11 +335,9 @@ export class NotificationActionResponse {
 }
 
 export function areNotificationsEnabled() {
-  let app = iOSUtils.getter(UIApplication, UIApplication.sharedApplication);
-
   // to check if also the app is registered use app.registeredForRemoteNotifications,
   // this below checks if user has enabled notifications for the app
-  return app.currentUserNotificationSettings.types > 0;
+  return UIApplication.sharedApplication.currentUserNotificationSettings.types > 0;
 }
 
 const updateUserInfo = userInfoJSON => {
@@ -367,7 +359,7 @@ const updateUserInfo = userInfoJSON => {
 };
 
 function _registerForRemoteNotifications(resolve?, reject?) {
-  let app = iOSUtils.getter(UIApplication, UIApplication.sharedApplication);
+  let app = UIApplication.sharedApplication;
   if (!app) {
     application.on("launch", () => _registerForRemoteNotifications(resolve, reject));
     return;
@@ -385,11 +377,10 @@ function _registerForRemoteNotifications(resolve?, reject?) {
 
   if (parseInt(device.osVersion) >= 10) {
     const authorizationOptions = UNAuthorizationOptions.Alert | UNAuthorizationOptions.Sound | UNAuthorizationOptions.Badge;
-    const curNotCenter = iOSUtils.getter(UNUserNotificationCenter, UNUserNotificationCenter.currentNotificationCenter);
-    curNotCenter.requestAuthorizationWithOptionsCompletionHandler(authorizationOptions, (granted, error) => {
+    UNUserNotificationCenter.currentNotificationCenter().requestAuthorizationWithOptionsCompletionHandler(authorizationOptions, (granted, error) => {
       if (!error) {
         if (app === null) {
-          app = iOSUtils.getter(UIApplication, UIApplication.sharedApplication);
+          app = UIApplication.sharedApplication;
         }
         if (app !== null) {
           // see https://developer.apple.com/documentation/uikit/uiapplication/1623078-registerforremotenotifications
@@ -421,15 +412,15 @@ function _registerForRemoteNotifications(resolve?, reject?) {
           }
         }
 
-        userInfoJSON.foreground = iOSUtils.getter(UIApplication, UIApplication.sharedApplication).applicationState === UIApplicationState.Active;
+        userInfoJSON.foreground = UIApplication.sharedApplication.applicationState === UIApplicationState.Active;
 
         _pendingNotifications.push(userInfoJSON);
         if (_receivedNotificationCallback) {
           _processPendingNotifications();
         }
       });
 
-      curNotCenter.delegate = _userNotificationCenterDelegate;
+      UNUserNotificationCenter.currentNotificationCenter().delegate = _userNotificationCenterDelegate;
     }
 
     if (typeof (FIRMessaging) !== "undefined") {
@@ -444,7 +435,7 @@ function _registerForRemoteNotifications(resolve?, reject?) {
           userInfoJSON.body = asJs.body;
         }
 
-        const app = iOSUtils.getter(UIApplication, UIApplication.sharedApplication);
+        const app = UIApplication.sharedApplication;
         if (app.applicationState === UIApplicationState.Active) {
           userInfoJSON.foreground = true;
           if (_receivedNotificationCallback) {
@@ -481,7 +472,7 @@ function _addOnNotificationActionTakenCallback(callback: Function) {
 }
 
 function _processPendingNotifications() {
-  const app = iOSUtils.getter(UIApplication, UIApplication.sharedApplication);
+  const app = UIApplication.sharedApplication;
   if (!app) {
     application.on("launch", () => _processPendingNotifications());
     return;
@@ -499,7 +490,7 @@ function _processPendingNotifications() {
 }
 
 function _processPendingActionTakenNotifications() {
-  const app = iOSUtils.getter(UIApplication, UIApplication.sharedApplication);
+  const app = UIApplication.sharedApplication;
   if (!app) {
     application.on("launch", () => _processPendingNotifications());
     return;