From 0bf7c08778f556fe59815656efccaa739761e611 Mon Sep 17 00:00:00 2001
From: gmbnt <andriesseniels@gmail.com>
Date: Tue, 17 Mar 2020 09:54:58 +1100
Subject: [PATCH 1/3] Add home screen bottom margin

---
 res/layout/activity_home.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/res/layout/activity_home.xml b/res/layout/activity_home.xml
index 8bbecbb576..ce436d7b31 100644
--- a/res/layout/activity_home.xml
+++ b/res/layout/activity_home.xml
@@ -56,7 +56,9 @@
         <android.support.v7.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"
+            android:paddingBottom="172dp"
+            android:clipToPadding="false" />
 
         <View
             android:id="@+id/gradientView"

From 8eca046acb315535d71d7118a6b06f68de13a551 Mon Sep 17 00:00:00 2001
From: gmbnt <andriesseniels@gmail.com>
Date: Tue, 17 Mar 2020 11:02:05 +1100
Subject: [PATCH 2/3] Hack around message status bar bug

---
 res/layout/conversation_activity.xml                        | 2 +-
 .../securesms/conversation/ConversationActivity.java        | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 4e850ee265..17cd6f5aa4 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -102,7 +102,7 @@
                 android:progressBackgroundTint="@color/transparent"
                 android:alpha="0"
                 android:indeterminate="false"
-                android:progress="80" />
+                android:progress="0" />
 
             <org.thoughtcrime.securesms.loki.redesign.views.SessionRestoreBannerView
                 android:id="@+id/sessionRestoreBannerView"
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 9e38a84767..60832aaddd 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -2369,6 +2369,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     } catch (InvalidMessageException ex) {
       Log.w(TAG, ex);
     }
+
+    if (messageStatus == null) {
+      messageStatus = "calculatingPoW";
+      updateSubtitleTextView();
+      updateMessageStatusProgressBar();
+    }
   }
 
   private void sendMediaMessage(final boolean forceSms, final long expiresIn, final int subscriptionId, boolean initiating)

From 949bfefd810a9b2d2e2513312921fcc7a152992a Mon Sep 17 00:00:00 2001
From: gmbnt <andriesseniels@gmail.com>
Date: Tue, 17 Mar 2020 11:43:12 +1100
Subject: [PATCH 3/3] Clean

---
 .../securesms/loki/redesign/utilities/ActivityUtilities.kt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/loki/redesign/utilities/ActivityUtilities.kt b/src/org/thoughtcrime/securesms/loki/redesign/utilities/ActivityUtilities.kt
index 329022a07e..413c5566ec 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/utilities/ActivityUtilities.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/utilities/ActivityUtilities.kt
@@ -21,9 +21,12 @@ fun AppCompatActivity.setUpActionBarSessionLogo() {
     supportActionBar!!.setDisplayShowCustomEnabled(true)
 }
 
+val AppCompatActivity.defaultSessionRequestCode: Int
+    get() = 42
+
 fun AppCompatActivity.push(intent: Intent, isForResult: Boolean = false) {
     if (isForResult) {
-        startActivityForResult(intent, 42)
+        startActivityForResult(intent, defaultSessionRequestCode)
     } else {
         startActivity(intent)
     }
@@ -32,7 +35,7 @@ fun AppCompatActivity.push(intent: Intent, isForResult: Boolean = false) {
 
 fun AppCompatActivity.show(intent: Intent, isForResult: Boolean = false) {
     if (isForResult) {
-        startActivityForResult(intent, 42)
+        startActivityForResult(intent, defaultSessionRequestCode)
     } else {
         startActivity(intent)
     }