From 7373918d3d8f2702d9fc5c826d6ad72417f65c89 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Thu, 24 Jun 2021 13:38:59 +1000
Subject: [PATCH] Add blocked dialog

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../components/ConversationTypingView.java    |  2 +-
 .../conversation/v2/ConversationActivityV2.kt |  3 +
 .../OpenGroupGuidelinesView.kt                |  4 +-
 .../{ => components}/TypingIndicatorView.java |  2 +-
 .../TypingIndicatorViewContainer.kt           |  2 +-
 .../conversation/v2/dialogs/BlockedDialog.kt  | 38 +++++++++++++
 .../conversation/v2/utilities/BaseDialog.kt   | 26 +++++++++
 .../OpenGroupGuidelinesActivity.kt            |  2 +-
 .../loki/dialogs/ClearAllDataDialog.kt        | 11 +---
 .../securesms/loki/dialogs/SeedDialog.kt      | 17 +-----
 .../res/layout/activity_conversation_v2.xml   |  4 +-
 .../main/res/layout/conversation_activity.xml |  2 +-
 .../res/layout/conversation_typing_view.xml   |  2 +-
 app/src/main/res/layout/dialog_blocked.xml    | 56 +++++++++++++++++++
 app/src/main/res/layout/view_conversation.xml |  2 +-
 .../view_conversation_typing_container.xml    |  2 +-
 .../main/res/layout/view_typing_indicator.xml |  2 +-
 app/src/main/res/values/strings.xml           |  6 +-
 19 files changed, 149 insertions(+), 36 deletions(-)
 rename app/src/main/java/org/thoughtcrime/securesms/conversation/v2/{ => components}/OpenGroupGuidelinesView.kt (84%)
 rename app/src/main/java/org/thoughtcrime/securesms/conversation/v2/{ => components}/TypingIndicatorView.java (98%)
 rename app/src/main/java/org/thoughtcrime/securesms/conversation/v2/{ => components}/TypingIndicatorViewContainer.kt (93%)
 create mode 100644 app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/BlockedDialog.kt
 create mode 100644 app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/BaseDialog.kt
 rename app/src/main/java/org/thoughtcrime/securesms/{conversation/v2 => loki/activities}/OpenGroupGuidelinesActivity.kt (97%)
 create mode 100644 app/src/main/res/layout/dialog_blocked.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e61edbe7e0..32869dd1f1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -223,7 +223,7 @@
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Session.DayNight.FlatActionBar" />
         <activity
-            android:name="org.thoughtcrime.securesms.conversation.v2.OpenGroupGuidelinesActivity"
+            android:name="org.thoughtcrime.securesms.loki.activities.OpenGroupGuidelinesActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.TextSecure.DayNight" />
         <activity
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationTypingView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationTypingView.java
index 6c42b7b154..ddc782628a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationTypingView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationTypingView.java
@@ -8,7 +8,7 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;
 
-import org.thoughtcrime.securesms.conversation.v2.TypingIndicatorView;
+import org.thoughtcrime.securesms.conversation.v2.components.TypingIndicatorView;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.ThemeUtil;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index 60e9862a3e..4d7a07318b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -32,6 +32,7 @@ import org.session.libsession.messaging.open_groups.OpenGroupAPIV2
 import org.session.libsession.utilities.recipients.Recipient
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
+import org.thoughtcrime.securesms.conversation.v2.dialogs.BlockedDialog
 import org.thoughtcrime.securesms.conversation.v2.input_bar.InputBarButton
 import org.thoughtcrime.securesms.conversation.v2.input_bar.InputBarDelegate
 import org.thoughtcrime.securesms.conversation.v2.input_bar.InputBarRecordingViewDelegate
