Merge pull request #40 from rbeiter/updates/minor-updates

Minor demo updates
twilio · Jun 11, 2018 · 94f8cb5 · 94f8cb5
2 parents 4cf5a7b + 145711d
commit 94f8cb5
Show file tree

Hide file tree

Showing 35 changed files with 104 additions and 43 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,54 @@
+<!-- Check the following before filing an issue -->
+> Before filing an issue please check that the issue is not already addressed by the following:
+>  * [Github Issues](https://github.com/twilio/twilio-chat-demo-ios/issues)
+>  * [Changelog](https://www.twilio.com/docs/api/chat/changelogs/ios)
+
+### Description
+
+[Description of the issue]
+
+### Steps to Reproduce
+
+1. [Step one]
+2. [Step two]
+3. [Insert as many steps as needed]
+
+#### Code (optional)
+
+```objective-c
+// Sample code that shows how to reproduce the issue
+```
+
+#### Expected Behavior
+
+[What you expect to happen]
+
+#### Actual Behavior
+
+[What actually happens]
+
+#### Reproduces how Often
+
+[What percentage of the time does it reproduce?]
+
+#### Logs
+
+Please collect logs as described [here](https://www.twilio.com/docs/api/chat/guides/error-handling-and-diagnostics#logging). Full unedited logs help reproduce and fix issues faster.
+
+*NOTE:* For security and privacy, these logs should not be submitted through the github issue but via Twilio's [support portal](https://support.twilio.com/hc/en-us/requests/new).
+
+### Versions
+
+All relevant version information for issue.
+
+#### Chat iOS SDK
+
+[eg. 1.0.0]
+
+#### iOS Version
+
+[eg. 11.0]
+
+#### Device
+
+[eg. iPhone X]
diff --git a/Demo-ObjC.xcodeproj/project.pbxproj b/Demo-ObjC.xcodeproj/project.pbxproj
@@ -174,7 +174,7 @@
 		58223AAF1B69571C00F0DF97 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = Twilio;
 				TargetAttributes = {
 					58223AB61B69571C00F0DF97 = {
@@ -272,12 +272,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -326,12 +328,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

diff --git a/Demo-ObjC/AppDelegate.h b/Demo-ObjC/AppDelegate.h
@@ -2,7 +2,7 @@
 //  AppDelegate.h
 //  Twilio Chat Demo
 //
-//  Copyright (c) 2017 Twilio, Inc. All rights reserved.
+//  Copyright (c) 2018 Twilio, Inc. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

diff --git a/Demo-ObjC/AppDelegate.m b/Demo-ObjC/AppDelegate.m
@@ -2,7 +2,7 @@
 //  AppDelegate.m
 //  Twilio Chat Demo
 //
-//  Copyright (c) 2017 Twilio, Inc. All rights reserved.
+//  Copyright (c) 2018 Twilio, Inc. All rights reserved.
 //
 
 #import "AppDelegate.h"

diff --git a/Demo-ObjC/Base.lproj/LaunchScreen.xib b/Demo-ObjC/Base.lproj/LaunchScreen.xib
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1212" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
         <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -16,7 +16,7 @@
             <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2011-2017 Twilio. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2011-2018 Twilio, Inc. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
                     <rect key="frame" x="20" y="439.5" width="440" height="21"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>

diff --git a/Demo-ObjC/ChannelListViewController.h b/Demo-ObjC/ChannelListViewController.h
@@ -2,7 +2,7 @@
 //  ChannelListViewController.h
 //  Twilio Chat Demo
 //
-//  Copyright (c) 2017 Twilio, Inc. All rights reserved.
+//  Copyright (c) 2018 Twilio, Inc. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

diff --git a/Demo-ObjC/ChannelListViewController.m b/Demo-ObjC/ChannelListViewController.m
@@ -2,7 +2,7 @@
 //  ChannelListViewController.m
 //  Twilio Chat Demo
 //
-//  Copyright (c) 2017 Twilio, Inc. All rights reserved.
+//  Copyright (c) 2018 Twilio, Inc. All rights reserved.
 //
 
 #import "ChannelListViewController.h"

diff --git a/Demo-ObjC/ChannelTableViewCell.h b/Demo-ObjC/ChannelTableViewCell.h
@@ -2,7 +2,7 @@
 //  ChannelTableViewCell.h
 //  Twilio Chat Demo
 //
-//  Copyright (c) 2017 Twilio, Inc. All rights reserved.
+//  Copyright (c) 2018 Twilio, Inc. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

diff --git a/Demo-ObjC/ChannelTableViewCell.m b/Demo-ObjC/ChannelTableViewCell.m
@@ -2,7 +2,7 @@
 //  ChannelTableViewCell.m
 //  Twilio Chat Demo
 //
-//  Copyright (c) 2017 Twilio, Inc. All rights reserved.
+//  Copyright (c) 2018 Twilio, Inc. All rights reserved.
 //
 
 #import "ChannelTableViewCell.h"

diff --git a/Demo-ObjC/ChannelViewController.h b/Demo-ObjC/ChannelViewController.h
@@ -2,7 +2,7 @@
 //  ChannelViewController.h
 //  Twilio Chat Demo
 //
-//  Copyright (c) 2017 Twilio, Inc. All rights reserved.
+//  Copyright (c) 2018 Twilio, Inc. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

diff --git a/Demo-ObjC/ChannelViewController.m b/Demo-ObjC/ChannelViewController.m
@@ -2,7 +2,7 @@
 //  ChannelViewController.m
 //  Twilio Chat Demo
 //
-//  Copyright (c) 2017 Twilio, Inc. All rights reserved.
+//  Copyright (c) 2018 Twilio, Inc. All rights reserved.
 //
 
 #import "ChannelViewController.h"
@@ -73,7 +73,9 @@ - (void)sharedInit {
 
 - (void)dealloc {
     if (self.channel) {
-        self.channel.delegate = nil;
+        if (self.channel.delegate == self) {
+            self.channel.delegate = nil;
+        }
 
         [[NSNotificationCenter defaultCenter] removeObserver:self];
     }
@@ -447,7 +449,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 
             if (cachedImage) {
                 cachedImage = [DemoHelpers image:cachedImage
-                                    scaledToWith:imageMessageCell.messageImageView.frame.size.width];
+                                   scaledToWidth:imageMessageCell.messageImageView.frame.size.width];
                 [imageMessageCell.messageImageView setImage:cachedImage];
             } else {
                 [imageMessageCell showProgress];

diff --git a/Demo-ObjC/ChatManager.h b/Demo-ObjC/ChatManager.h
@@ -2,7 +2,7 @@
 //  ChatManager.h
 //  Twilio Chat Demo
 //
-//  Copyright (c) 2017 Twilio, Inc. All rights reserved.
+//  Copyright (c) 2018 Twilio, Inc. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

diff --git a/Demo-ObjC/ChatManager.m b/Demo-ObjC/ChatManager.m
@@ -2,7 +2,7 @@
 //  ChatManager.m
 //  Twilio Chat Demo
 //
-//  Copyright (c) 2017 Twilio, Inc. All rights reserved.
+//  Copyright (c) 2018 Twilio, Inc. All rights reserved.
 //
 
 #import "AppDelegate.h"

diff --git a/Demo-ObjC/DemoHelpers.h b/Demo-ObjC/DemoHelpers.h
@@ -2,7 +2,7 @@
 //  DemoHelpers.h
 //  Twilio Chat Demo
 //
-//  Copyright (c) 2017 Twilio, Inc. All rights reserved.
+//  Copyright (c) 2018 Twilio, Inc. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>
@@ -165,6 +165,6 @@
  @return The scaled (or original) image.
  */
 + (nonnull UIImage *)image:(nonnull UIImage *)image
-              scaledToWith:(CGFloat)width;
+             scaledToWidth:(CGFloat)width;
 
 @end
diff --git a/Demo-ObjC/DemoHelpers.m b/Demo-ObjC/DemoHelpers.m
@@ -2,7 +2,7 @@
 //  DemoHelpers.m
 //  Twilio Chat Demo
 //
-//  Copyright (c) 2017 Twilio, Inc. All rights reserved.
+//  Copyright (c) 2018 Twilio, Inc. All rights reserved.
 //
 
 #import <QuartzCore/QuartzCore.h>
@@ -311,7 +311,7 @@ + (void)loadImageForMessage:(TCHMessage *)message
     });
 }
 
-+ (UIImage *)image:(UIImage *)image scaledToWith:(CGFloat)width {
++ (UIImage *)image:(UIImage *)image scaledToWidth:(CGFloat)width {
     if (image.size.width <= width) {
         return image;
     }
@@ -565,8 +565,7 @@ + (UIView *)createMessagePopup:(NSString *)message
 
 + (NSString *)mediaFilenameForMessage:(TCHMessage *)message {
     NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
-    NSString *cacheDirectory = [paths objectAtIndex:0];
-    NSString *mediaDirectory = cacheDirectory;
+    NSString *mediaDirectory = [paths objectAtIndex:0];
     return [mediaDirectory stringByAppendingPathComponent:[NSString stringWithFormat:@"%@-%@", message.mediaSid, message.mediaFilename ? message.mediaFilename : @"attachment.dat"]];
 }
 

diff --git a/Demo-ObjC/ImageMessageTableViewCell.h b/Demo-ObjC/ImageMessageTableViewCell.h
@@ -2,7 +2,7 @@
 //  ImageMessageTableViewCell.h
 //  Twilio Chat Demo
 //
-//  Copyright (c) 2017 Twilio, Inc. All rights reserved.
+//  Copyright (c) 2018 Twilio, Inc. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

diff --git a/Demo-ObjC/ImageMessageTableViewCell.m b/Demo-ObjC/ImageMessageTableViewCell.m
@@ -2,7 +2,7 @@
 //  ImageMessageTableViewCell.m
 //  Twilio Chat Demo
 //
-//  Copyright (c) 2017 Twilio, Inc. All rights reserved.
+//  Copyright (c) 2018 Twilio, Inc. All rights reserved.
 //
 
 #import "ImageMessageTableViewCell.h"

diff --git a/Demo-ObjC/LoginViewController.h b/Demo-ObjC/LoginViewController.h
@@ -2,7 +2,7 @@
 //  LoginViewController.h
 //  Twilio Chat Demo
 //
-//  Copyright (c) 2017 Twilio, Inc. All rights reserved.
+//  Copyright (c) 2018 Twilio, Inc. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

diff --git a/Demo-ObjC/LoginViewController.m b/Demo-ObjC/LoginViewController.m
@@ -2,7 +2,7 @@
 //  LoginViewController.m
 //  Twilio Chat Demo
 //
-//  Copyright (c) 2017 Twilio, Inc. All rights reserved.
+//  Copyright (c) 2018 Twilio, Inc. All rights reserved.
 //
 
 #import "AppDelegate.h"

diff --git a/Demo-ObjC/MemberTypingTableViewCell.h b/Demo-ObjC/MemberTypingTableViewCell.h
@@ -2,7 +2,7 @@
 //  MemberTypingTableViewCell.h
 //  Twilio Chat Demo
 //
-//  Copyright (c) 2017 Twilio, Inc. All rights reserved.
+//  Copyright (c) 2018 Twilio, Inc. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

diff --git a/Demo-ObjC/MemberTypingTableViewCell.m b/Demo-ObjC/MemberTypingTableViewCell.m
@@ -2,7 +2,7 @@
 //  MemberTypingTableViewCell.m
 //  Twilio Chat Demo
 //
-//  Copyright (c) 2017 Twilio, Inc. All rights reserved.
+//  Copyright (c) 2018 Twilio, Inc. All rights reserved.
 //
 
 #import "MemberTypingTableViewCell.h"

diff --git a/Demo-ObjC/MessageTableViewCell.h b/Demo-ObjC/MessageTableViewCell.h
@@ -2,7 +2,7 @@
 //  MessageTableViewCell.h
 //  Twilio Chat Demo
 //
-//  Copyright (c) 2017 Twilio, Inc. All rights reserved.
+//  Copyright (c) 2018 Twilio, Inc. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

diff --git a/Demo-ObjC/MessageTableViewCell.m b/Demo-ObjC/MessageTableViewCell.m
@@ -2,7 +2,7 @@
 //  MessageTableViewCell.m
 //  Twilio Chat Demo
 //
-//  Copyright (c) 2017 Twilio, Inc. All rights reserved.
+//  Copyright (c) 2018 Twilio, Inc. All rights reserved.
 //
 
 #import "MessageTableViewCell.h"

diff --git a/Demo-ObjC/PublicChannelListViewController.h b/Demo-ObjC/PublicChannelListViewController.h
@@ -2,7 +2,7 @@
 //  PublicChannelListViewController.h
 //  Twilio Chat Demo
 //
-//  Copyright (c) 2017 Twilio, Inc. All rights reserved.
+//  Copyright (c) 2018 Twilio, Inc. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

diff --git a/Demo-ObjC/PublicChannelListViewController.m b/Demo-ObjC/PublicChannelListViewController.m
@@ -2,7 +2,7 @@
 //  PublicChannelListViewController.m
 //  Twilio Chat Demo
 //
-//  Copyright (c) 2017 Twilio, Inc. All rights reserved.
+//  Copyright (c) 2018 Twilio, Inc. All rights reserved.
 //
 
 #import "PublicChannelListViewController.h"

diff --git a/Demo-ObjC/ReactionView.h b/Demo-ObjC/ReactionView.h
@@ -3,7 +3,7 @@
 //  Demo-ObjC
 //
 //  Created by Randy Beiter on 6/26/16.
-//  Copyright (c) 2017 Twilio, Inc. All rights reserved.
+//  Copyright (c) 2018 Twilio, Inc. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

diff --git a/Demo-ObjC/ReactionView.m b/Demo-ObjC/ReactionView.m
@@ -3,7 +3,7 @@
 //  Demo-ObjC
 //
 //  Created by Randy Beiter on 6/26/16.
-//  Copyright (c) 2017 Twilio, Inc. All rights reserved.
+//  Copyright (c) 2018 Twilio, Inc. All rights reserved.
 //
 
 #import <QuartzCore/QuartzCore.h>

diff --git a/Demo-ObjC/ReactionsView.h b/Demo-ObjC/ReactionsView.h
@@ -3,7 +3,7 @@
 //  Demo-ObjC
 //
 //  Created by Randy Beiter on 6/26/16.
-//  Copyright (c) 2017 Twilio, Inc. All rights reserved.
+//  Copyright (c) 2018 Twilio, Inc. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

diff --git a/Demo-ObjC/ReactionsView.m b/Demo-ObjC/ReactionsView.m
@@ -3,7 +3,7 @@
 //  Demo-ObjC
 //
 //  Created by Randy Beiter on 6/26/16.
-//  Copyright (c) 2017 Twilio, Inc. All rights reserved.
+//  Copyright (c) 2018 Twilio, Inc. All rights reserved.
 //
 
 #import "ReactionsView.h"