Merge pull request #892 from BlueBubblesApp/zach/beta

Fixes grey screen when creating a new chat
BlueBubblesApp · Jun 18, 2021 · 5530bbb · 5530bbb
2 parents e6e84b9 + a9bad41
commit 5530bbb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -53,7 +53,7 @@ android {
         // version code: 1  0114                    0                70      64
 
         //noinspection AccidentalOctal
-        versionCode 11100064
+        versionCode 11110064
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

diff --git a/assets/changelog/changelog.md b/assets/changelog/changelog.md
@@ -2,6 +2,10 @@
 
 Below are the last few BlueBubbles App release changelogs
 
+## v1.1.1
+
+* Bug Fix: Fixes grey screen when creating a new chat
+
 ## v1.1.0
 
 * New Feature: Adds back button to image viewer

diff --git a/lib/layouts/conversation_view/conversation_view_mixin.dart b/lib/layouts/conversation_view/conversation_view_mixin.dart
@@ -264,7 +264,7 @@ mixin ConversationViewMixin<ConversationViewState extends StatefulWidget> on Sta
   Widget buildCupertinoTrailing() {
     Color fontColor = Theme.of(context).textTheme.headline1.color;
     bool manualMark = SettingsManager().settings.enablePrivateAPI && SettingsManager().settings.privateManualMarkAsRead;
-    bool showManual = !SettingsManager().settings.privateMarkChatAsRead && !widget.chat.isGroup();
+    bool showManual = !SettingsManager().settings.privateMarkChatAsRead && !(widget.chat?.isGroup() ?? false);
     List<Widget> items = [
       if (showManual && manualMark && markingAsRead)
         Padding(