deviceErrorAlert

voiceip · Feb 4, 2019 · 049f05c · 049f05c
1 parent 6307226
commit 049f05c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git a/config.json b/config.json
@@ -16,5 +16,6 @@
 	"securityCode" : "D9C853F4897CF64307DB652246827FAC83111303F3E207F8FD9F5E5DC89A9EF9",
 	"autoUnHold" : true,
 	"testAudioDevice" : true,
-	"unregisterOnDeviceError" : true
+	"unregisterOnDeviceError" : true,
+	"deviceErrorAlert" : true
 }
diff --git a/tinyphone/call.cpp b/tinyphone/call.cpp
@@ -62,7 +62,7 @@ void SIPCall::onCallMediaState(OnCallMediaStateParam &prm)
 	}
 	catch (...) {
 		PJ_LOG(3, (__FILENAME__, "Call [%d] OnCallMediaState Media Connect Error", ci.id));
-		tp::DisplayError("ERROR Connecting Call Media Stream, Please Contact IT Support", tp::OPS::ASYNC);
+		tp::DisplayError(MSG_CONTACT_IT_SUPPORT, tp::OPS::ASYNC);
 		if (tp::ApplicationConfig.unregisterOnDeviceError) {
 			PJ_LOG(3, (__FILENAME__, "Call [%d] OnCallMediaState unregisterOnDeviceError Acc: [%s]", ci.id, account->Name().c_str()));
 			account->UnRegister();	

diff --git a/tinyphone/config.h b/tinyphone/config.h
@@ -47,6 +47,8 @@ namespace tp {
 		bool testAudioDevice;
 		bool unregisterOnDeviceError;
 
+		bool deviceErrorAlert;
+
 		std::string ua(){
 			std::string productVersion;
 			GetProductVersion(productVersion);
@@ -74,6 +76,7 @@ namespace tp {
 			{"autoUnHold", p.autoUnHold },
 			{"testAudioDevice", p.testAudioDevice },
 			{"unregisterOnDeviceError", p.unregisterOnDeviceError },
+			{"deviceErrorAlert", p.deviceErrorAlert },
 
 		};
     }
@@ -97,6 +100,7 @@ namespace tp {
 		j.at("autoUnHold").get_to(p.autoUnHold);
 		j.at("testAudioDevice").get_to(p.testAudioDevice);
 		j.at("unregisterOnDeviceError").get_to(p.unregisterOnDeviceError);
+		j.at("deviceErrorAlert").get_to(p.deviceErrorAlert);
     }
 
     extern appConfig ApplicationConfig;

diff --git a/tinyphone/consts.h b/tinyphone/consts.h
@@ -24,4 +24,6 @@
 #define SIP_LOG_FILE "tinyphone"
 #define HTTP_LOG_FILE "tinyphone-http"
 
+#define MSG_CONTACT_IT_SUPPORT "ERROR Connecting Audio Device, Please Contact IT Support"
+
 #endif
diff --git a/tinyphone/server.cpp b/tinyphone/server.cpp
@@ -209,6 +209,9 @@ void TinyPhoneHttpServer::Start() {
 			return tp::response(500, DEFAULT_HTTP_SERVER_ERROR_REPONSE);
 		}
 		catch (std::domain_error& e) {
+			if (ApplicationConfig.deviceErrorAlert) {
+				tp::DisplayError(MSG_CONTACT_IT_SUPPORT, tp::OPS::ASYNC);
+			}
 			std::string response_msg = "System Error: " + string(e.what());
 			return tp::response(500, {
 				{ "message", response_msg },