another crash with null launcher

tinode · Jun 26, 2021 · c7a44a8 · c7a44a8
1 parent dc44d73
commit c7a44a8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/src/main/java/co/tinode/tindroid/SignUpFragment.java b/app/src/main/java/co/tinode/tindroid/SignUpFragment.java
@@ -80,10 +80,10 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
 
         // Get avatar from the gallery or photo camera.
         fragment.findViewById(R.id.uploadAvatar).setOnClickListener(v -> {
-            if (activity.isFinishing() || activity.isDestroyed()) {
-                return;
+            Intent launcher = UiUtils.avatarSelectorIntent(getActivity(), mRequestAvatarPermissionsLauncher);
+            if (launcher != null) {
+                mAvatarPickerLauncher.launch(launcher);
             }
-            mAvatarPickerLauncher.launch(UiUtils.avatarSelectorIntent(getActivity(), mRequestAvatarPermissionsLauncher));
         });
         // Handle click on the sign up button.
         fragment.findViewById(R.id.signUp).setOnClickListener(this);