From 31916a95d52b72f5186d9b52e1179522ae08f78e Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Fri, 4 Sep 2020 11:32:43 +1000
Subject: [PATCH] Don't show Session ID in conversation title view

---
 res/values-small/dimens.xml                        |  2 +-
 res/values/dimens.xml                              |  2 +-
 .../conversation/ConversationActivity.java         | 14 +-------------
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/res/values-small/dimens.xml b/res/values-small/dimens.xml
index 4775251f06..81c5c4100b 100644
--- a/res/values-small/dimens.xml
+++ b/res/values-small/dimens.xml
@@ -8,7 +8,7 @@
     <dimen name="small_font_size">13sp</dimen>
     <dimen name="medium_font_size">15sp</dimen>
     <dimen name="large_font_size">20sp</dimen>
-    <dimen name="very_large_font_size">25sp</dimen>
+    <dimen name="very_large_font_size">24sp</dimen>
     <dimen name="massive_font_size">50sp</dimen>
 
     <!-- Session -->
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d255ee2585..1c0282a999 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -8,7 +8,7 @@
     <dimen name="small_font_size">15sp</dimen>
     <dimen name="medium_font_size">17sp</dimen>
     <dimen name="large_font_size">22sp</dimen>
-    <dimen name="very_large_font_size">27sp</dimen>
+    <dimen name="very_large_font_size">26sp</dimen>
     <dimen name="massive_font_size">50sp</dimen>
 
     <!-- Element Sizes -->
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 4a06575a30..02a68f3e2c 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -3103,15 +3103,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private void updateSubtitleTextView() {
     muteIndicatorImageView.setVisibility(View.GONE);
     subtitleTextView.setVisibility(View.VISIBLE);
-    if (messageStatus != null) {
-      switch (messageStatus) {
-        case "calculatingPoW": subtitleTextView.setText("Encrypting message"); break;
-        case "contactingNetwork": subtitleTextView.setText("Tracing a path"); break;
-        case "sendingMessage": subtitleTextView.setText("Sending message"); break;
-        case "messageSent": subtitleTextView.setText("Message sent securely"); break;
-        case "messageFailed": subtitleTextView.setText("Message failed to send"); break;
-      }
-    } else if (recipient.isMuted()) {
+    if (recipient.isMuted()) {
       muteIndicatorImageView.setVisibility(View.VISIBLE);
       subtitleTextView.setText("Muted until " + DateUtils.getFormattedDateTime(recipient.mutedUntil, "EEE, MMM d, yyyy HH:mm", Locale.getDefault()));
     } else if (recipient.isGroupRecipient() && recipient.getName() != null && !recipient.getName().equals("Session Updates") && !recipient.getName().equals("Loki News")) {
@@ -3125,10 +3117,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       } else {
         subtitleTextView.setVisibility(View.GONE);
       }
-    } else if (PublicKeyValidation.isValid(recipient.getAddress().toString())) {
-      String ourMasterHexEncodedPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(this);
-      String hexEncodedPublicKey = (recipient.isLocalNumber() && ourMasterHexEncodedPublicKey != null) ? ourMasterHexEncodedPublicKey : recipient.getAddress().toPhoneString();
-      subtitleTextView.setText(hexEncodedPublicKey);
     } else {
       subtitleTextView.setVisibility(View.GONE);
     }