From da571929f03de5da2669ceaa3bc6eeabd13fe44d Mon Sep 17 00:00:00 2001 From: qwerty287 Date: Thu, 19 May 2022 09:06:11 +0200 Subject: [PATCH] Fix crashes on commits and don't reload (#1142) Closes #1141 Co-authored-by: qwerty287 Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/1142 Reviewed-by: M M Arif Co-authored-by: qwerty287 Co-committed-by: qwerty287 --- .../mian/gitnex/fragments/CommitDetailFragment.java | 10 +++++++--- .../org/mian/gitnex/fragments/DiffFilesFragment.java | 5 +++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java b/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java index 9247c1d0..7cd33d7b 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java @@ -61,6 +61,8 @@ public class CommitDetailFragment extends Fragment { super.onCreateView(inflater, container, savedInstanceState); + if(binding != null) return binding.getRoot(); + binding = FragmentCommitDetailsBinding.inflate(getLayoutInflater(), container, false); RepositoryContext repository = RepositoryContext.fromIntent(requireActivity().getIntent()); @@ -125,7 +127,7 @@ public class CommitDetailFragment extends Fragment { public void onFailure(@NonNull Call call, @NonNull Throwable t) { checkLoading(); - Toasty.error(requireContext(), getString(R.string.genericError)); + if(getContext() != null) Toasty.error(requireContext(), getString(R.string.genericError)); } }); } @@ -229,8 +231,10 @@ public class CommitDetailFragment extends Fragment { public void onFailure(@NonNull Call call, @NonNull Throwable t) { checkLoading(); - Toasty.error(requireContext(), getString(R.string.genericError)); - requireActivity().finish(); + if(getContext() != null) { + Toasty.error(requireContext(), getString(R.string.genericError)); + requireActivity().finish(); + } } }); } diff --git a/app/src/main/java/org/mian/gitnex/fragments/DiffFilesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/DiffFilesFragment.java index 1cc0e237..80dcd3af 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/DiffFilesFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/DiffFilesFragment.java @@ -39,6 +39,11 @@ public class DiffFilesFragment extends Fragment { @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + if(binding != null) { + ctx = requireContext(); + return binding.getRoot(); + } + binding = FragmentDiffFilesBinding.inflate(inflater, container, false); ctx = requireContext(); IssueContext issue = IssueContext.fromIntent(requireActivity().getIntent());