Browse Source

fix(rn,sdk) drop deprecated option enableWelcomePage

It got replaced by a feature flag.
master
Saúl Ibarra Corretgé 3 years ago
parent
commit
c843744df1

+ 1
- 1
android/app/src/main/java/org/jitsi/meet/MainActivity.java View File

150
         // Set default options
150
         // Set default options
151
         JitsiMeetConferenceOptions defaultOptions
151
         JitsiMeetConferenceOptions defaultOptions
152
             = new JitsiMeetConferenceOptions.Builder()
152
             = new JitsiMeetConferenceOptions.Builder()
153
-            .setWelcomePageEnabled(true)
154
             .setServerURL(buildURL(defaultURL))
153
             .setServerURL(buildURL(defaultURL))
154
+            .setFeatureFlag("welcomepage.enabled", true)
155
             .setFeatureFlag("call-integration.enabled", false)
155
             .setFeatureFlag("call-integration.enabled", false)
156
             .setFeatureFlag("resolution", 360)
156
             .setFeatureFlag("resolution", 360)
157
             .setFeatureFlag("server-url-change.enabled", !configurationByRestrictions)
157
             .setFeatureFlag("server-url-change.enabled", !configurationByRestrictions)

+ 0
- 13
android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetConferenceOptions.java View File

175
             return this;
175
             return this;
176
         }
176
         }
177
 
177
 
