summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2016-01-26 21:13:44 -0500
committer=Corey Hulen <corey@hulen.com>2016-01-26 21:13:44 -0500
commit6fd0f651b94e594dddb00800bf295af7ff42934e (patch)
tree10d025a5f4cc8706d0da3346be91dfaeff0b88bd
parent0dec26bb9f3e05a84873996c9ecb3bd87b7dc925 (diff)
downloadchat-6fd0f651b94e594dddb00800bf295af7ff42934e.tar.gz
chat-6fd0f651b94e594dddb00800bf295af7ff42934e.tar.bz2
chat-6fd0f651b94e594dddb00800bf295af7ff42934e.zip
Fixing naming
-rw-r--r--store/store.go2
-rw-r--r--web/react/components/activity_log_modal.jsx2
2 files changed, 2 insertions, 2 deletions
diff --git a/store/store.go b/store/store.go
index e8c5537ac..3988f0c6a 100644
--- a/store/store.go
+++ b/store/store.go
@@ -137,7 +137,7 @@ type SessionStore interface {
PermanentDeleteSessionsByUser(teamId string) StoreChannel
UpdateLastActivityAt(sessionId string, time int64) StoreChannel
UpdateRoles(userId string, roles string) StoreChannel
- UpdateDeviceId(sessionIdOrToken string, deviceId string) StoreChannel
+ UpdateDeviceId(id string, deviceId string) StoreChannel
}
type AuditStore interface {
diff --git a/web/react/components/activity_log_modal.jsx b/web/react/components/activity_log_modal.jsx
index 91ca87647..eec4d8f8d 100644
--- a/web/react/components/activity_log_modal.jsx
+++ b/web/react/components/activity_log_modal.jsx
@@ -103,7 +103,7 @@ export default class ActivityLogModal extends React.Component {
} else if (currentSession.device_id.indexOf('apple:') === 0) {
devicePicture = 'fa fa-apple';
devicePlatform = 'iPhone Native App';
- } else if (currentSession.device_id.indexOf('Android:') === 0) {
+ } else if (currentSession.device_id.indexOf('android:') === 0) {
devicePlatform = 'Android Native App';
devicePicture = 'fa fa-android';
} else if (currentSession.props.platform === 'Macintosh' ||