@@ -45,6 +46,7 @@ import org.thoughtcrime.securesms.database.DraftDatabase
 import org.thoughtcrime.securesms.database.DraftDatabase.Drafts
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.loki.api.PublicChatInfoUpdateWorker
+import org.thoughtcrime.securesms.loki.dialogs.SeedDialog
 import org.thoughtcrime.securesms.loki.utilities.OpenGroupUtilities
 import org.thoughtcrime.securesms.loki.utilities.toPx
 import org.thoughtcrime.securesms.mms.GlideApp
@@ -409,6 +411,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
             // the view) so as to not interfere with all the other gestures. Do not add
             // onClickListeners directly to message content views.
             view.onContentClick()
+            BlockedDialog(thread).show(supportFragmentManager, "Blocked Dialog")
         }
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/OpenGroupGuidelinesView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/OpenGroupGuidelinesView.kt
similarity index 84%
rename from app/src/main/java/org/thoughtcrime/securesms/conversation/v2/OpenGroupGuidelinesView.kt
rename to app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/OpenGroupGuidelinesView.kt
index 4040c9fa3d..e4d7e4a3b6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/OpenGroupGuidelinesView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/OpenGroupGuidelinesView.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.conversation.v2
+package org.thoughtcrime.securesms.conversation.v2.components
 
 import android.content.Context
 import android.content.Intent
@@ -7,6 +7,8 @@ import android.view.LayoutInflater
 import android.widget.FrameLayout
 import kotlinx.android.synthetic.main.view_open_group_guidelines.view.*
 import network.loki.messenger.R
