commit c35f7f4761f682d710bcbf58081fab4381380ee3
author Adrien Béraud <adrien.beraud@savoirfairelinux.com> Wed Apr 15 15:29:29 2020 -0400
committer Adrien Béraud <adrien.beraud@savoirfairelinux.com> Wed Apr 15 15:30:03 2020 -0400
tree 52dba73d6b6b18df14e711ebc8a49738d6bb3970
parent 5ee9d4189cc9501e4b21cb45a5b402409a5fb3fa

conversation: cleanup

Change-Id: I45db2595c1c708fbb189fbd752ae29961ed5cc56

ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java

diff --git a/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java
index b6bf0e0..6462678 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java
@@ -328,8 +328,6 @@
         if (animator != null)
             animator.setSupportsChangeAnimations(false);
         binding.histList.setAdapter(mAdapter);
-
-
     }
 
     @Override
@@ -356,6 +354,7 @@
         }
         mAdapter = null;
         super.onDestroyView();
+        binding = null;
     }
 
     @Override
@@ -382,10 +381,6 @@
         presenter.sendTextMessage(binding.emojiSend.getText().toString());
     }
 
-    public void selectFile() {
-        presenter.selectFile();
-    }
-
     @SuppressLint("RestrictedApi")
     public void expandMenu(View v) {
         Context context = requireContext();
@@ -428,7 +423,7 @@
                     break;
                 }
                 case R.id.conv_send_file:
-                    selectFile();
+                    presenter.selectFile();
                     break;
                 case R.id.conv_share_location:
                     shareLocation();
@@ -473,7 +468,6 @@
 
     /**
      * Used to update with the past adapter position when a long click was registered
-     * @param position
      */
     public void updatePosition(int position) {
         mSelectedPosition = position;
@@ -1142,23 +1136,19 @@
         showErrorPanel(R.string.error_no_network, null);
     }
 
-    public void showErrorPanel(final int textResId, @Nullable View.OnClickListener clickListener) {
-        if (binding.errorMsgPane == null || binding.errorMsgPane.getVisibility() == View.VISIBLE) {
-            return;
-        }
-        binding.errorMsgPane.setVisibility(View.VISIBLE);
-        binding.errorMsgPane.setOnClickListener(clickListener);
-        if (binding.errorMsgTxt != null) {
+    private void showErrorPanel(final int textResId, @Nullable View.OnClickListener clickListener) {
+        if (binding != null) {
+            binding.errorMsgPane.setVisibility(View.VISIBLE);
+            binding.errorMsgPane.setOnClickListener(clickListener);
             binding.errorMsgTxt.setText(textResId);
         }
     }
 
     @Override
     public void hideErrorPanel() {
-        if (binding.errorMsgPane == null || binding.errorMsgPane.getVisibility() == View.GONE) {
-            return;
+        if (binding != null) {
+            binding.errorMsgPane.setVisibility(View.GONE);
         }
-        binding.errorMsgPane.setVisibility(View.GONE);
     }
 
 }