diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java index 6876e087b..c3ce899c8 100644 --- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java +++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java @@ -16,11 +16,11 @@ package org.jitsi.meet.sdk; -import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Bundle; + import androidx.annotation.Nullable; import androidx.fragment.app.FragmentActivity; @@ -68,6 +68,9 @@ public class JitsiMeetActivity extends FragmentActivity setContentView(R.layout.activity_jitsi_meet); + // Listen for conference events. + getJitsiView().setListener(this); + if (!extraInitialize()) { initialize(); } @@ -152,9 +155,6 @@ public class JitsiMeetActivity extends FragmentActivity } protected void initialize() { - // Listen for conference events. - getJitsiView().setListener(this); - // Join the room specified by the URL the app was launched with. // Joining without the room option displays the welcome page. join(getConferenceOptions(getIntent())); @@ -163,9 +163,10 @@ public class JitsiMeetActivity extends FragmentActivity // Activity lifecycle methods // - @SuppressLint("MissingSuperCall") @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + JitsiMeetActivityDelegate.onActivityResult(this, requestCode, resultCode, data); }