From 7b4694c637b1e64fd02690b91edad3c22c36a90f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 24 Oct 2016 15:12:16 +0100
Subject: [PATCH] Move platform setting to its own thing

---
 src/vector/index.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/vector/index.js b/src/vector/index.js
index 8a3fc1a692..4c965ef317 100644
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -46,6 +46,7 @@ if (process.env.NODE_ENV !== 'production') {
 var RunModernizrTests = require("./modernizr"); // this side-effects a global
 var ReactDOM = require("react-dom");
 var sdk = require("matrix-react-sdk");
+var PlatformPeg = require("matrix-react-sdk/lib/PlatformPeg");
 sdk.loadSkin(require('../component-index'));
 var VectorConferenceHandler = require('../VectorConferenceHandler');
 var UpdateChecker = require("./updater");
@@ -209,7 +210,9 @@ function onLoadCompleted() {
 async function loadApp() {
     const fragparts = parseQsFromFragment(window.location);
     const params = parseQs(window.location);
-    const platform = new Platform();
+
+    // set the platform for react sdk (our Platform object automatically picks the right one)
+    PlatformPeg.set(new Platform());
 
     // don't try to redirect to the native apps if we're
     // verifying a 3pid
@@ -263,7 +266,6 @@ async function loadApp() {
                 enableGuest={true}
                 onLoadCompleted={onLoadCompleted}
                 defaultDeviceDisplayName={getDefaultDeviceDisplayName()}
-                platform={platform}
             />,
             document.getElementById('matrixchat')
         );