Swift formatting, add notifications

Author: Devin Rader

SwiftPhone/AppDelegate.swift

@@ -16,6 +16,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
         // Override point for customization after application launch.
+        if  UIApplication.instancesRespondToSelector(Selector("registerUserNotificationSettings:")) {
+            application.registerUserNotificationSettings(UIUserNotificationSettings(forTypes: UIUserNotificationType.Alert | UIUserNotificationType.Badge | UIUserNotificationType.Sound, categories: nil))
+        }
+
         return true
     }
 

SwiftPhone/Phone.swift

@@ -8,9 +8,9 @@
 
 import Foundation
 
-let SPDefaultClientName:String = "jenny";
+let SPDefaultClientName:String = "jenny"
 let SPBaseCapabilityTokenUrl:String = "http://example.com/generateToken?%@"
-let SPTwiMLAppSid:String = "APxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+let SPTwiMLAppSid:String = "APxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 
 public class Phone : NSObject, TCDeviceDelegate {
     var device:TCDevice!
@@ -19,57 +19,53 @@ public class Phone : NSObject, TCDeviceDelegate {
 
     func login() {
 
-        TwilioClient.sharedInstance().setLogLevel(TCLogLevel._LOG_VERBOSE);
+        TwilioClient.sharedInstance().setLogLevel(TCLogLevel._LOG_VERBOSE)
 
-        var url:String = self.getCapabilityTokenUrl();
+        var url:String = self.getCapabilityTokenUrl()
 
-        var swiftRequest = SwiftRequest();
+        var swiftRequest = SwiftRequest()
         swiftRequest.get(url, callback: { (err, response, body) -> () in
-            if (err != nil) {
-                return;
+            if err != nil {
+                return
             }
 
             var token = body as! String
-            println(token);
+            println(token)
 
-            if (err == nil && token != "")
-            {
-                if ( self.device == nil )
-                {
-                    self.device = TCDevice(capabilityToken: token as String, delegate: nil);
+            if err == nil && token != "" {
+                if self.device == nil {
+                    self.device = TCDevice(capabilityToken: token as String, delegate: nil)
                 }
-                else
-                {
-                    self.device!.updateCapabilityToken(token);
+                else {
+                    self.device!.updateCapabilityToken(token)
                 }
             }
-            else if ( err != nil && response != nil) {
+            else if err != nil && response != nil {
                 // We received and error with a response
             }
-            else if (err != nil) {
+            else if err != nil {
                 // We received an error without a response
             }
-        });
+        })
     }
 
     func getCapabilityTokenUrl() -> String {
 
-        var querystring:String = String();
+        var querystring:String = String()
 
-        querystring += String(format:"&sid=%@", SPTwiMLAppSid);
-        querystring += String(format:"&name=%@", SPDefaultClientName);
+        querystring += String(format:"&sid=%@", SPTwiMLAppSid)
+        querystring += String(format:"&name=%@", SPDefaultClientName)
 
-        return String(format:SPBaseCapabilityTokenUrl, querystring);
+        return String(format:SPBaseCapabilityTokenUrl, querystring)
     }
 
     func connectWithParams(params dictParams:Dictionary<String,String> = Dictionary<String,String>()) {
 
-        if (!self.capabilityTokenValid())
-        {
-            self.login();
+        if !self.capabilityTokenValid() {
+            self.login()
         }
 
-        self.connection = self.device?.connect(dictParams, delegate: nil);
+        self.connection = self.device?.connect(dictParams, delegate: nil)
     }
 
     func acceptConnection() {
@@ -90,21 +86,21 @@ public class Phone : NSObject, TCDeviceDelegate {
     }
 
     func capabilityTokenValid()->(Bool) {
-        var isValid:Bool = false;
+        var isValid:Bool = false
 
-        if (self.device != nil) {
+        if self.device != nil {
             var capabilities = self.device!.capabilities as NSDictionary;
 
             var expirationTimeObject:NSNumber = capabilities.objectForKey("expiration") as! NSNumber;
             var expirationTimeValue:Int64 = expirationTimeObject.longLongValue;
             var currentTimeValue:NSTimeInterval = NSDate().timeIntervalSince1970;
 
-            if( (expirationTimeValue-Int64(currentTimeValue)) > 0 ) {
+            if (expirationTimeValue-Int64(currentTimeValue)) > 0 {
                 isValid = true;
             }
         }
 
-        return isValid;
+        return isValid
     }
 
     public func deviceDidStartListeningForIncomingConnections(device: TCDevice)->() {

SwiftPhone/ViewController.swift

@@ -34,7 +34,6 @@ class ViewController: UIViewController {
         // Dispose of any resources that can be recreated.
     }
 
-
     @IBAction func btnCall(sender: AnyObject) {
         self.phone.connectWithParams();
     }
@@ -52,6 +51,13 @@ class ViewController: UIViewController {
     }
 
     func pendingIncomingConnectionReceived(notification:NSNotification) {
+        
+        if UIApplication.sharedApplication().applicationState != UIApplicationState.Active {
+            var notification:UILocalNotification = UILocalNotification()
+            notification.alertBody = "Incoming Call"
+            UIApplication.sharedApplication().presentLocalNotificationNow(notification)
+        }
+        
         self.btnAnswer.enabled = true
         self.btnReject.enabled = true
         self.btnIgnore.enabled = true