re-enable style script for messaging (#4858)

Author: charlotteliang

Example/Messaging/App/iOS/NotificationService/NotificationService.m

@@ -18,26 +18,29 @@
 
 @interface NotificationService ()
 
-@property (nonatomic, strong) void (^contentHandler)(UNNotificationContent *contentToDeliver);
-@property (nonatomic, strong) UNMutableNotificationContent *bestAttemptContent;
+@property(nonatomic, strong) void (^contentHandler)(UNNotificationContent *contentToDeliver);
+@property(nonatomic, strong) UNMutableNotificationContent *bestAttemptContent;
 
 @end
 
 @implementation NotificationService
 
-- (void)didReceiveNotificationRequest:(UNNotificationRequest *)request withContentHandler:(void (^)(UNNotificationContent * _Nonnull))contentHandler {
-    self.contentHandler = contentHandler;
-    self.bestAttemptContent = [request.content mutableCopy];
+- (void)didReceiveNotificationRequest:(UNNotificationRequest *)request
+                   withContentHandler:(void (^)(UNNotificationContent *_Nonnull))contentHandler {
+  self.contentHandler = contentHandler;
+  self.bestAttemptContent = [request.content mutableCopy];
 
-    // Modify the notification content here...
-    self.bestAttemptContent.title = [NSString stringWithFormat:@"%@ [modified]", self.bestAttemptContent.title];
+  // Modify the notification content here...
+  self.bestAttemptContent.title =
+      [NSString stringWithFormat:@"%@ [modified]", self.bestAttemptContent.title];
 
-    self.contentHandler(self.bestAttemptContent);
+  self.contentHandler(self.bestAttemptContent);
 }
 
 - (void)serviceExtensionTimeWillExpire {
-    // Called just before the extension will be terminated by the system.
-    // Use this as an opportunity to deliver your "best attempt" at modified content, otherwise the original push payload will be used.
+  // Called just before the extension will be terminated by the system.
+  // Use this as an opportunity to deliver your "best attempt" at modified content, otherwise the
+  // original push payload will be used.
   self.contentHandler(self.bestAttemptContent);
 }
 

Example/Messaging/App/tvOS/AppDelegate.h

@@ -16,8 +16,6 @@
 
 @interface AppDelegate : UIResponder <UIApplicationDelegate>
 
-@property (strong, nonatomic) UIWindow *window;
-
+@property(strong, nonatomic) UIWindow *window;
 
 @end
-

Example/Messaging/App/tvOS/AppDelegate.m

@@ -20,38 +20,40 @@ @interface AppDelegate ()
 
 @implementation AppDelegate
 
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-    // Override point for customization after application launch.
-    return YES;
+- (BOOL)application:(UIApplication *)application
+    didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+  // Override point for customization after application launch.
+  return YES;
 }
 
-
 - (void)applicationWillResignActive:(UIApplication *)application {
-    // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-    // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
+  // Sent when the application is about to move from active to inactive state. This can occur for
+  // certain types of temporary interruptions (such as an incoming phone call or SMS message) or
+  // when the user quits the application and it begins the transition to the background state. Use
+  // this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates.
+  // Games should use this method to pause the game.
 }
 
-
 - (void)applicationDidEnterBackground:(UIApplication *)application {
-    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
-    // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+  // Use this method to release shared resources, save user data, invalidate timers, and store
+  // enough application state information to restore your application to its current state in case
+  // it is terminated later. If your application supports background execution, this method is
+  // called instead of applicationWillTerminate: when the user quits.
 }
 
-
 - (void)applicationWillEnterForeground:(UIApplication *)application {
-    // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
+  // Called as part of the transition from the background to the active state; here you can undo
+  // many of the changes made on entering the background.
 }
 
-
 - (void)applicationDidBecomeActive:(UIApplication *)application {
-    // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+  // Restart any tasks that were paused (or not yet started) while the application was inactive. If
+  // the application was previously in the background, optionally refresh the user interface.
 }
 
-
 - (void)applicationWillTerminate:(UIApplication *)application {
-    // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+  // Called when the application is about to terminate. Save data if appropriate. See also
+  // applicationDidEnterBackground:.
 }
 
-
 @end

Example/Messaging/App/tvOS/ViewController.h

@@ -16,6 +16,4 @@
 
 @interface ViewController : UIViewController
 
-
 @end
-

Example/Messaging/App/tvOS/ViewController.m

@@ -21,15 +21,13 @@ @interface ViewController ()
 @implementation ViewController
 
 - (void)viewDidLoad {
-    [super viewDidLoad];
-    // Do any additional setup after loading the view, typically from a nib.
+  [super viewDidLoad];
+  // Do any additional setup after loading the view, typically from a nib.
 }
 
-
 - (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
+  [super didReceiveMemoryWarning];
+  // Dispose of any resources that can be recreated.
 }
 
-
 @end

Example/Messaging/App/tvOS/main.m

@@ -15,8 +15,8 @@
 #import <UIKit/UIKit.h>
 #import "AppDelegate.h"
 
-int main(int argc, char * argv[]) {
-    @autoreleasepool {
-        return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
-    }
+int main(int argc, char* argv[]) {
+  @autoreleasepool {
+    return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
+  }
 }

Example/Messaging/Sample/iOS/AppDelegate.swift

@@ -21,7 +21,6 @@ import UserNotifications
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
-
   var window: UIWindow?
 
   static let isWithinUnitTest: Bool = {
@@ -53,7 +52,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     Messaging.messaging().delegate = self
     Messaging.messaging().shouldEstablishDirectChannel = true
     // Just for logging to the console when we establish/tear down our socket connection.
-    listenForDirectChannelStateChanges();
+    listenForDirectChannelStateChanges()
 
     NotificationsController.configure()
 
@@ -74,8 +73,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                    didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
     print("APNS Token: \(deviceToken.hexByteString)")
     NotificationCenter.default.post(name: APNSTokenReceivedNotification, object: nil)
-    if #available(iOS 8.0, *) {
-    } else {
+    if #available(iOS 8.0, *) {} else {
       // On iOS 7, receiving a device token also means our user notifications were granted, so fire
       // the notification to update our user notifications UI
       NotificationCenter.default.post(name: UserNotificationsChangedNotification, object: nil)
@@ -87,7 +85,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     NotificationCenter.default.post(name: UserNotificationsChangedNotification, object: nil)
   }
 
-  func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable : Any], fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
+  func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable: Any], fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
     print("application:didReceiveRemoteNotification:fetchCompletionHandler: called, with notification:")
     print("\(userInfo.jsonString ?? "{}")")
     completionHandler(.newData)
