Merge branch 'master' into dev

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt

@@ -1277,7 +1277,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     }
 
     private fun saveDraft() {
-        val text = inputBar.text.trim()
+        val text = inputBar?.text?.trim() ?: return
         if (text.isEmpty()) { return }
         val drafts = Drafts()
         drafts.add(DraftDatabase.Draft(DraftDatabase.Draft.TEXT, text))

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt

@@ -83,7 +83,7 @@ class VisibleMessageView : LinearLayout {
         val senderSessionID = sender.address.serialize()
         val threadID = message.threadId
         val threadDB = DatabaseFactory.getThreadDatabase(context)
-        val thread = threadDB.getRecipientForThreadId(threadID)!!
+        val thread = threadDB.getRecipientForThreadId(threadID) ?: return
         val contactDB = DatabaseFactory.getSessionContactDatabase(context)
         val isGroupThread = thread.isGroupRecipient
         val isStartOfMessageCluster = isStartOfMessageCluster(message, previous, isGroupThread)

app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java

@@ -883,6 +883,7 @@ public class MmsDatabase extends MessagingDatabase {
   }
 
   public void deleteQuotedFromMessages(MessageRecord toDeleteRecord) {
+    if (toDeleteRecord == null) { return; }
     String query = THREAD_ID + " = ?";
     Cursor threadMmsCursor = rawQuery(query, new String[]{String.valueOf(toDeleteRecord.getThreadId())});
     Reader reader = readerFor(threadMmsCursor);

app/src/main/java/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt

@@ -191,6 +191,7 @@ class EnterPublicKeyFragment : Fragment() {
     }
 
     private fun handleIsKeyboardShowingChanged() {
+        val optionalContentContainer = optionalContentContainer ?: return
         optionalContentContainer.isVisible = !isKeyboardShowing
     }