From 0fbe43c2dcfadc918ebabfb8a07dcd4d161abc7e Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@nonnenberg.com>
Date: Tue, 8 Aug 2017 11:17:03 -0700
Subject: [PATCH] Protobufs: More logging on failure to load protobufs, fix
 tests

FREEBIE
---
 js/libtextsecure.js        | 4 ++++
 libtextsecure/protobufs.js | 4 ++++
 test/index.html            | 1 -
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/js/libtextsecure.js b/js/libtextsecure.js
index 93628f134..6f127c5d8 100644
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@@ -37097,11 +37097,15 @@ Internal.SessionLock.queueJobForNumber = function queueJobForNumber(number, runJ
     function loadProtoBufs(filename) {
         return dcodeIO.ProtoBuf.loadProtoFile({root: window.PROTO_ROOT, file: filename}, function(error, result) {
             if (error) {
+                var text = 'Error loading protos from ' + filename + ' (root: ' + window.PROTO_ROOT + ') '
+                    + (error && error.stack ? error.stack : error);
+                console.log(text);
                 throw error;
             }
             var protos = result.build('textsecure');
             if (!protos) {
                 var text = 'Error loading protos from ' + filename + ' (root: ' + window.PROTO_ROOT + ')';
+                console.log(text);
                 throw new Error(text);
             }
             for (var protoName in protos) {
diff --git a/libtextsecure/protobufs.js b/libtextsecure/protobufs.js
index d7f061436..9f578ec29 100644
--- a/libtextsecure/protobufs.js
+++ b/libtextsecure/protobufs.js
@@ -6,11 +6,15 @@
     function loadProtoBufs(filename) {
         return dcodeIO.ProtoBuf.loadProtoFile({root: window.PROTO_ROOT, file: filename}, function(error, result) {
             if (error) {
+                var text = 'Error loading protos from ' + filename + ' (root: ' + window.PROTO_ROOT + ') '
+                    + (error && error.stack ? error.stack : error);
+                console.log(text);
                 throw error;
             }
             var protos = result.build('textsecure');
             if (!protos) {
                 var text = 'Error loading protos from ' + filename + ' (root: ' + window.PROTO_ROOT + ')';
+                console.log(text);
                 throw new Error(text);
             }
             for (var protoName in protos) {
diff --git a/test/index.html b/test/index.html
index bb788a81a..0baa87c9d 100644
--- a/test/index.html
+++ b/test/index.html
@@ -590,7 +590,6 @@
   <script type="text/javascript" src="../js/models/conversations.js" data-cover></script>
   <script type="text/javascript" src="../js/models/blockedNumbers.js" data-cover></script>
   <script type="text/javascript" src="../js/conversation_controller.js" data-cover></script>
-  <script type="text/javascript" src="../js/panel_controller.js" data-cover></script>
   <script type='text/javascript' src='../js/emoji_util.js' data-cover></script>
   <script type="text/javascript" src="../js/keychange_listener.js" data-cover></script>
   <script type='text/javascript' src='../js/expiring_messages.js' data-cover></script>