|
@@ -16,11 +16,11 @@
|
16
|
16
|
|
17
|
17
|
package org.jitsi.meet.sdk;
|
18
|
18
|
|
19
|
|
-import android.annotation.SuppressLint;
|
20
|
19
|
import android.content.Context;
|
21
|
20
|
import android.content.Intent;
|
22
|
21
|
import android.net.Uri;
|
23
|
22
|
import android.os.Bundle;
|
|
23
|
+
|
24
|
24
|
import androidx.annotation.Nullable;
|
25
|
25
|
import androidx.fragment.app.FragmentActivity;
|
26
|
26
|
|
|
@@ -68,6 +68,9 @@ public class JitsiMeetActivity extends FragmentActivity
|
68
|
68
|
|
69
|
69
|
setContentView(R.layout.activity_jitsi_meet);
|
70
|
70
|
|
|
71
|
+ // Listen for conference events.
|
|
72
|
+ getJitsiView().setListener(this);
|
|
73
|
+
|
71
|
74
|
if (!extraInitialize()) {
|
72
|
75
|
initialize();
|
73
|
76
|
}
|
|
@@ -152,9 +155,6 @@ public class JitsiMeetActivity extends FragmentActivity
|
152
|
155
|
}
|
153
|
156
|
|
154
|
157
|
protected void initialize() {
|
155
|
|
- // Listen for conference events.
|
156
|
|
- getJitsiView().setListener(this);
|
157
|
|
-
|
158
|
158
|
// Join the room specified by the URL the app was launched with.
|
159
|
159
|
// Joining without the room option displays the welcome page.
|
160
|
160
|
join(getConferenceOptions(getIntent()));
|
|
@@ -163,9 +163,10 @@ public class JitsiMeetActivity extends FragmentActivity
|
163
|
163
|
// Activity lifecycle methods
|
164
|
164
|
//
|
165
|
165
|
|
166
|
|
- @SuppressLint("MissingSuperCall")
|
167
|
166
|
@Override
|
168
|
167
|
public void onActivityResult(int requestCode, int resultCode, Intent data) {
|
|
168
|
+ super.onActivityResult(requestCode, resultCode, data);
|
|
169
|
+
|
169
|
170
|
JitsiMeetActivityDelegate.onActivityResult(this, requestCode, resultCode, data);
|
170
|
171
|
}
|
171
|
172
|
|