From 3db105a57c20d19c43d597229a74eb2f66e6aa45 Mon Sep 17 00:00:00 2001
From: emanuele-f <black.silver@hotmail.it>
Date: Thu, 9 Feb 2023 11:02:48 +0100
Subject: [PATCH] Fix glitch in connection payload

Plaintext payload was initally displayed as hexdump and soon
after displayed as printable text, causing a visual glitch
---
 .../emanuelef/remote_capture/adapters/PayloadAdapter.java   | 3 ++-
 .../remote_capture/fragments/ConnectionPayload.java         | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/emanuelef/remote_capture/adapters/PayloadAdapter.java b/app/src/main/java/com/emanuelef/remote_capture/adapters/PayloadAdapter.java
index 6fd0a7ae..872f059c 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/adapters/PayloadAdapter.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/adapters/PayloadAdapter.java
@@ -66,11 +66,12 @@ public class PayloadAdapter extends RecyclerView.Adapter<PayloadAdapter.PayloadV
     private final HTTPReassembly mHttpRes;
     private boolean mShowAsPrintable;
 
-    public PayloadAdapter(Context context, ConnectionDescriptor conn, ChunkType mode) {
+    public PayloadAdapter(Context context, ConnectionDescriptor conn, ChunkType mode, boolean showAsPrintable) {
         mLayoutInflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         mConn = conn;
         mContext = context;
         mMode = mode;
+        mShowAsPrintable = showAsPrintable;
 
         // Note: in minimal mode, only the first chunk is captured, so don't reassemble them
         boolean reassemble = (CaptureService.getCurPayloadMode() == Prefs.PayloadMode.FULL);
diff --git a/app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionPayload.java b/app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionPayload.java
index 4169d624..d4b776de 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionPayload.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionPayload.java
@@ -117,8 +117,12 @@ public class ConnectionPayload extends Fragment implements ConnectionDetailsActi
         if(mConn.isPayloadTruncated())
             mTruncatedWarning.setVisibility(View.VISIBLE);
 
-        mAdapter = new PayloadAdapter(requireContext(), mConn, mode);
         mCurChunks = mConn.getNumPayloadChunks();
+        if(mCurChunks > 0)
+            mShowAsPrintable = guessDisplayAsPrintable();
+        else
+            mShowAsPrintable = false;
+        mAdapter = new PayloadAdapter(requireContext(), mConn, mode, mShowAsPrintable);
         mJustCreated = true;
 
         // only set adapter after acknowledged (see setMenuVisibility below)