Merge pull request #3336 from matrix-org/travis/fix-removing-widgets

No-op removals of widgets that don't exist
matrix-org · Aug 22, 2019 · e9b44c9 · e9b44c9
2 parents 088568e + 19b7d18
commit e9b44c9
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
@@ -354,7 +354,9 @@ export default class WidgetUtils {
         if (!client) {
             throw new Error('User not logged in');
         }
-        const userWidgets = client.getAccountData('m.widgets').getContent() || {};
+        const widgets = client.getAccountData('m.widgets');
+        if (!widgets) return;
+        const userWidgets = widgets.getContent() || {};
         Object.entries(userWidgets).forEach(([key, widget]) => {
             if (widget.content && widget.content.type === "m.integration_manager") {
                 delete userWidgets[key];
@@ -382,7 +384,9 @@ export default class WidgetUtils {
         if (!client) {
             throw new Error('User not logged in');
         }
-        const userWidgets = client.getAccountData('m.widgets').getContent() || {};
+        const widgets = client.getAccountData('m.widgets');
+        if (!widgets) return;
+        const userWidgets = widgets.getContent() || {};
         Object.entries(userWidgets).forEach(([key, widget]) => {
             if (widget.content && widget.content.type === 'm.stickerpicker') {
                 delete userWidgets[key];