Skip to content
Snippets Groups Projects
Commit b46fd325 authored by Adrien Béraud's avatar Adrien Béraud
Browse files

callfragment: remove from stack on finish, check for null binding

Change-Id: Ia63b257d49624165e53b9ecd00e373f07098405d
parent 0c52ff26
No related branches found
No related tags found
No related merge requests found
...@@ -68,7 +68,6 @@ import android.view.inputmethod.InputMethodManager; ...@@ -68,7 +68,6 @@ import android.view.inputmethod.InputMethodManager;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
...@@ -380,6 +379,8 @@ public class CallFragment extends BaseSupportFragment<CallPresenter> implements ...@@ -380,6 +379,8 @@ public class CallFragment extends BaseSupportFragment<CallPresenter> implements
animation.setDuration(150); animation.setDuration(150);
animation.addUpdateListener(valueAnimator -> { animation.addUpdateListener(valueAnimator -> {
if (binding == null)
return;
int upBy = (int) valueAnimator.getAnimatedValue(); int upBy = (int) valueAnimator.getAnimatedValue();
RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) binding.previewContainer.getLayoutParams(); RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) binding.previewContainer.getLayoutParams();
layoutParams.setMargins(0, 0, 0, (int) (upBy * dpRatio)); layoutParams.setMargins(0, 0, 0, (int) (upBy * dpRatio));
...@@ -1244,18 +1245,13 @@ public class CallFragment extends BaseSupportFragment<CallPresenter> implements ...@@ -1244,18 +1245,13 @@ public class CallFragment extends BaseSupportFragment<CallPresenter> implements
public void finish() { public void finish() {
Activity activity = getActivity(); Activity activity = getActivity();
if (activity != null) { if (activity != null) {
if (mBackstackLost) {
activity.finishAndRemoveTask(); activity.finishAndRemoveTask();
startActivity( if (mBackstackLost) {
Intent.makeMainActivity( startActivity(Intent.makeMainActivity(new ComponentName(activity, HomeActivity.class)).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
new ComponentName(activity, HomeActivity.class)).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
} else {
activity.finish();
} }
} }
} }
public void speakerClicked() { public void speakerClicked() {
presenter.speakerClick(binding.callSpeakerBtn.isChecked()); presenter.speakerClick(binding.callSpeakerBtn.isChecked());
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment