From 0153f39c10bedae25cd04abd74ffa0406ccb07dd Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 9 Apr 2020 22:55:28 +0100
Subject: [PATCH 1/3] Rageshake, remind user of unsupported browser and report
 missing features in report

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/BugReportDialog.js | 8 ++++++++
 src/rageshake/submit-rageshake.js               | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/src/components/views/dialogs/BugReportDialog.js b/src/components/views/dialogs/BugReportDialog.js
index 6e337d53dc..2f7ad4163d 100644
--- a/src/components/views/dialogs/BugReportDialog.js
+++ b/src/components/views/dialogs/BugReportDialog.js
@@ -137,12 +137,20 @@ export default class BugReportDialog extends React.Component {
             );
         }
 
+        let warning;
+        if (window.Modernizr && Object.values(window.Modernizr).some(support => support === false)) {
+            warning = <p><b>
+                { _t("Your browser is unsupported, you accepted that things may not work.") }
+            </b></p>;
+        }
+
         return (
             <BaseDialog className="mx_BugReportDialog" onFinished={this._onCancel}
                     title={_t('Submit debug logs')}
                 contentId='mx_Dialog_content'
             >
                 <div className="mx_Dialog_content" id='mx_Dialog_content'>
+                    { warning }
                     <p>
                         { _t(
                             "Debug logs contain application usage data including your " +
diff --git a/src/rageshake/submit-rageshake.js b/src/rageshake/submit-rageshake.js
index 00ef87f89c..2c529ea0b9 100644
--- a/src/rageshake/submit-rageshake.js
+++ b/src/rageshake/submit-rageshake.js
@@ -136,6 +136,13 @@ export default async function sendBugReport(bugReportEndpoint, opts) {
         } catch (e) {}
     }
 
+    if (window.Modernizr) {
+        const missingFeatures = Object.keys(window.Modernizr).filter(key => window.Modernizr[key] === false);
+        if (missingFeatures.length > 0) {
+            body.append("modernizr_missing_features", missingFeatures.join(", "));
+        }
+    }
+
     if (opts.sendLogs) {
         progressCallback(_t("Collecting logs"));
         const logs = await rageshake.getLogsForReport();

From f91565c231278bbf510bcd33ac9ffded38983987 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 10 Apr 2020 13:33:57 +0100
Subject: [PATCH 2/3] only append crypto details if crypto is enabled

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/rageshake/submit-rageshake.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/rageshake/submit-rageshake.js b/src/rageshake/submit-rageshake.js
index 2c529ea0b9..55c89427c5 100644
--- a/src/rageshake/submit-rageshake.js
+++ b/src/rageshake/submit-rageshake.js
@@ -96,12 +96,14 @@ export default async function sendBugReport(bugReportEndpoint, opts) {
         body.append('device_id', client.deviceId);
     }
 
-    const keys = [`ed25519:${client.getDeviceEd25519Key()}`];
-    if (client.getDeviceCurve25519Key) {
-        keys.push(`curve25519:${client.getDeviceCurve25519Key()}`);
+    if (client.isCryptoEnabled()) {
+        const keys = [`ed25519:${client.getDeviceEd25519Key()}`];
+        if (client.getDeviceCurve25519Key) {
+            keys.push(`curve25519:${client.getDeviceCurve25519Key()}`);
+        }
+        body.append('device_keys', keys.join(', '));
+        body.append('cross_signing_key', client.getCrossSigningId());
     }
-    body.append('device_keys', keys.join(', '));
-    body.append('cross_signing_key', client.getCrossSigningId());
 
     if (opts.label) {
         body.append('label', opts.label);

From 81c7660bf572167b63f9f85570b1f4ffa8b82acc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 17 Apr 2020 12:25:16 +0100
Subject: [PATCH 3/3] Iterate copy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/BugReportDialog.js | 2 +-
 src/i18n/strings/en_EN.json                     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/BugReportDialog.js b/src/components/views/dialogs/BugReportDialog.js
index 2f7ad4163d..9bb716fe3f 100644
--- a/src/components/views/dialogs/BugReportDialog.js
+++ b/src/components/views/dialogs/BugReportDialog.js
@@ -140,7 +140,7 @@ export default class BugReportDialog extends React.Component {
         let warning;
         if (window.Modernizr && Object.values(window.Modernizr).some(support => support === false)) {
             warning = <p><b>
-                { _t("Your browser is unsupported, you accepted that things may not work.") }
+                { _t("Reminder: Your browser is unsupported, so your experience may be unpredictable.") }
             </b></p>;
         }
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 067d5d8eee..aa104e3686 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1526,6 +1526,7 @@
     "Logs sent": "Logs sent",
     "Thank you!": "Thank you!",
     "Failed to send logs: ": "Failed to send logs: ",
+    "Reminder: Your browser is unsupported, so your experience may be unpredictable.": "Reminder: Your browser is unsupported, so your experience may be unpredictable.",
     "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.",
     "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.",
     "GitHub issue": "GitHub issue",