|
@@ -56,15 +56,16 @@ public class JitsiMeetActivity
|
56
|
56
|
private DefaultHardwareBackBtnHandler defaultBackButtonImpl;
|
57
|
57
|
|
58
|
58
|
/**
|
59
|
|
- * Instance of the {@link JitsiMeetView} which this activity will display.
|
|
59
|
+ * The default base {@code URL} used to join a conference when a partial URL
|
|
60
|
+ * (e.g. a room name only) is specified. The value is used only while
|
|
61
|
+ * {@link #view} equals {@code null}.
|
60
|
62
|
*/
|
61
|
|
- private JitsiMeetView view;
|
|
63
|
+ private URL defaultURL;
|
62
|
64
|
|
63
|
65
|
/**
|
64
|
|
- * Default URL to be used when joining a conference. The value is used only
|
65
|
|
- * while {@link #view} equals {@code null}.
|
|
66
|
+ * Instance of the {@link JitsiMeetView} which this activity will display.
|
66
|
67
|
*/
|
67
|
|
- private URL defaultURL;
|
|
68
|
+ private JitsiMeetView view;
|
68
|
69
|
|
69
|
70
|
/**
|
70
|
71
|
* Whether the Welcome page is enabled. The value is used only while
|
|
@@ -82,7 +83,7 @@ public class JitsiMeetActivity
|
82
|
83
|
|
83
|
84
|
/**
|
84
|
85
|
*
|
85
|
|
- * @see JitsiMeetView#getDefaultURL
|
|
86
|
+ * @see JitsiMeetView#getDefaultURL()
|
86
|
87
|
*/
|
87
|
88
|
public URL getDefaultURL() {
|
88
|
89
|
return view == null ? defaultURL : view.getDefaultURL();
|
|
@@ -90,7 +91,7 @@ public class JitsiMeetActivity
|
90
|
91
|
|
91
|
92
|
/**
|
92
|
93
|
*
|
93
|
|
- * @see JitsiMeetView#getWelcomePageEnabled
|
|
94
|
+ * @see JitsiMeetView#getWelcomePageEnabled()
|
94
|
95
|
*/
|
95
|
96
|
public boolean getWelcomePageEnabled() {
|
96
|
97
|
return view == null ? welcomePageEnabled : view.getWelcomePageEnabled();
|
|
@@ -117,12 +118,11 @@ public class JitsiMeetActivity
|
117
|
118
|
protected JitsiMeetView initializeView() {
|
118
|
119
|
JitsiMeetView view = new JitsiMeetView(this);
|
119
|
120
|
|
120
|
|
- // In order to have the desired effect
|
121
|
|
- // JitsiMeetView#setWelcomePageEnabled(boolean) or
|
122
|
|
- // JitsiMeetView#setDefaultURL(URL) must be invoked before
|
123
|
|
- // JitsiMeetView#loadURL(URL).
|
|
121
|
+ // XXX Before calling JitsiMeetView#loadURL, make sure to call whatever
|
|
122
|
+ // is documented to need such an order in order to take effect:
|
124
|
123
|
view.setDefaultURL(defaultURL);
|
125
|
124
|
view.setWelcomePageEnabled(welcomePageEnabled);
|
|
125
|
+
|
126
|
126
|
view.loadURL(null);
|
127
|
127
|
|
128
|
128
|
return view;
|
|
@@ -243,19 +243,19 @@ public class JitsiMeetActivity
|
243
|
243
|
|
244
|
244
|
/**
|
245
|
245
|
*
|
246
|
|
- * @see JitsiMeetView#setDefaultURL
|
|
246
|
+ * @see JitsiMeetView#setDefaultURL(URL)
|
247
|
247
|
*/
|
248
|
|
- public void setDefaultURL(URL url) {
|
|
248
|
+ public void setDefaultURL(URL defaultURL) {
|
249
|
249
|
if (view == null) {
|
250
|
|
- defaultURL = url;
|
|
250
|
+ this.defaultURL = defaultURL;
|
251
|
251
|
} else {
|
252
|
|
- view.setDefaultURL(url);
|
|
252
|
+ view.setDefaultURL(defaultURL);
|
253
|
253
|
}
|
254
|
254
|
}
|
255
|
255
|
|
256
|
256
|
/**
|
257
|
257
|
*
|
258
|
|
- * @see JitsiMeetView#setWelcomePageEnabled
|
|
258
|
+ * @see JitsiMeetView#setWelcomePageEnabled(boolean)
|
259
|
259
|
*/
|
260
|
260
|
public void setWelcomePageEnabled(boolean welcomePageEnabled) {
|
261
|
261
|
if (view == null) {
|