fix(rn,sdk) drop deprecated option enableWelcomePage
It got replaced by a feature flag.
This commit is contained in:
parent
f6f7406d24
commit
c843744df1
|
@ -150,8 +150,8 @@ public class MainActivity extends JitsiMeetActivity {
|
||||||
// Set default options
|
// Set default options
|
||||||
JitsiMeetConferenceOptions defaultOptions
|
JitsiMeetConferenceOptions defaultOptions
|
||||||
= new JitsiMeetConferenceOptions.Builder()
|
= new JitsiMeetConferenceOptions.Builder()
|
||||||
.setWelcomePageEnabled(true)
|
|
||||||
.setServerURL(buildURL(defaultURL))
|
.setServerURL(buildURL(defaultURL))
|
||||||
|
.setFeatureFlag("welcomepage.enabled", true)
|
||||||
.setFeatureFlag("call-integration.enabled", false)
|
.setFeatureFlag("call-integration.enabled", false)
|
||||||
.setFeatureFlag("resolution", 360)
|
.setFeatureFlag("resolution", 360)
|
||||||
.setFeatureFlag("server-url-change.enabled", !configurationByRestrictions)
|
.setFeatureFlag("server-url-change.enabled", !configurationByRestrictions)
|
||||||
|
|
|
@ -175,19 +175,6 @@ public class JitsiMeetConferenceOptions implements Parcelable {
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets the welcome page enabled / disabled. The welcome page lists recent meetings and
|
|
||||||
* calendar appointments and it's meant to be used by standalone applications. Defaults to
|
|
||||||
* false.
|
|
||||||
* @param enabled - Whether the welcome page should be enabled or not.
|
|
||||||
* @return - The {@link Builder} object itself so the method calls can be chained.
|
|
||||||
*/
|
|
||||||
public Builder setWelcomePageEnabled(boolean enabled) {
|
|
||||||
this.featureFlags.putBoolean("welcomepage.enabled", enabled);
|
|
||||||
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Builder setFeatureFlag(String flag, boolean value) {
|
public Builder setFeatureFlag(String flag, boolean value) {
|
||||||
this.featureFlags.putBoolean(flag, value);
|
this.featureFlags.putBoolean(flag, value);
|
||||||
|
|
||||||
|
|
|
@ -34,10 +34,10 @@
|
||||||
jitsiMeet.universalLinkDomains = @[@"meet.jit.si", @"alpha.jitsi.net", @"beta.meet.jit.si"];
|
jitsiMeet.universalLinkDomains = @[@"meet.jit.si", @"alpha.jitsi.net", @"beta.meet.jit.si"];
|
||||||
|
|
||||||
jitsiMeet.defaultConferenceOptions = [JitsiMeetConferenceOptions fromBuilder:^(JitsiMeetConferenceOptionsBuilder *builder) {
|
jitsiMeet.defaultConferenceOptions = [JitsiMeetConferenceOptions fromBuilder:^(JitsiMeetConferenceOptionsBuilder *builder) {
|
||||||
|
[builder setFeatureFlag:@"welcomepage.enabled" withBoolean:YES];
|
||||||
[builder setFeatureFlag:@"resolution" withValue:@(360)];
|
[builder setFeatureFlag:@"resolution" withValue:@(360)];
|
||||||
[builder setFeatureFlag:@"ios.screensharing.enabled" withBoolean:YES];
|
[builder setFeatureFlag:@"ios.screensharing.enabled" withBoolean:YES];
|
||||||
builder.serverURL = [NSURL URLWithString:@"https://meet.jit.si"];
|
builder.serverURL = [NSURL URLWithString:@"https://meet.jit.si"];
|
||||||
builder.welcomePageEnabled = YES;
|
|
||||||
|
|
||||||
// Apple rejected our app because they claim requiring a
|
// Apple rejected our app because they claim requiring a
|
||||||
// Dropbox account for recording is not acceptable.
|
// Dropbox account for recording is not acceptable.
|
||||||
|
|
|
@ -41,12 +41,6 @@
|
||||||
|
|
||||||
@property (nonatomic, readonly, nonnull) NSDictionary *config;
|
@property (nonatomic, readonly, nonnull) NSDictionary *config;
|
||||||
|
|
||||||
/**
|
|
||||||
* Set to YES to enable the welcome page. Typically SDK users won't need this enabled
|
|
||||||
* since the host application decides which meeting to join.
|
|
||||||
*/
|
|
||||||
@property (nonatomic) BOOL welcomePageEnabled;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Information about the local user. It will be used in absence of a token.
|
* Information about the local user. It will be used in absence of a token.
|
||||||
*/
|
*/
|
||||||
|
@ -78,8 +72,6 @@
|
||||||
|
|
||||||
@property (nonatomic, readonly, nonnull) NSDictionary *featureFlags;
|
@property (nonatomic, readonly, nonnull) NSDictionary *featureFlags;
|
||||||
|
|
||||||
@property (nonatomic, readonly) BOOL welcomePageEnabled;
|
|
||||||
|
|
||||||
@property (nonatomic, nullable) JitsiMeetUserInfo *userInfo;
|
@property (nonatomic, nullable) JitsiMeetUserInfo *userInfo;
|
||||||
|
|
||||||
+ (instancetype _Nonnull)fromBuilder:(void (^_Nonnull)(JitsiMeetConferenceOptionsBuilder *_Nonnull))initBlock;
|
+ (instancetype _Nonnull)fromBuilder:(void (^_Nonnull)(JitsiMeetConferenceOptionsBuilder *_Nonnull))initBlock;
|
||||||
|
|
|
@ -19,19 +19,11 @@
|
||||||
#import "JitsiMeetConferenceOptions+Private.h"
|
#import "JitsiMeetConferenceOptions+Private.h"
|
||||||
#import "JitsiMeetUserInfo+Private.h"
|
#import "JitsiMeetUserInfo+Private.h"
|
||||||
|
|
||||||
/**
|
|
||||||
* Backwards compatibility: turn the boolean property into a feature flag.
|
|
||||||
*/
|
|
||||||
static NSString *const WelcomePageEnabledFeatureFlag = @"welcomepage.enabled";
|
|
||||||
|
|
||||||
|
|
||||||
@implementation JitsiMeetConferenceOptionsBuilder {
|
@implementation JitsiMeetConferenceOptionsBuilder {
|
||||||
NSMutableDictionary *_featureFlags;
|
NSMutableDictionary *_featureFlags;
|
||||||
NSMutableDictionary *_config;
|
NSMutableDictionary *_config;
|
||||||
}
|
}
|
||||||
|
|
||||||
@dynamic welcomePageEnabled;
|
|
||||||
|
|
||||||
- (instancetype)init {
|
- (instancetype)init {
|
||||||
if (self = [super init]) {
|
if (self = [super init]) {
|
||||||
_serverURL = nil;
|
_serverURL = nil;
|
||||||
|
@ -95,19 +87,6 @@ static NSString *const WelcomePageEnabledFeatureFlag = @"welcomepage.enabled";
|
||||||
_config[config] = value;
|
_config[config] = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
#pragma mark - Dynamic properties
|
|
||||||
|
|
||||||
- (void)setWelcomePageEnabled:(BOOL)welcomePageEnabled {
|
|
||||||
[self setFeatureFlag:WelcomePageEnabledFeatureFlag
|
|
||||||
withBoolean:welcomePageEnabled];
|
|
||||||
}
|
|
||||||
|
|
||||||
- (BOOL)welcomePageEnabled {
|
|
||||||
NSNumber *n = _featureFlags[WelcomePageEnabledFeatureFlag];
|
|
||||||
|
|
||||||
return n != nil ? [n boolValue] : NO;
|
|
||||||
}
|
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@implementation JitsiMeetConferenceOptions {
|
@implementation JitsiMeetConferenceOptions {
|
||||||
|
@ -115,16 +94,6 @@ static NSString *const WelcomePageEnabledFeatureFlag = @"welcomepage.enabled";
|
||||||
NSDictionary *_config;
|
NSDictionary *_config;
|
||||||
}
|
}
|
||||||
|
|
||||||
@dynamic welcomePageEnabled;
|
|
||||||
|
|
||||||
#pragma mark - Dynamic properties
|
|
||||||
|
|
||||||
- (BOOL)welcomePageEnabled {
|
|
||||||
NSNumber *n = _featureFlags[WelcomePageEnabledFeatureFlag];
|
|
||||||
|
|
||||||
return n != nil ? [n boolValue] : NO;
|
|
||||||
}
|
|
||||||
|
|
||||||
#pragma mark - Internal initializer
|
#pragma mark - Internal initializer
|
||||||
|
|
||||||
- (instancetype)initWithBuilder:(JitsiMeetConferenceOptionsBuilder *)builder {
|
- (instancetype)initWithBuilder:(JitsiMeetConferenceOptionsBuilder *)builder {
|
||||||
|
|
Loading…
Reference in New Issue