From 4adb8ecca63aedda40ee7946748005cf63ba820c Mon Sep 17 00:00:00 2001
From: Benoit Lavenier <benoit.lavenier@e-is.pro>
Date: Thu, 11 May 2023 12:35:23 +0200
Subject: [PATCH] [fix] Use config timeout by default, when nothing configured
in settings
---
www/js/services/device-services.js | 4 ++--
www/js/services/network-services.js | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/www/js/services/device-services.js b/www/js/services/device-services.js
index 89a06cc02..14a5fe84a 100644
--- a/www/js/services/device-services.js
+++ b/www/js/services/device-services.js
@@ -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) {
diff --git a/www/js/services/network-services.js b/www/js/services/network-services.js
index 5c3873032..28f62358a 100644
--- a/www/js/services/network-services.js
+++ b/www/js/services/network-services.js
@@ -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() {
--
GitLab