Skip to content

Commit 16a9eb6

Browse files
author
Jaesung
authored
Merge pull request #56 from sendbird/release/1.1.2
Version 1.1.2 (Merge to master)
2 parents 8ea77cb + 2366a69 commit 16a9eb6

File tree

5 files changed

+14
-12
lines changed

5 files changed

+14
-12
lines changed

QuickStart.xcodeproj/project.pbxproj

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@
787787
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
788788
CODE_SIGN_ENTITLEMENTS = QuickStart/QuickStart.entitlements;
789789
CODE_SIGN_STYLE = Automatic;
790-
CURRENT_PROJECT_VERSION = 1;
790+
CURRENT_PROJECT_VERSION = 2;
791791
DEVELOPMENT_TEAM = RM4A5PXTUX;
792792
FRAMEWORK_SEARCH_PATHS = (
793793
"$(inherited)",
@@ -799,7 +799,7 @@
799799
"$(inherited)",
800800
"@executable_path/Frameworks",
801801
);
802-
MARKETING_VERSION = 1.1.1;
802+
MARKETING_VERSION = 1.1.2;
803803
PRODUCT_BUNDLE_IDENTIFIER = com.sendbird.calls.quickstart;
804804
PRODUCT_NAME = "SendBird Calls";
805805
SWIFT_VERSION = 5.0;
@@ -816,7 +816,7 @@
816816
CODE_SIGN_ENTITLEMENTS = QuickStart/QuickStart.entitlements;
817817
CODE_SIGN_IDENTITY = "Apple Development";
818818
CODE_SIGN_STYLE = Automatic;
819-
CURRENT_PROJECT_VERSION = 1;
819+
CURRENT_PROJECT_VERSION = 2;
820820
DEVELOPMENT_TEAM = RM4A5PXTUX;
821821
FRAMEWORK_SEARCH_PATHS = (
822822
"$(inherited)",
@@ -828,7 +828,7 @@
828828
"$(inherited)",
829829
"@executable_path/Frameworks",
830830
);
831-
MARKETING_VERSION = 1.1.1;
831+
MARKETING_VERSION = 1.1.2;
832832
PRODUCT_BUNDLE_IDENTIFIER = com.sendbird.calls.quickstart;
833833
PRODUCT_NAME = "SendBird Calls";
834834
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -841,6 +841,7 @@
841841
isa = XCBuildConfiguration;
842842
buildSettings = {
843843
CODE_SIGN_STYLE = Automatic;
844+
CURRENT_PROJECT_VERSION = 2;
844845
DEVELOPMENT_TEAM = RM4A5PXTUX;
845846
INFOPLIST_FILE = QuickStartIntent/Info.plist;
846847
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
@@ -849,12 +850,12 @@
849850
"@executable_path/Frameworks",
850851
"@executable_path/../../Frameworks",
851852
);
852-
MARKETING_VERSION = 1.1.1;
853+
MARKETING_VERSION = 1.1.2;
853854
PRODUCT_BUNDLE_IDENTIFIER = com.sendbird.calls.quickstart.QuickStartIntent;
854855
PRODUCT_NAME = "$(TARGET_NAME)";
855856
SKIP_INSTALL = YES;
856857
SWIFT_VERSION = 5.0;
857-
TARGETED_DEVICE_FAMILY = "1,2";
858+
TARGETED_DEVICE_FAMILY = 1;
858859
};
859860
name = Debug;
860861
};
@@ -863,6 +864,7 @@
863864
buildSettings = {
864865
CODE_SIGN_IDENTITY = "Apple Development";
865866
CODE_SIGN_STYLE = Automatic;
867+
CURRENT_PROJECT_VERSION = 2;
866868
DEVELOPMENT_TEAM = RM4A5PXTUX;
867869
INFOPLIST_FILE = QuickStartIntent/Info.plist;
868870
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
@@ -871,12 +873,12 @@
871873
"@executable_path/Frameworks",
872874
"@executable_path/../../Frameworks",
873875
);
874-
MARKETING_VERSION = 1.1.1;
876+
MARKETING_VERSION = 1.1.2;
875877
PRODUCT_BUNDLE_IDENTIFIER = com.sendbird.calls.quickstart.QuickStartIntent;
876878
PRODUCT_NAME = "$(TARGET_NAME)";
877879
SKIP_INSTALL = YES;
878880
SWIFT_VERSION = 5.0;
879-
TARGETED_DEVICE_FAMILY = "1,2";
881+
TARGETED_DEVICE_FAMILY = 1;
880882
};
881883
name = Release;
882884
};

QuickStart/CallHistory/CallHistory.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ struct CallHistory: Codable {
3535
let remoteUser = callLog.myRole == .caller ? callLog.callee : callLog.caller
3636
self.remoteUserProfileURL = remoteUser?.profileURL
3737
self.remoteUserID = remoteUser?.userId ?? "Unknown"
38-
self.remoteNickname = remoteUser?.nickname ?? ""
38+
self.remoteNickname = (remoteUser?.nickname).unwrap(with: "-")
3939

4040
self.startedAt = CallHistory.dateFormatter.string(from: Date(timeIntervalSince1970: Double(callLog.startedAt) / 1000))
4141
self.duration = callLog.duration.timerText()

QuickStart/CallHistory/CallHistoryViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ class CallHistoryViewController: UIViewController, UITableViewDataSource, UITabl
132132
extension CallHistoryViewController {
133133
// When select table view cell, make a call based on its `CallHistory` information.
134134
func didTapCallHistoryCell(_ cell: CallHistoryTableViewCell) {
135-
guard let remoteUserID = cell.remoteNicknameLabel.text else { return }
135+
let remoteUserID = cell.callHistory.remoteUserID
136136
let isVideoCall = cell.callHistory.hasVideo
137137
let dialParams = DialParams(calleeId: remoteUserID,
138138
isVideoCall: isVideoCall,

QuickStart/Settings/SettingsTableViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class SettingsTableViewController: UITableViewController {
2222
}
2323
@IBOutlet weak var userIdLabel: UILabel! {
2424
didSet {
25-
self.userIdLabel.text = "User ID " + UserDefaults.standard.user.id
25+
self.userIdLabel.text = "User ID: " + UserDefaults.standard.user.id
2626
}
2727
}
2828

QuickStartIntent/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundleShortVersionString</key>
2020
<string>$(MARKETING_VERSION)</string>
2121
<key>CFBundleVersion</key>
22-
<string>1</string>
22+
<string>$(CURRENT_PROJECT_VERSION)</string>
2323
<key>NSExtension</key>
2424
<dict>
2525
<key>NSExtensionAttributes</key>

0 commit comments

Comments
 (0)