Initialize a video settings model in setting contoller.

Signed-off-by: Ivan Sein <ivan@nextcloud.com>
This commit is contained in:
Ivan Sein 2018-03-15 15:39:37 +01:00
Родитель 5125d06194
Коммит 9218e5d4ca
5 изменённых файлов: 10 добавлений и 7 удалений

Просмотреть файл

@ -14,6 +14,8 @@
2C0574A51EDDA2E300D9E7F2 /* LoginViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2C0574A31EDDA2E300D9E7F2 /* LoginViewController.xib */; };
2C06330F2046CC8B0043481A /* NCUserInterfaceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C06330E2046CC8B0043481A /* NCUserInterfaceController.m */; };
2C063313205A85850043481A /* VideoSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C063312205A85850043481A /* VideoSettingsViewController.m */; };
2C063314205AB8B90043481A /* ARDSettingsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D7D651F2F7DBC00FF4A0D /* ARDSettingsModel.m */; };
2C063315205AB8C40043481A /* ARDSettingsStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C4D7D681F2F7DBC00FF4A0D /* ARDSettingsStore.m */; };
2C2E64251F3462AF00D39CE8 /* NCSignalingMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C2E64241F3462AF00D39CE8 /* NCSignalingMessage.m */; };
2C3F6AA81FBB1ACD00E2705C /* NotificationService.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C3F6AA71FBB1ACD00E2705C /* NotificationService.m */; };
2C3F6AAC1FBB1ACD00E2705C /* NotificationServiceExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 2C3F6AA41FBB1ACC00E2705C /* NotificationServiceExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
@ -974,9 +976,11 @@
files = (
2C3F6AB61FBB47B800E2705C /* NCAPIController.m in Sources */,
2C3F6AB91FBB4C9D00E2705C /* NCUser.m in Sources */,
2C063314205AB8B90043481A /* ARDSettingsModel.m in Sources */,
2CBF82BA1FD5A1E500636459 /* CCCertificate.m in Sources */,
2CBF82B71FD0939600636459 /* NCAPISessionManager.m in Sources */,
2CBF82C21FD5AE3F00636459 /* NCPushProxySessionManager.m in Sources */,
2C063315205AB8C40043481A /* ARDSettingsStore.m in Sources */,
2CBF82AF1FC888FC00636459 /* NCPushNotification.m in Sources */,
2CBF82BE1FD5AE0A00636459 /* NCImageSessionManager.m in Sources */,
2C3F6AA81FBB1ACD00E2705C /* NotificationService.m in Sources */,

Просмотреть файл

@ -12,7 +12,6 @@
#import <WebRTC/RTCMediaStream.h>
#import <WebRTC/RTCEAGLVideoView.h>
#import <WebRTC/RTCVideoTrack.h>
#import "ARDSettingsModel.h"
#import "ARDCaptureController.h"
#import "CallParticipantViewCell.h"
#import "NBMPeersFlowLayout.h"
@ -385,9 +384,7 @@ typedef NS_ENUM(NSInteger, CallState) {
- (void)callController:(NCCallController *)callController didCreateLocalVideoCapturer:(RTCCameraVideoCapturer *)videoCapturer
{
_localVideoView.captureSession = videoCapturer.captureSession;
ARDSettingsModel *settingsModel = [[ARDSettingsModel alloc] init];
_captureController = [[ARDCaptureController alloc] initWithCapturer:videoCapturer settings:settingsModel];
_captureController = [[ARDCaptureController alloc] initWithCapturer:videoCapturer settings:[[NCSettingsController sharedInstance] videoSettingsModel]];
[_captureController startCapture];
}
- (void)callController:(NCCallController *)callController didAddLocalStream:(RTCMediaStream *)localStream

Просмотреть файл

@ -8,6 +8,7 @@
#import <Foundation/Foundation.h>
#import "ARDSettingsModel.h"
#import "UICKeyChainStore.h"
@ -44,6 +45,7 @@ extern NSString * const NCServerCapabilitiesReceivedNotification;
@property (nonatomic, copy) NSString *ncDeviceSignature;
@property (nonatomic, copy) NSString *ncUserPublicKey;
@property (nonatomic, copy) NSDictionary *ncTalkCapabilities;
@property (nonatomic, copy) ARDSettingsModel *videoSettingsModel;
+ (instancetype)sharedInstance;
- (void)cleanUserAndServerStoredValues;

Просмотреть файл

@ -55,6 +55,7 @@ NSString * const NCServerCapabilitiesReceivedNotification = @"NCServerCapabiliti
{
self = [super init];
if (self) {
_videoSettingsModel = [[ARDSettingsModel alloc] init];
_keychain = [UICKeyChainStore keyChainStoreWithService:@"com.nextcloud.Talk"
accessGroup:@"group.com.nextcloud.Talk"];
[self readValuesFromKeyChain];

Просмотреть файл

@ -8,7 +8,7 @@
#import "VideoSettingsViewController.h"
#import "ARDSettingsModel.h"
#import "NCSettingsController.h"
typedef enum VideoSettingsSection {
kVideoSettingsSectionResolution = 0,
@ -77,8 +77,7 @@ typedef enum VideoSettingsSection {
}
cell.textLabel.text = @"Video resolution";
ARDSettingsModel *settingsModel = [[ARDSettingsModel alloc] init];
cell.detailTextLabel.text = [settingsModel currentVideoResolutionSettingFromStore];
cell.detailTextLabel.text = [[[NCSettingsController sharedInstance] videoSettingsModel] currentVideoResolutionSettingFromStore];
}
break;
case kVideoSettingsSectionDefaultVideo: