diff --git a/android/app/src/main/java/org/jitsi/meet/MainActivity.java b/android/app/src/main/java/org/jitsi/meet/MainActivity.java index 6630ef5ea..faf38dbc8 100644 --- a/android/app/src/main/java/org/jitsi/meet/MainActivity.java +++ b/android/app/src/main/java/org/jitsi/meet/MainActivity.java @@ -150,8 +150,8 @@ public class MainActivity extends JitsiMeetActivity { // Set default options JitsiMeetConferenceOptions defaultOptions = new JitsiMeetConferenceOptions.Builder() - .setWelcomePageEnabled(true) .setServerURL(buildURL(defaultURL)) + .setFeatureFlag("welcomepage.enabled", true) .setFeatureFlag("call-integration.enabled", false) .setFeatureFlag("resolution", 360) .setFeatureFlag("server-url-change.enabled", !configurationByRestrictions) diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetConferenceOptions.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetConferenceOptions.java index b849e94a6..1c7e2e466 100644 --- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetConferenceOptions.java +++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetConferenceOptions.java @@ -175,19 +175,6 @@ public class JitsiMeetConferenceOptions implements Parcelable { 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) { this.featureFlags.putBoolean(flag, value); diff --git a/ios/app/src/AppDelegate.m b/ios/app/src/AppDelegate.m index 76afe2afb..acfee669c 100644 --- a/ios/app/src/AppDelegate.m +++ b/ios/app/src/AppDelegate.m @@ -34,10 +34,10 @@ jitsiMeet.universalLinkDomains = @[@"meet.jit.si", @"alpha.jitsi.net", @"beta.meet.jit.si"]; jitsiMeet.defaultConferenceOptions = [JitsiMeetConferenceOptions fromBuilder:^(JitsiMeetConferenceOptionsBuilder *builder) { + [builder setFeatureFlag:@"welcomepage.enabled" withBoolean:YES]; [builder setFeatureFlag:@"resolution" withValue:@(360)]; [builder setFeatureFlag:@"ios.screensharing.enabled" withBoolean:YES]; builder.serverURL = [NSURL URLWithString:@"https://meet.jit.si"]; - builder.welcomePageEnabled = YES; // Apple rejected our app because they claim requiring a // Dropbox account for recording is not acceptable. diff --git a/ios/sdk/src/JitsiMeetConferenceOptions.h b/ios/sdk/src/JitsiMeetConferenceOptions.h index adfb14e75..222dad053 100644 --- a/ios/sdk/src/JitsiMeetConferenceOptions.h +++ b/ios/sdk/src/JitsiMeetConferenceOptions.h @@ -41,12 +41,6 @@ @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. */ @@ -78,8 +72,6 @@ @property (nonatomic, readonly, nonnull) NSDictionary *featureFlags; -@property (nonatomic, readonly) BOOL welcomePageEnabled; - @property (nonatomic, nullable) JitsiMeetUserInfo *userInfo; + (instancetype _Nonnull)fromBuilder:(void (^_Nonnull)(JitsiMeetConferenceOptionsBuilder *_Nonnull))initBlock; diff --git a/ios/sdk/src/JitsiMeetConferenceOptions.m b/ios/sdk/src/JitsiMeetConferenceOptions.m index f01c82edd..2872d8376 100644 --- a/ios/sdk/src/JitsiMeetConferenceOptions.m +++ b/ios/sdk/src/JitsiMeetConferenceOptions.m @@ -19,19 +19,11 @@ #import "JitsiMeetConferenceOptions+Private.h" #import "JitsiMeetUserInfo+Private.h" -/** - * Backwards compatibility: turn the boolean property into a feature flag. - */ -static NSString *const WelcomePageEnabledFeatureFlag = @"welcomepage.enabled"; - - @implementation JitsiMeetConferenceOptionsBuilder { NSMutableDictionary *_featureFlags; NSMutableDictionary *_config; } -@dynamic welcomePageEnabled; - - (instancetype)init { if (self = [super init]) { _serverURL = nil; @@ -95,19 +87,6 @@ static NSString *const WelcomePageEnabledFeatureFlag = @"welcomepage.enabled"; _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 @implementation JitsiMeetConferenceOptions { @@ -115,16 +94,6 @@ static NSString *const WelcomePageEnabledFeatureFlag = @"welcomepage.enabled"; NSDictionary *_config; } -@dynamic welcomePageEnabled; - -#pragma mark - Dynamic properties - -- (BOOL)welcomePageEnabled { - NSNumber *n = _featureFlags[WelcomePageEnabledFeatureFlag]; - - return n != nil ? [n boolValue] : NO; -} - #pragma mark - Internal initializer - (instancetype)initWithBuilder:(JitsiMeetConferenceOptionsBuilder *)builder {