matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00
Code Activity

Merge branch 'develop' into travis/remove-presence

Browse Source
This commit is contained in:
Travis Ralston
2018-04-11 15:17:28 -06:00
parent 99d3045b4f 979452628f
commit fe2cbc584d
246 changed files with 16884 additions and 4954 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Presence.js
View File

@@ -1,5 +1,6 @@
/*
Copyright 2015, 2016 OpenMarket Ltd
Copyright 2018 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -31,7 +32,7 @@ class Presence {
this.running = true;
if (undefined === this.state) {
this._resetTimer();
this.dispatcherRef = dis.register(this._onUserActivity.bind(this));
this.dispatcherRef = dis.register(this._onAction.bind(this));
}
}
@@ -95,8 +96,10 @@ class Presence {
this.setState("unavailable");
}
_onUserActivity() {
this._resetTimer();
_onAction(payload) {
if (payload.action === "user_activity") {
this._resetTimer();
}
}
/**