mirror of https://github.com/M66B/FairEmail.git
Show headers in EML viewer
This commit is contained in:
parent
2b1c50c73a
commit
220eb6dfda
|
@ -47,6 +47,7 @@ import android.widget.Toast;
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.annotation.Nullable;
|
import androidx.annotation.Nullable;
|
||||||
import androidx.appcompat.app.AlertDialog;
|
import androidx.appcompat.app.AlertDialog;
|
||||||
|
import androidx.cardview.widget.CardView;
|
||||||
import androidx.constraintlayout.widget.Group;
|
import androidx.constraintlayout.widget.Group;
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
@ -94,6 +95,8 @@ public class ActivityEML extends ActivityBase {
|
||||||
private TextView tvBody;
|
private TextView tvBody;
|
||||||
private TextView tvStructure;
|
private TextView tvStructure;
|
||||||
private ImageButton ibEml;
|
private ImageButton ibEml;
|
||||||
|
private CardView cardHeaders;
|
||||||
|
private TextView tvHeaders;
|
||||||
private ContentLoadingProgressBar pbWait;
|
private ContentLoadingProgressBar pbWait;
|
||||||
private Group grpReady;
|
private Group grpReady;
|
||||||
|
|
||||||
|
@ -123,6 +126,8 @@ public class ActivityEML extends ActivityBase {
|
||||||
tvBody = findViewById(R.id.tvBody);
|
tvBody = findViewById(R.id.tvBody);
|
||||||
tvStructure = findViewById(R.id.tvStructure);
|
tvStructure = findViewById(R.id.tvStructure);
|
||||||
ibEml = findViewById(R.id.ibEml);
|
ibEml = findViewById(R.id.ibEml);
|
||||||
|
cardHeaders = findViewById(R.id.cardHeaders);
|
||||||
|
tvHeaders = findViewById(R.id.tvHeaders);
|
||||||
pbWait = findViewById(R.id.pbWait);
|
pbWait = findViewById(R.id.pbWait);
|
||||||
grpReady = findViewById(R.id.grpReady);
|
grpReady = findViewById(R.id.grpReady);
|
||||||
|
|
||||||
|
@ -205,6 +210,7 @@ public class ActivityEML extends ActivityBase {
|
||||||
FragmentDialogTheme.setBackground(this, view, false);
|
FragmentDialogTheme.setBackground(this, view, false);
|
||||||
vSeparatorAttachments.setVisibility(View.GONE);
|
vSeparatorAttachments.setVisibility(View.GONE);
|
||||||
grpReady.setVisibility(View.GONE);
|
grpReady.setVisibility(View.GONE);
|
||||||
|
cardHeaders.setVisibility(View.GONE);
|
||||||
|
|
||||||
load();
|
load();
|
||||||
}
|
}
|
||||||
|
@ -281,6 +287,8 @@ public class ActivityEML extends ActivityBase {
|
||||||
getStructure(imessage, ssb, 0, textColorLink);
|
getStructure(imessage, ssb, 0, textColorLink);
|
||||||
result.structure = ssb;
|
result.structure = ssb;
|
||||||
|
|
||||||
|
result.headers = HtmlHelper.highlightHeaders(context, helper.getHeaders(), false);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -358,7 +366,9 @@ public class ActivityEML extends ActivityBase {
|
||||||
|
|
||||||
tvBody.setText(result.body);
|
tvBody.setText(result.body);
|
||||||
tvStructure.setText(result.structure);
|
tvStructure.setText(result.structure);
|
||||||
|
tvHeaders.setText(result.headers);
|
||||||
grpReady.setVisibility(View.VISIBLE);
|
grpReady.setVisibility(View.VISIBLE);
|
||||||
|
cardHeaders.setVisibility(!BuildConfig.PLAY_STORE_RELEASE ? View.VISIBLE : View.GONE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -672,5 +682,6 @@ public class ActivityEML extends ActivityBase {
|
||||||
MessageHelper.MessageParts parts;
|
MessageHelper.MessageParts parts;
|
||||||
Spanned body;
|
Spanned body;
|
||||||
Spanned structure;
|
Spanned structure;
|
||||||
|
Spanned headers;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -306,6 +306,41 @@
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
</androidx.cardview.widget.CardView>
|
</androidx.cardview.widget.CardView>
|
||||||
|
|
||||||
|
<androidx.cardview.widget.CardView
|
||||||
|
android:id="@+id/cardHeaders"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginHorizontal="3dp"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
|
app:cardBackgroundColor="?attr/colorCardBackground"
|
||||||
|
app:cardCornerRadius="6dp"
|
||||||
|
app:cardElevation="0dp"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/cardStructure">
|
||||||
|
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:paddingHorizontal="6dp"
|
||||||
|
android:paddingVertical="12dp">
|
||||||
|
|
||||||
|
<eu.faircode.email.FixedTextView
|
||||||
|
android:id="@+id/tvHeaders"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="3dp"
|
||||||
|
android:fontFamily="monospace"
|
||||||
|
android:minHeight="30dp"
|
||||||
|
android:text="Headers"
|
||||||
|
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
||||||
|
android:textIsSelectable="true"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
</androidx.cardview.widget.CardView>
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.Group
|
<androidx.constraintlayout.widget.Group
|
||||||
android:id="@+id/grpReady"
|
android:id="@+id/grpReady"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
|
|
Loading…
Reference in New Issue