178
-        /**
179
-         * Sets the welcome page enabled / disabled. The welcome page lists recent meetings and
180
-         * calendar appointments and it's meant to be used by standalone applications. Defaults to
181
-         * false.
182
-         * @param enabled - Whether the welcome page should be enabled or not.
183
-         * @return - The {@link Builder} object itself so the method calls can be chained.
184
-         */
185
-        public Builder setWelcomePageEnabled(boolean enabled) {
186
-            this.featureFlags.putBoolean("welcomepage.enabled", enabled);
187
-
188
-            return this;
189
-        }
190
-
191
         public Builder setFeatureFlag(String flag, boolean value) {
178
         public Builder setFeatureFlag(String flag, boolean value) {
192
             this.featureFlags.putBoolean(flag, value);
179
             this.featureFlags.putBoolean(flag, value);
193
 
180
 

+ 1
- 1
ios/app/src/AppDelegate.m View File

34
     jitsiMeet.universalLinkDomains = @[@"meet.jit.si", @"alpha.jitsi.net", @"beta.meet.jit.si"];
34
     jitsiMeet.universalLinkDomains = @[@"meet.jit.si", @"alpha.jitsi.net", @"beta.meet.jit.si"];
35
 
35
 
36
     jitsiMeet.defaultConferenceOptions = [JitsiMeetConferenceOptions fromBuilder:^(JitsiMeetConferenceOptionsBuilder *builder) {
36
     jitsiMeet.defaultConferenceOptions = [JitsiMeetConferenceOptions fromBuilder:^(JitsiMeetConferenceOptionsBuilder *builder) {
37
+        [builder setFeatureFlag:@"welcomepage.enabled" withBoolean:YES];
37
         [builder setFeatureFlag:@"resolution" withValue:@(360)];
38
         [builder setFeatureFlag:@"resolution" withValue:@(360)];
38
         [builder setFeatureFlag:@"ios.screensharing.enabled" withBoolean:YES];
39
         [builder setFeatureFlag:@"ios.screensharing.enabled" withBoolean:YES];
39
         builder.serverURL = [NSURL URLWithString:@"https://meet.jit.si"];
40
         builder.serverURL = [NSURL URLWithString:@"https://meet.jit.si"];
40
-        builder.welcomePageEnabled = YES;
41
 
41
 
42
         // Apple rejected our app because they claim requiring a
42
         // Apple rejected our app because they claim requiring a
43
         // Dropbox account for recording is not acceptable.
43
         // Dropbox account for recording is not acceptable.

+ 0
- 8
ios/sdk/src/JitsiMeetConferenceOptions.h View File

41
 
41
 
42
 @property (nonatomic, readonly, nonnull) NSDictionary *config;
42
 @property (nonatomic, readonly, nonnull) NSDictionary *config;
43
 
43
 
44
-/**
45
- * Set to YES to enable the welcome page. Typically SDK users won't need this enabled
46
- * since the host application decides which meeting to join.
47
- */
48
-@property (nonatomic) BOOL welcomePageEnabled;
49
-
50
 /**
44
 /**
51
  * Information about the local user. It will be used in absence of a token.
45
  * Information about the local user. It will be used in absence of a token.
52
  */
46
  */
78
 
72
 
79
 @property (nonatomic, readonly, nonnull) NSDictionary *featureFlags;
73
 @property (nonatomic, readonly, nonnull) NSDictionary *featureFlags;
80
 
74
 
81
-@property (nonatomic, readonly) BOOL welcomePageEnabled;
82
-
83
 @property (nonatomic, nullable) JitsiMeetUserInfo *userInfo;
75
 @property (nonatomic, nullable) JitsiMeetUserInfo *userInfo;
84
 
76
 
85
 + (instancetype _Nonnull)fromBuilder:(void (^_Nonnull)(JitsiMeetConferenceOptionsBuilder *_Nonnull))initBlock;
77
 + (instancetype _Nonnull)fromBuilder:(void (^_Nonnull)(JitsiMeetConferenceOptionsBuilder *_Nonnull))initBlock;

+ 0
- 31
ios/sdk/src/JitsiMeetConferenceOptions.m View File

19
 #import "JitsiMeetConferenceOptions+Private.h"
19
 #import "JitsiMeetConferenceOptions+Private.h"
20
 #import "JitsiMeetUserInfo+Private.h"
20
 #import "JitsiMeetUserInfo+Private.h"
21
 
21
 
22
-/**
23
- * Backwards compatibility: turn the boolean property into a feature flag.
24
- */
25
-static NSString *const WelcomePageEnabledFeatureFlag = @"welcomepage.enabled";
26
-
27
-
28
 @implementation JitsiMeetConferenceOptionsBuilder {
22
 @implementation JitsiMeetConferenceOptionsBuilder {
29
     NSMutableDictionary *_featureFlags;
23
     NSMutableDictionary *_featureFlags;
30
     NSMutableDictionary *_config;
24
     NSMutableDictionary *_config;
31
 }
25
 }
32
 
26
 
33
-@dynamic welcomePageEnabled;
34
-
35
 - (instancetype)init {
27
 - (instancetype)init {
36
     if (self = [super init]) {
28
     if (self = [super init]) {
37
         _serverURL = nil;
29
         _serverURL = nil;
95
     _config[config] = value;
87
     _config[config] = value;
96
 }
88
 }
97
 
89
 
98
-#pragma mark - Dynamic properties
99
-
100
-- (void)setWelcomePageEnabled:(BOOL)welcomePageEnabled {
101
-    [self setFeatureFlag:WelcomePageEnabledFeatureFlag
102
-               withBoolean:welcomePageEnabled];
103
-}
104
-
105
-- (BOOL)welcomePageEnabled {
106
-    NSNumber *n = _featureFlags[WelcomePageEnabledFeatureFlag];
107
-
108
-    return n != nil ? [n boolValue] : NO;
109
-}
110
-
111
 @end
90
 @end
112
 
91
 
113
 @implementation JitsiMeetConferenceOptions {
92
 @implementation JitsiMeetConferenceOptions {
115
     NSDictionary *_config;
94
     NSDictionary *_config;
116
 }
95
 }
117
 
96
 
118
-@dynamic welcomePageEnabled;
119
-
120
-#pragma mark - Dynamic properties
121
-
122
-- (BOOL)welcomePageEnabled {
123
-    NSNumber *n = _featureFlags[WelcomePageEnabledFeatureFlag];
124
-
125
-    return n != nil ? [n boolValue] : NO;
126
-}
127
-
128
 #pragma mark - Internal initializer
97
 #pragma mark - Internal initializer
129
 
98
 
130
 - (instancetype)initWithBuilder:(JitsiMeetConferenceOptionsBuilder *)builder {
99
 - (instancetype)initWithBuilder:(JitsiMeetConferenceOptionsBuilder *)builder {

Loading…
Cancel
Save