From bf558b46c3cfc9ee7b19dbe7a92ac79ed118e498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Wed, 13 Nov 2019 15:39:39 +0100
Subject: [PATCH] EventIndexPeg: Clean up the event index initialization.

---
 src/EventIndexPeg.js | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/EventIndexPeg.js b/src/EventIndexPeg.js
index bec3f075b6..3ce88339eb 100644
--- a/src/EventIndexPeg.js
+++ b/src/EventIndexPeg.js
@@ -47,15 +47,25 @@ class EventIndexPeg {
      */
     async init() {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
-        console.log("Initializing event index, got {}", indexManager);
         if (indexManager === null) return false;
 
-        console.log("Seshat: Creatingnew EventIndex object", indexManager);
-        const index = new EventIndex();
+        if (await indexManager.supportsEventIndexing() !== true) {
+            console.log("EventIndex: Platform doesn't support event indexing,",
+                        "not initializing.");
+            return false;
+        }
 
+        const index = new EventIndex();
         const userId = MatrixClientPeg.get().getUserId();
-        // TODO log errors here and return false if it errors out.
-        await index.init(userId);
+
+        try {
+            await index.init(userId);
+        } catch (e) {
+            console.log("EventIndex: Error initializing the event index", e);
+        }
+
+        console.log("EventIndex: Successfully initialized the event index");
+
         this.index = index;
 
         return true;