From 92e51b05acc550a71e58fe8ecc37181b72602a12 Mon Sep 17 00:00:00 2001
From: Anthony Bilinski <me@abilinski.com>
Date: Sun, 26 Jan 2020 20:30:49 -0800
Subject: [PATCH 1/3] fix(db): fix schema log to display correct version

---
 src/persistence/db/rawdatabase.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/persistence/db/rawdatabase.cpp b/src/persistence/db/rawdatabase.cpp
index 013dc2e85..f0471824d 100644
--- a/src/persistence/db/rawdatabase.cpp
+++ b/src/persistence/db/rawdatabase.cpp
@@ -282,7 +282,7 @@ bool RawDatabase::setCipherParameters(int majorVersion, const QString& database)
             return false;
         }
     }
-    qDebug() << "Setting SQLCipher 4.x parameters";
+    qDebug().nospace() << "Setting SQLCipher " << majorVersion << ".x parameters";
     return execNow(defaultParams.replace("database.", prefix));
 }
 

From 5b31effdb4f4b22c4d2ad64193ce799bef0db2b6 Mon Sep 17 00:00:00 2001
From: Anthony Bilinski <me@abilinski.com>
Date: Sat, 25 Jan 2020 20:17:11 -0800
Subject: [PATCH 2/3] fix(group): don't display netcam view for group voice
 calls

This is a minimal fix to reduce risk for the release. A more complete
re-architecture will be made.

The netcam covers much of the chat in groups, and has nothing to show since
group video calls aren't possible. Who is speaking in call is already shown by
the bold names at the top of the group, taking much less space.

Fix #5918
---
 src/widget/form/groupchatform.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/widget/form/groupchatform.cpp b/src/widget/form/groupchatform.cpp
index 454afbb92..027a4c6e4 100644
--- a/src/widget/form/groupchatform.cpp
+++ b/src/widget/form/groupchatform.cpp
@@ -342,7 +342,6 @@ void GroupChatForm::onCallClicked()
         audioInputFlag = true;
         audioOutputFlag = true;
         inCall = true;
-        showNetcam();
     } else {
         leaveGroupCall();
     }
@@ -477,5 +476,4 @@ void GroupChatForm::leaveGroupCall()
     audioInputFlag = false;
     audioOutputFlag = false;
     inCall = false;
-    hideNetcam();
 }

From 475128d171984de5f9ff34f98020a119dce65b42 Mon Sep 17 00:00:00 2001
From: Anthony Bilinski <me@abilinski.com>
Date: Fri, 21 Feb 2020 22:57:58 -0800
Subject: [PATCH 3/3] fix(ci): quote shell comparison to avoid errors when
 unset

Avoids log of "/home/travis/.travis/functions: line 109: test: ==: unary
operator expected" in travisci build output
---
 .travis.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8e30033ee..fc91525b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -271,12 +271,12 @@ deploy:
 
 after_success:
   - >
-    test $TRAVIS_PULL_REQUEST == "false"
-    && test $TRAVIS_BRANCH == "master"
-    && test $JOB == "build-docs"
+    test "$TRAVIS_PULL_REQUEST" == "false"
+    && test "$TRAVIS_BRANCH" == "master"
+    && test "$JOB" == "build-docs"
     && bash ./.travis/deploy-docs.sh
   - >
-    test $TRAVIS_PULL_REQUEST == "false"
-    && test $TRAVIS_BRANCH == "master"
-    && test $JOB == "build-gitstats"
+    test "$TRAVIS_PULL_REQUEST" == "false"
+    && test "$TRAVIS_BRANCH" == "master"
+    && test "$JOB" == "build-gitstats"
     && bash ./.travis/deploy-gitstats.sh