@@ -96,8 +94,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
   func applicationDidBecomeActive(_ application: UIApplication) {
     // If the app didn't start property due to an invalid GoogleService-Info.plist file, show an
     // alert to the developer.
-    if !SampleAppUtilities.appContainsRealServiceInfoPlist() &&
-       !AppDelegate.hasPresentedInvalidServiceInfoPlistAlert {
+    if !SampleAppUtilities.appContainsRealServiceInfoPlist(),
+      !AppDelegate.hasPresentedInvalidServiceInfoPlistAlert {
       if let vc = window?.rootViewController {
         SampleAppUtilities.presentAlertForInvalidServiceInfoPlistFrom(vc)
         AppDelegate.hasPresentedInvalidServiceInfoPlistAlert = true
@@ -132,20 +130,20 @@ extension AppDelegate: MessagingDelegate {
 }
 
 extension AppDelegate {
-    func listenForDirectChannelStateChanges() {
-        NotificationCenter.default.addObserver(self, selector: #selector(onMessagingDirectChannelStateChanged(_:)), name: .MessagingConnectionStateChanged, object: nil)
-    }
+  func listenForDirectChannelStateChanges() {
+    NotificationCenter.default.addObserver(self, selector: #selector(onMessagingDirectChannelStateChanged(_:)), name: .MessagingConnectionStateChanged, object: nil)
+  }
 
-    func onMessagingDirectChannelStateChanged(_ notification: Notification) {
-        print("FCM Direct Channel Established: \(Messaging.messaging().isDirectChannelEstablished)")
-    }
+  func onMessagingDirectChannelStateChanged(_ notification: Notification) {
+    print("FCM Direct Channel Established: \(Messaging.messaging().isDirectChannelEstablished)")
+  }
 }
 
 extension Dictionary {
   /// Utility method for printing Dictionaries as pretty-printed JSON.
   var jsonString: String? {
     if let jsonData = try? JSONSerialization.data(withJSONObject: self, options: [.prettyPrinted]),
-       let jsonString = String(data: jsonData, encoding: .utf8) {
+      let jsonString = String(data: jsonData, encoding: .utf8) {
       return jsonString
     }
     return nil

Example/Messaging/Sample/iOS/Data+MessagingExtensions.swift

@@ -20,6 +20,6 @@ extension Data {
   // Print Data as a string of bytes in hex, such as the common representation of APNs device tokens
   // See: http://stackoverflow.com/a/40031342/9849
   var hexByteString: String {
-    return self.map { String(format: "%02.2hhx", $0) }.joined()
+    return map { String(format: "%02.2hhx", $0) }.joined()
   }
 }

Example/Messaging/Sample/iOS/MessagingViewController.swift

@@ -19,10 +19,10 @@ import UIKit
 import FirebaseMessaging
 
 enum Row: String {
-  case apnsToken = "apnsToken"
-  case apnsStatus = "apnsStatus"
-  case requestAPNSPermissions = "requestAPNSPermissions"
-  case fcmToken = "fcmToken"
+  case apnsToken
+  case apnsStatus
+  case requestAPNSPermissions
+  case fcmToken
 }
 
 enum PermissionsButtonTitle: String {
@@ -33,7 +33,6 @@ enum PermissionsButtonTitle: String {
 }
 
 class MessagingViewController: UIViewController {
-
   let tableView: UITableView
 
   var sections = [[Row]]()
@@ -58,7 +57,7 @@ class MessagingViewController: UIViewController {
   override func loadView() {
     super.loadView()
     view = UIView(frame: CGRect.zero)
-    view.addSubview(self.tableView)
+    view.addSubview(tableView)
     // Ensure that the tableView always is the size of the view
     tableView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
   }
@@ -67,7 +66,7 @@ class MessagingViewController: UIViewController {
     super.viewDidLoad()
     let center = NotificationCenter.default
     center.addObserver(self,
-                       selector: #selector(onAPNSTokenReceived) ,
+                       selector: #selector(onAPNSTokenReceived),
                        name: APNSTokenReceivedNotification,
                        object: nil)
     center.addObserver(self,
@@ -88,8 +87,8 @@ class MessagingViewController: UIViewController {
     // Reload the appropriate cells
     updateAllowedNotificationTypes {
       if let tokenPath = self.indexPathFor(.apnsToken),
-         let statusPath = self.indexPathFor(.apnsStatus),
-         let requestPath = self.indexPathFor(.requestAPNSPermissions) {
+        let statusPath = self.indexPathFor(.apnsStatus),
+        let requestPath = self.indexPathFor(.requestAPNSPermissions) {
         self.updateIndexPaths(indexPaths: [tokenPath, statusPath, requestPath])
       }
     }
@@ -104,7 +103,7 @@ class MessagingViewController: UIViewController {
   func onUserNotificationSettingsChanged() {
     updateAllowedNotificationTypes {
       if let statusPath = self.indexPathFor(.apnsStatus),
-         let requestPath = self.indexPathFor(.requestAPNSPermissions) {
+        let requestPath = self.indexPathFor(.requestAPNSPermissions) {
         self.updateIndexPaths(indexPaths: [statusPath, requestPath])
       }
     }
@@ -117,7 +116,7 @@ class MessagingViewController: UIViewController {
   }
 
   fileprivate func updateAllowedNotificationTypes(_ completion: (() -> Void)?) {
-    NotificationsController.shared.getAllowedNotificationTypes { (types) in
+    NotificationsController.shared.getAllowedNotificationTypes { types in
       self.allowedNotificationTypes = types
       self.updateRequestAPNSButton()
       completion?()
@@ -137,14 +136,15 @@ class MessagingViewController: UIViewController {
     }
 
     requestPermissionsButton.isEnabled =
-        (allowedTypes.count == 1 && allowedTypes.first! == .silent)
+      (allowedTypes.count == 1 && allowedTypes.first! == .silent)
 
     let title: PermissionsButtonTitle =
-        (requestPermissionsButton.isEnabled ? .requestPermissions : .alreadyRequested)
+      (requestPermissionsButton.isEnabled ? .requestPermissions : .alreadyRequested)
     requestPermissionsButton.setTitle(title.rawValue, for: .normal)
   }
 
   // MARK: UI (Cells and Buttons) Defined as lazy properties
+
   lazy var apnsTableCell: UITableViewCell = {
     let cell = UITableViewCell(style: .subtitle, reuseIdentifier: Row.apnsToken.rawValue)
     cell.textLabel?.numberOfLines = 0
@@ -191,6 +191,7 @@ class MessagingViewController: UIViewController {
 }
 
 // MARK: - Configuring the table view and cells with information
+
 extension MessagingViewController {
   func resetTableContents() {
     sections.removeAll()
@@ -205,7 +206,6 @@ extension MessagingViewController {
     let fcmSection: [Row] = [.fcmToken]
     sections.append(fcmSection)
     sectionHeaderTitles.append("FCM Token")
-
   }
 
   func indexPathFor(_ rowId: Row) -> IndexPath? {
@@ -240,7 +240,7 @@ extension MessagingViewController {
 
   func configureCellWithAPNSStatus(_ cell: UITableViewCell) {
     if let allowedNotificationTypes = allowedNotificationTypes {
-      let displayableTypes: [String] = allowedNotificationTypes.map { return $0.rawValue }
+      let displayableTypes: [String] = allowedNotificationTypes.map { $0.rawValue }
       cell.detailTextLabel?.text = displayableTypes.joined(separator: ", ")
     } else {
       cell.detailTextLabel?.text = "Retrieving..."
@@ -259,6 +259,7 @@ extension MessagingViewController {
 }
 
 // MARK: - UITableViewDataSource
+
 extension MessagingViewController: UITableViewDataSource {
   func numberOfSections(in tableView: UITableView) -> Int {
     return sections.count
@@ -295,6 +296,7 @@ extension MessagingViewController: UITableViewDataSource {
 }
 
 // MARK: - UITableViewDelegate
+
 extension MessagingViewController: UITableViewDelegate {
   func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
     tableView.deselectRow(at: indexPath, animated: true)
@@ -315,18 +317,19 @@ extension MessagingViewController: UITableViewDelegate {
 }
 
 // MARK: - UI Controls
+
 extension MessagingViewController {
   func onRequestUserNotificationsButtonTapped(sender: UIButton) {
     NotificationsController.shared.registerForUserFacingNotificationsFor(UIApplication.shared)
   }
 }
 
 // MARK: - Activity View Controller
+
 extension MessagingViewController {
   func showActivityViewControllerFor(sharedItem: Any) {
     let activityViewController = UIActivityViewController(activityItems: [sharedItem],
                                                           applicationActivities: nil)
     present(activityViewController, animated: true, completion: nil)
   }
 }
-