Safemobile/safedispatch-mobile
20
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into features/SD-211-recordings-tab

Browse Source 
# Conflicts:
#	libSafeMobile/src/main/java/com/safemobile/services/TCPhandler.java
#	safeDispatch/src/main/res/layout/dialog_login.xml
This commit is contained in:
Bogdan Ungureanu
2022-03-30 10:38:47 +03:00
parent 3f96055a6e 94091a9a31
commit e59b522ccb
18 changed files with 834 additions and 862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libSafeMobile/src/main/java/com/safemobile/services/TCPService.java
View File

@ -28,13 +28,11 @@ public class TCPService extends Service {
int port = 13589;
try {
port = Integer.parseInt(AppParams.PORT);
}
catch(Exception ex) { }
} catch(Exception ex) { }
tcpParser = new TCPmsgParser();
if(tcp == null && !AppParams.IP.equalsIgnoreCase("n/a"))
{
if(tcp == null && !AppParams.IP.equalsIgnoreCase("n/a")) {
tcp = new TCPhandler(getApplicationContext(), AppParams.IP, port);
}