Skip to content
Snippets Groups Projects
Commit 4adb8ecc authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

[fix] Use config timeout by default, when nothing configured in settings

parent fcae4bc2
No related branches found
No related tags found
No related merge requests found
......@@ -2,7 +2,7 @@ var App;
angular.module('cesium.device.services', ['cesium.utils.services', 'cesium.settings.services'])
.factory('Device', function($rootScope, $translate, $ionicPopup, $q, Api,
.factory('Device', function($rootScope, $translate, $ionicPopup, $q, Api, csConfig,
// removeIf(no-device)
$cordovaClipboard, $cordovaBarcodeScanner, $cordovaCamera, $cordovaNetwork,
// endRemoveIf(no-device)
......@@ -209,7 +209,7 @@ angular.module('cesium.device.services', ['cesium.utils.services', 'cesium.setti
timeout = defaultTimeout;
break;
}
console.debug('[network] Using timeout: {1}ms (connection type: \'{0}\')'.format(connectionType, timeout));
console.debug('[device] Using timeout: {1}ms (connection type: \'{0}\')'.format(connectionType, timeout));
return timeout;
} catch(err) {
......
......@@ -106,7 +106,7 @@ angular.module('cesium.network.services', ['ngApi', 'cesium.currency.services',
}
// Computing timeout from the connection type
return Device.network.timeout(csConfig.timeout);
return Device.network.timeout();
},
hasPeers = function() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment