From 49c73895cf91dcb4fa7d83f0d2bae91d02160142 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 27 Mar 2019 17:01:15 +0100
Subject: [PATCH 1/3] check if the user is running brave browser

---
 www/common/cryptpad-common.js | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index e19b59a9e..831b9faa3 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1135,6 +1135,31 @@ define([
             window.RTCPeerConnection);
     };
 
+    common.isBrave = function () { // Courtesy of https://www.ctrl.blog/entry/brave-user-agent-detection
+        try {
+            // initial assertions
+            if (!window.google_onload_fired && navigator.userAgent && !navigator.userAgent.includes('Chrome')) {
+                return false;
+            }
+
+            // set up test
+            var test = document.createElement('iframe');
+            test.style.display = 'none';
+            document.body.appendChild(test);
+
+            // empty frames only have this attribute set in Brave Shield
+            var is_brave = (test.contentWindow.google_onload_fired === true);
+
+            // teardown test
+            test.parentNode.removeChild(test);
+
+            return is_brave;
+        } catch (e) { // just in case...
+            console.error(e);
+            return false;
+        }
+    };
+
     common.ready = (function () {
         var env = {};
         var initialized = false;
@@ -1182,6 +1207,10 @@ define([
                 Feedback.send('NO_CSS_VARIABLES');
             }
 
+            if (common.isBrave()) {
+                Feedback.send('BRAVE_BROWSER');
+            }
+
             Feedback.reportScreenDimensions();
             Feedback.reportLanguage();
         };

From 0ae6ce43f2eaec15721de0f389e1b23d22e66b53 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 27 Mar 2019 17:16:05 +0100
Subject: [PATCH 2/3] disable flow

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 047f0502e..c877e437e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,5 +8,4 @@ node_js:
   - "6.6.0"
 script:
   - npm run-script lint
-  - npm run-script flow
   - docker build -t xwiki/cryptpad .

From 94d54c0f1a7749e3022d29402e5d8adfab304790 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Wed, 27 Mar 2019 17:47:30 +0100
Subject: [PATCH 3/3] revert brave detection as it doesn't work

---
 www/common/cryptpad-common.js | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 674dbb905..5a15bcdf4 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1140,31 +1140,6 @@ define([
             window.RTCPeerConnection);
     };
 
-    common.isBrave = function () { // Courtesy of https://www.ctrl.blog/entry/brave-user-agent-detection
-        try {
-            // initial assertions
-            if (!window.google_onload_fired && navigator.userAgent && !navigator.userAgent.includes('Chrome')) {
-                return false;
-            }
-
-            // set up test
-            var test = document.createElement('iframe');
-            test.style.display = 'none';
-            document.body.appendChild(test);
-
-            // empty frames only have this attribute set in Brave Shield
-            var is_brave = (test.contentWindow.google_onload_fired === true);
-
-            // teardown test
-            test.parentNode.removeChild(test);
-
-            return is_brave;
-        } catch (e) { // just in case...
-            console.error(e);
-            return false;
-        }
-    };
-
     common.ready = (function () {
         var env = {};
         var initialized = false;
@@ -1212,10 +1187,6 @@ define([
                 Feedback.send('NO_CSS_VARIABLES');
             }
 
-            if (common.isBrave()) {
-                Feedback.send('BRAVE_BROWSER');
-            }
-
             Feedback.reportScreenDimensions();
             Feedback.reportLanguage();
         };