+import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2
+import org.thoughtcrime.securesms.loki.activities.OpenGroupGuidelinesActivity
 import org.thoughtcrime.securesms.loki.utilities.push
 
 class OpenGroupGuidelinesView : FrameLayout {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/TypingIndicatorView.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/TypingIndicatorView.java
similarity index 98%
rename from app/src/main/java/org/thoughtcrime/securesms/conversation/v2/TypingIndicatorView.java
rename to app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/TypingIndicatorView.java
index bd33600ea7..826cfe7b3a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/TypingIndicatorView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/TypingIndicatorView.java
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.conversation.v2;
+package org.thoughtcrime.securesms.conversation.v2.components;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/TypingIndicatorViewContainer.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/TypingIndicatorViewContainer.kt
similarity index 93%
rename from app/src/main/java/org/thoughtcrime/securesms/conversation/v2/TypingIndicatorViewContainer.kt
rename to app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/TypingIndicatorViewContainer.kt
index eaced08344..0628b63b78 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/TypingIndicatorViewContainer.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/TypingIndicatorViewContainer.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.conversation.v2
+package org.thoughtcrime.securesms.conversation.v2.components
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/BlockedDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/BlockedDialog.kt
new file mode 100644
index 0000000000..aad7fc98f8
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/BlockedDialog.kt
@@ -0,0 +1,38 @@
+package org.thoughtcrime.securesms.conversation.v2.dialogs
+
+import android.graphics.Typeface
+import android.text.Spannable
+import android.text.SpannableStringBuilder
+import android.text.style.StyleSpan
+import android.view.LayoutInflater
+import androidx.appcompat.app.AlertDialog
+import kotlinx.android.synthetic.main.dialog_blocked.view.*
+import network.loki.messenger.R
+import org.session.libsession.messaging.contacts.Contact
+import org.session.libsession.utilities.recipients.Recipient
+import org.thoughtcrime.securesms.conversation.v2.utilities.BaseDialog
+import org.thoughtcrime.securesms.database.DatabaseFactory
+
+class BlockedDialog(private val recipient: Recipient) : BaseDialog() {
+
+    override fun setContentView(builder: AlertDialog.Builder) {
+        val contentView = LayoutInflater.from(requireContext()).inflate(R.layout.dialog_blocked, null)
+        val contactDB = DatabaseFactory.getSessionContactDatabase(requireContext())
+        val sessionID = recipient.address.toString()
+        val contact = contactDB.getContactWithSessionID(sessionID)
+        val name = contact?.displayName(Contact.ContactContext.REGULAR) ?: sessionID
+        val title = resources.getString(R.string.dialog_blocked_title, name)
+        contentView.blockedTitleTextView.text = title
+        val explanation = resources.getString(R.string.dialog_blocked_explanation, name)
+        val spannable = SpannableStringBuilder(explanation)
+        val startIndex = explanation.indexOf(name)
+        spannable.setSpan(StyleSpan(Typeface.BOLD), startIndex, startIndex + name.count(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+        contentView.blockedExplanationTextView.text = spannable
+        contentView.unblockButton.setOnClickListener { unblock() }
+        builder.setView(contentView)
+    }
+
+    private fun unblock() {
+        
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/BaseDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/BaseDialog.kt
new file mode 100644
index 0000000000..79bb1405a7
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/BaseDialog.kt
@@ -0,0 +1,26 @@
+package org.thoughtcrime.securesms.conversation.v2.utilities
+
+import android.app.Dialog
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.os.Bundle
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import org.thoughtcrime.securesms.loki.utilities.UiModeUtilities
+
+open class BaseDialog : DialogFragment() {
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val builder = AlertDialog.Builder(requireContext())
+        setContentView(builder)
+        val result = builder.create()
+        result.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+        val isLightMode = UiModeUtilities.isDayUiMode(requireContext())
+        result.window?.setDimAmount(if (isLightMode) 0.1f else 0.75f)
+        return result
+    }
+
+    open fun setContentView(builder: AlertDialog.Builder) {
+        // To be overridden by subclasses
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/OpenGroupGuidelinesActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/OpenGroupGuidelinesActivity.kt
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/conversation/v2/OpenGroupGuidelinesActivity.kt
rename to app/src/main/java/org/thoughtcrime/securesms/loki/activities/OpenGroupGuidelinesActivity.kt
index 4e0f42d215..9c714b6eff 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/OpenGroupGuidelinesActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/OpenGroupGuidelinesActivity.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.conversation.v2
+package org.thoughtcrime.securesms.loki.activities
 
 import android.os.Bundle
 import kotlinx.android.synthetic.main.activity_open_group_guidelines.*
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ClearAllDataDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ClearAllDataDialog.kt
index 8f14447d30..9db4533c9a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ClearAllDataDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ClearAllDataDialog.kt
@@ -12,21 +12,16 @@ import network.loki.messenger.R
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.loki.protocol.MultiDeviceProtocol
 import org.session.libsession.utilities.KeyPairUtilities
+import org.thoughtcrime.securesms.conversation.v2.utilities.BaseDialog
 import org.thoughtcrime.securesms.loki.utilities.UiModeUtilities
 
-class ClearAllDataDialog : DialogFragment() {
+class ClearAllDataDialog : BaseDialog() {
 
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val builder = AlertDialog.Builder(requireContext())
+    override fun setContentView(builder: AlertDialog.Builder) {
         val contentView = LayoutInflater.from(requireContext()).inflate(R.layout.dialog_clear_all_data, null)
         contentView.cancelButton.setOnClickListener { dismiss() }
         contentView.clearAllDataButton.setOnClickListener { clearAllData() }
         builder.setView(contentView)
-        val result = builder.create()
-        result.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        val isLightMode = UiModeUtilities.isDayUiMode(requireContext())
-        result.window?.setDimAmount(if (isLightMode) 0.1f else 0.75f)
-        return result
     }
 
     private fun clearAllData() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt
index 41509dc2a9..ab847ec2c1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt
@@ -1,25 +1,20 @@
 package org.thoughtcrime.securesms.loki.dialogs
 
-import android.app.Dialog
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-import android.os.Bundle
 import android.view.LayoutInflater
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.DialogFragment
 import kotlinx.android.synthetic.main.dialog_seed.view.*
 import network.loki.messenger.R
 import org.session.libsession.utilities.IdentityKeyUtil
 import org.thoughtcrime.securesms.loki.utilities.MnemonicUtilities
 import org.session.libsignal.crypto.MnemonicCodec
 import org.session.libsignal.utilities.hexEncodedPrivateKey
-import org.thoughtcrime.securesms.loki.utilities.UiModeUtilities
+import org.thoughtcrime.securesms.conversation.v2.utilities.BaseDialog
 
-class SeedDialog : DialogFragment() {
+class SeedDialog : BaseDialog() {
 
     private val seed by lazy {
         var hexEncodedSeed = IdentityKeyUtil.retrieve(requireContext(), IdentityKeyUtil.LOKI_SEED)
@@ -32,18 +27,12 @@ class SeedDialog : DialogFragment() {
         MnemonicCodec(loadFileContents).encode(hexEncodedSeed!!, MnemonicCodec.Language.Configuration.english)
     }
 
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val builder = AlertDialog.Builder(requireContext())
+    override fun setContentView(builder: AlertDialog.Builder) {
         val contentView = LayoutInflater.from(requireContext()).inflate(R.layout.dialog_seed, null)
         contentView.seedTextView.text = seed
         contentView.cancelButton.setOnClickListener { dismiss() }
         contentView.copyButton.setOnClickListener { copySeed() }
         builder.setView(contentView)
-        val result = builder.create()
-        result.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        val isLightMode = UiModeUtilities.isDayUiMode(requireContext())
-        result.window?.setDimAmount(if (isLightMode) 0.1f else 0.75f)
-        return result
     }
 
     private fun copySeed() {
diff --git a/app/src/main/res/layout/activity_conversation_v2.xml b/app/src/main/res/layout/activity_conversation_v2.xml
index 6636d05d2f..1a02994a07 100644
--- a/app/src/main/res/layout/activity_conversation_v2.xml
+++ b/app/src/main/res/layout/activity_conversation_v2.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <org.thoughtcrime.securesms.conversation.v2.OpenGroupGuidelinesView
+    <org.thoughtcrime.securesms.conversation.v2.components.OpenGroupGuidelinesView
         android:id="@+id/openGroupGuidelinesView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -18,7 +18,7 @@
         android:layout_height="match_parent"
         android:layout_marginBottom="@dimen/input_bar_height" />
 
-    <org.thoughtcrime.securesms.conversation.v2.TypingIndicatorViewContainer
+    <org.thoughtcrime.securesms.conversation.v2.components.TypingIndicatorViewContainer
         android:id="@+id/typingIndicatorViewContainer"
         android:layout_width="match_parent"
         android:layout_height="36dp"
diff --git a/app/src/main/res/layout/conversation_activity.xml b/app/src/main/res/layout/conversation_activity.xml
index d5859631fc..814d7d6943 100644
--- a/app/src/main/res/layout/conversation_activity.xml
+++ b/app/src/main/res/layout/conversation_activity.xml
@@ -135,7 +135,7 @@
                 android:background="?android:dividerHorizontal"
                 android:elevation="1dp" />
 
-            <org.thoughtcrime.securesms.conversation.v2.OpenGroupGuidelinesView
+            <org.thoughtcrime.securesms.conversation.v2.components.OpenGroupGuidelinesView
                 android:id="@+id/open_group_guidelines_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/conversation_typing_view.xml b/app/src/main/res/layout/conversation_typing_view.xml
index 6cbdbf8ae2..e3ba2a3d92 100644
--- a/app/src/main/res/layout/conversation_typing_view.xml
+++ b/app/src/main/res/layout/conversation_typing_view.xml
@@ -24,7 +24,7 @@
         android:padding="12dp"
         android:background="@drawable/message_bubble_background">
 
-        <org.thoughtcrime.securesms.conversation.v2.TypingIndicatorView
+        <org.thoughtcrime.securesms.conversation.v2.components.TypingIndicatorView
             android:id="@+id/typing_indicator"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/dialog_blocked.xml b/app/src/main/res/layout/dialog_blocked.xml
new file mode 100644
index 0000000000..b66fa4fe98
--- /dev/null
+++ b/app/src/main/res/layout/dialog_blocked.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/default_dialog_background_inset"
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:elevation="4dp"
+    android:padding="32dp">
+
+    <TextView
+        android:id="@+id/blockedTitleTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/dialog_blocked_title"
+        android:textColor="@color/text"
+        android:textStyle="bold"
+        android:textSize="@dimen/large_font_size" />
+
+    <TextView
+        android:id="@+id/blockedExplanationTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:text="@string/dialog_blocked_explanation"
+        android:textColor="@color/text"
+        android:textSize="@dimen/small_font_size"
+        android:textAlignment="center" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:orientation="horizontal">
+
+        <Button
+            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            android:id="@+id/cancelButton"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/small_button_height"
+            android:layout_weight="1"
+            android:text="@string/cancel" />
+
+        <Button
+            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            android:id="@+id/unblockButton"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/small_button_height"
+            android:layout_weight="1"
+            android:layout_marginStart="@dimen/medium_spacing"
+            android:text="@string/ConversationActivity_unblock" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_conversation.xml b/app/src/main/res/layout/view_conversation.xml
index 48468256f5..56f818d827 100644
--- a/app/src/main/res/layout/view_conversation.xml
+++ b/app/src/main/res/layout/view_conversation.xml
@@ -126,7 +126,7 @@
                         android:textColor="@color/text"
                         tools:text="Sorry, gotta go fight crime again" />
 
-                    <org.thoughtcrime.securesms.conversation.v2.TypingIndicatorView
+                    <org.thoughtcrime.securesms.conversation.v2.components.TypingIndicatorView
                         android:id="@+id/typingIndicatorView"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/view_conversation_typing_container.xml b/app/src/main/res/layout/view_conversation_typing_container.xml
index cd1d4236f2..95469b29f2 100644
--- a/app/src/main/res/layout/view_conversation_typing_container.xml
+++ b/app/src/main/res/layout/view_conversation_typing_container.xml
@@ -17,7 +17,7 @@
         android:background="@drawable/message_bubble_background_received_alone"
         android:backgroundTint="?message_received_background_color">
 
-        <org.thoughtcrime.securesms.conversation.v2.TypingIndicatorView
+        <org.thoughtcrime.securesms.conversation.v2.components.TypingIndicatorView
             android:id="@+id/typingIndicator"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/view_typing_indicator.xml b/app/src/main/res/layout/view_typing_indicator.xml
index c264e69d53..b48c554476 100644
--- a/app/src/main/res/layout/view_typing_indicator.xml
+++ b/app/src/main/res/layout/view_typing_indicator.xml
@@ -5,7 +5,7 @@
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="org.thoughtcrime.securesms.conversation.v2.TypingIndicatorView">
+    tools:context="org.thoughtcrime.securesms.conversation.v2.components.TypingIndicatorView">
 
     <View
         android:id="@+id/typing_dot1"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b4fd882fe7..ebbced7cf1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -309,7 +309,7 @@
     <string name="MediaPreviewActivity_you">You</string>
     <string name="MediaPreviewActivity_unssuported_media_type">Unsupported media type</string>
     <string name="MediaPreviewActivity_draft">Draft</string>
-    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Session needs the Storage permission in order to save to external storage, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Storage\".</string>
+    <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Session needs storage access in order to save to external storage, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Storage\".</string>
     <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Unable to save to external storage without permissions</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Delete message?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">This will permanently delete this message.</string>
@@ -853,4 +853,8 @@
 
     <string name="document">Document</string>
 
+    <string name="dialog_blocked_title">Unblock %s?</string>
+    <string name="dialog_blocked_explanation">Are you sure you want to unblock %s?</string>
+
+
 </resources>