update android init

This commit is contained in:
Luke Pulverenti 2016-02-05 12:04:38 -05:00
parent 69daa8a476
commit 9a643e6058
2 changed files with 9 additions and 6 deletions

View File

@ -47,7 +47,7 @@
function updateDeviceProfileForAndroid(profile) { function updateDeviceProfileForAndroid(profile) {
// Just here as an easy escape out, if ever needed // Just here as an easy escape out, if ever needed
var enableVlcVideo = true; var enableVlcVideo = window.VlcAudio;
var enableVlcAudio = true; var enableVlcAudio = true;
if (enableVlcVideo) { if (enableVlcVideo) {

View File

@ -2368,11 +2368,14 @@ var AppInfo = {};
// Remove special characters // Remove special characters
var cleanDeviceName = device.model.replace(/[^\w\s]/gi, ''); var cleanDeviceName = device.model.replace(/[^\w\s]/gi, '');
var deviceId = window.MainActivity ? MainActivity.getLegacyDeviceId() : null; var deviceId = null;
deviceId = deviceId || device.uuid;
if (window.MainActivity) {
deviceId = MainActivity.getLegacyDeviceId();
}
resolve({ resolve({
deviceId: deviceId, deviceId: deviceId || device.uuid,
deviceName: cleanDeviceName, deviceName: cleanDeviceName,
appName: name, appName: name,
appVersion: appVersion appVersion: appVersion