Compare commits
No commits in common. "2a1517526dd2b7bc1329d4122f661acddd9cc55d" and "e1bcc44fbe0708da6dbc474f96f6b6d82af28a80" have entirely different histories.
2a1517526d
...
e1bcc44fbe
@ -25,7 +25,6 @@ public abstract class AbstractLiveActivity extends AppCompatActivity {
|
||||
public abstract void vehicleStatusReceived(long imei, int opCode, int status); // --> UpdateOptions
|
||||
public abstract void emergencyAlarmReceived(int position, double lat, double lng); // --> UpdateEmergencyAlarm
|
||||
public abstract GoogleMap getMap(); // --> UpdateEmergencyAlarm
|
||||
public abstract void setLanguage();
|
||||
|
||||
/** Misc */
|
||||
public AbstractSDParentActivity getParentTab() {
|
||||
|
@ -6,7 +6,6 @@ import android.content.Intent;
|
||||
import android.content.IntentFilter;
|
||||
import android.net.ConnectivityManager;
|
||||
import android.net.wifi.WifiManager;
|
||||
import android.util.Log;
|
||||
|
||||
import com.safemobile.lib.AppParams;
|
||||
import com.safemobile.lib.SM;
|
||||
@ -25,7 +24,6 @@ import java.util.TimerTask;
|
||||
|
||||
|
||||
public class TCPhandler implements Runnable {
|
||||
private final String TAG = "TCPhandler";
|
||||
private boolean alive = true;
|
||||
|
||||
public String serverHostname;
|
||||
@ -58,22 +56,18 @@ public class TCPhandler implements Runnable {
|
||||
|
||||
// create timer to check socket status
|
||||
Timer timer = new Timer();
|
||||
try {
|
||||
timer.scheduleAtFixedRate(new TimerTask() {
|
||||
@Override
|
||||
public void run() {
|
||||
try {
|
||||
previousConnectionWasUP = isConnectionUP;
|
||||
// try to send something
|
||||
TCPmsgParser._fireonTCPConnectionStatusEvent(isConnectionUP, previousConnectionWasUP);
|
||||
} catch (Exception e) {
|
||||
SM.Exception("TIMERException", e.toString());
|
||||
}
|
||||
timer.scheduleAtFixedRate(new TimerTask() {
|
||||
@Override
|
||||
public void run() {
|
||||
try {
|
||||
previousConnectionWasUP = isConnectionUP;
|
||||
// try to send something
|
||||
TCPmsgParser._fireonTCPConnectionStatusEvent(isConnectionUP, previousConnectionWasUP);
|
||||
} catch (Exception e) {
|
||||
SM.Exception("TIMERException", e.toString());
|
||||
}
|
||||
}, 0, 3000);
|
||||
} catch(Exception e) {
|
||||
Log.v("Exception", e.getMessage());
|
||||
}
|
||||
}
|
||||
}, 0, 3000);
|
||||
|
||||
// get WiFi state
|
||||
isWiFiOn = isNetworkConnected();
|
||||
@ -110,8 +104,6 @@ public class TCPhandler implements Runnable {
|
||||
SM.Debug("IllegalArgumentException", "TCPhandler break:"+ e);
|
||||
} catch (IOException e) {
|
||||
SM.Debug("IOException", "TCPhandler break:"+ e);
|
||||
} catch (Exception e) {
|
||||
Log.v("Exception", e.getMessage());
|
||||
}
|
||||
|
||||
while (alive) {
|
||||
@ -119,8 +111,6 @@ public class TCPhandler implements Runnable {
|
||||
Thread.sleep(3000);
|
||||
} catch (InterruptedException e) {
|
||||
SM.Debug("TCPhandler Crash1 on sleep:"+ e);
|
||||
} catch (Exception e) {
|
||||
Log.v("Exception", e.getMessage());
|
||||
}
|
||||
|
||||
while (Boolean.TRUE.equals(isConnectionUP)) {
|
||||
@ -252,8 +242,6 @@ public class TCPhandler implements Runnable {
|
||||
Thread.sleep(1000);
|
||||
} catch (InterruptedException e) {
|
||||
SM.Debug("TCPhandler Crash2 on sleep:"+ e);
|
||||
} catch (Exception e) {
|
||||
Log.v("Exception", e.getMessage());
|
||||
}
|
||||
//try to restart connection
|
||||
if (alive && isWiFiOn)
|
||||
@ -362,7 +350,6 @@ public class TCPhandler implements Runnable {
|
||||
if (soc != null)
|
||||
soc.close();
|
||||
} catch (IOException e1) {
|
||||
Log.v("IOException", e1.getMessage());
|
||||
e1.printStackTrace();
|
||||
}
|
||||
|
||||
@ -384,15 +371,14 @@ public class TCPhandler implements Runnable {
|
||||
|
||||
private void restartTCP() {
|
||||
try {
|
||||
Log.v(TAG, "restartTCP");
|
||||
isConnectionUP = false;
|
||||
previousConnectionWasUP = false;
|
||||
|
||||
SM.Debug("Restarting TCP...ip:" + serverHostname + ":" + port);
|
||||
soc = new Socket();
|
||||
soc.connect(new InetSocketAddress(serverHostname, port), 50000);
|
||||
input = new DataInputStream(soc.getInputStream());
|
||||
soc.connect(new InetSocketAddress(serverHostname, port), 5000);
|
||||
|
||||
input = new DataInputStream(soc.getInputStream());
|
||||
//output stream
|
||||
output = new DataOutputStream(soc.getOutputStream());
|
||||
|
||||
@ -400,11 +386,17 @@ public class TCPhandler implements Runnable {
|
||||
isConnectionUP = true;
|
||||
}
|
||||
|
||||
} catch (NullPointerException | IOException e) {
|
||||
SM.Exception("restartTCP break:" + e);
|
||||
} catch (UnknownHostException e) {
|
||||
SM.Exception("restartTCP break:" + e.toString());
|
||||
isConnectionUP = false;
|
||||
} catch (IllegalArgumentException e) {
|
||||
SM.Debug("IllegalArgumentException", "restartTCP break:" + e);
|
||||
SM.Debug("IllegalArgumentException", "restartTCP break:" + e.toString());
|
||||
} catch (IOException e) {
|
||||
SM.Exception("restartTCP break:" + e.toString());
|
||||
isConnectionUP = false;
|
||||
} catch (NullPointerException e) {
|
||||
SM.Exception("restartTCP break:" + e.toString());
|
||||
isConnectionUP = false;
|
||||
}
|
||||
triggerTCPConnectionStateEvent();
|
||||
}
|
||||
@ -418,7 +410,6 @@ public class TCPhandler implements Runnable {
|
||||
soc.close();
|
||||
soc = null;
|
||||
} catch (IOException e) {
|
||||
Log.v("IOException", e.getMessage());
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
@ -7,7 +7,6 @@
|
||||
android:glEsVersion="0x00020000"
|
||||
android:required="true" />
|
||||
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||
<uses-permission android:name="android.permission.CAMERA" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||
|
@ -107,6 +107,7 @@ public class TcpAudioClient implements Runnable {
|
||||
recv = soc.getInputStream();
|
||||
writer = soc.getOutputStream();
|
||||
setConnOK(true);
|
||||
|
||||
} catch (IOException e) {
|
||||
SM.Debug("break:" + e);
|
||||
}
|
||||
|
@ -132,17 +132,6 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
|
||||
setDate();
|
||||
}
|
||||
|
||||
public void setLanguage() {
|
||||
TextView labelVehicle = findViewById(R.id.labelVehicle);
|
||||
TextView labelStartDate = findViewById(R.id.labelStartDate);
|
||||
TextView labelEndDate = findViewById(R.id.labelEndDate);
|
||||
|
||||
labelVehicle.setText(R.string.vehicle);
|
||||
labelStartDate.setText(R.string.startDate);
|
||||
labelEndDate.setText(R.string.endDate);
|
||||
displayButton.setText(R.string.display);
|
||||
}
|
||||
|
||||
private void displayHistory(ArrayList<HistPos> positions) {
|
||||
LatLng latLng = null;
|
||||
PolylineOptions polylineOptions = new PolylineOptions();
|
||||
|
@ -296,11 +296,6 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
||||
registerBroadcastIntents();
|
||||
}
|
||||
|
||||
public void setLanguage() {
|
||||
TextView textView = findViewById(R.id.unit_name);
|
||||
textView.setText(R.string.unitName);
|
||||
}
|
||||
|
||||
/**
|
||||
* Manipulates the map once available.
|
||||
* This callback is triggered when the map is ready to be used.
|
||||
|
@ -10,7 +10,6 @@ import android.graphics.Typeface;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.os.Looper;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.Button;
|
||||
@ -46,7 +45,6 @@ public class MessagesActivity extends Activity {
|
||||
/**
|
||||
* Called when the activity is first created.
|
||||
*/
|
||||
private final String TAG = "MessagesActivity";
|
||||
|
||||
private MessagesGridViewAdapter mAdapter;
|
||||
private ConversationGridViewAdapter convAdapter;
|
||||
@ -140,7 +138,6 @@ public class MessagesActivity extends Activity {
|
||||
|
||||
// Implement On Item click listener
|
||||
gridView.setOnItemClickListener((arg0, arg1, position, arg3) -> {
|
||||
Log.v(TAG, "onItemClick " + LASTMESSAGES);
|
||||
if (LASTMESSAGES) {
|
||||
// get position
|
||||
Msg item = mAdapter.getItem(position);
|
||||
@ -199,7 +196,6 @@ public class MessagesActivity extends Activity {
|
||||
imageButtonBack.setOnClickListener(v -> {
|
||||
// set LastMessage conversation type
|
||||
LASTMESSAGES = true;
|
||||
Log.v(TAG, "lastmessages: true");
|
||||
// refresh Grid
|
||||
getLastSMS();
|
||||
if (AppParams.DEMO)
|
||||
@ -392,7 +388,6 @@ public class MessagesActivity extends Activity {
|
||||
listLastMessages.add(new Msg(sentVehicle, txt, Calendar.getInstance().getTime(), sendSMSSeqID));
|
||||
}
|
||||
SM.Debug("time: " + timeGMT + " | " + Calendar.getInstance().getTime());
|
||||
Log.v(TAG, "lastmessages: false");
|
||||
LASTMESSAGES = false;
|
||||
|
||||
updateResultsInUi();
|
||||
@ -632,7 +627,6 @@ public class MessagesActivity extends Activity {
|
||||
setScId(item.sc_id);
|
||||
SM.Debug("Selected scId: " + getScId());
|
||||
// set Conversation type
|
||||
Log.v(TAG, "lastmessages: false");
|
||||
LASTMESSAGES = false;
|
||||
// call get SMS
|
||||
getSMS4unit(getScId());
|
||||
|
@ -10,19 +10,13 @@ import android.content.ServiceConnection;
|
||||
import android.content.SharedPreferences;
|
||||
import android.content.res.Configuration;
|
||||
import android.graphics.Color;
|
||||
import android.net.ConnectivityManager;
|
||||
import android.net.Network;
|
||||
import android.net.NetworkCapabilities;
|
||||
import android.net.NetworkRequest;
|
||||
import android.os.AsyncTask;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.os.IBinder;
|
||||
import android.os.Looper;
|
||||
import android.text.Editable;
|
||||
import android.text.InputType;
|
||||
import android.util.Log;
|
||||
import android.view.Gravity;
|
||||
import android.view.View;
|
||||
import android.view.View.OnClickListener;
|
||||
@ -120,17 +114,6 @@ public class SDMobileActivity extends Activity {
|
||||
super.onCreate(savedInstanceState);
|
||||
SM.Debug("##### onCREATE ##### with LANGUAGE " + AppParams.LANGUAGETMP);
|
||||
|
||||
ConnectivityManager connectivityManager =
|
||||
(ConnectivityManager) this.getSystemService(Context.CONNECTIVITY_SERVICE);
|
||||
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
|
||||
connectivityManager.registerDefaultNetworkCallback(networkCallback);
|
||||
else {
|
||||
NetworkRequest request = new NetworkRequest.Builder()
|
||||
.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET).build();
|
||||
connectivityManager.registerNetworkCallback(request, networkCallback);
|
||||
}
|
||||
|
||||
AppParams.theme = AppParams.Theme.SAFEDISPATCH;
|
||||
if (AppParams.theme == AppParams.Theme.SAFENET)
|
||||
this.setTheme(R.style.Theme_Safenet);
|
||||
@ -549,21 +532,6 @@ public class SDMobileActivity extends Activity {
|
||||
SM.Debug("##### onRESUME #####");
|
||||
}
|
||||
|
||||
private final ConnectivityManager.NetworkCallback networkCallback = new ConnectivityManager.NetworkCallback() {
|
||||
@Override
|
||||
public void onAvailable(Network network) {
|
||||
// network available
|
||||
Log.v("NetworkAvailability", "available");
|
||||
if (tcp != null && !tcp.isConnectionUP)
|
||||
saveIPandRestartTCP(AppParams.IP, AppParams.PORT);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onLost(Network network) {
|
||||
// network unavailable
|
||||
Log.v("NetworkAvailability", "unavailable");
|
||||
}
|
||||
};
|
||||
|
||||
private void startTabActivity(long userID) {
|
||||
// good login - load activity
|
||||
|
@ -73,7 +73,6 @@ import android.content.pm.PackageManager;
|
||||
import android.content.res.AssetManager;
|
||||
import android.content.res.Configuration;
|
||||
import android.content.res.Resources;
|
||||
import android.net.ConnectivityManager;
|
||||
import android.net.Uri;
|
||||
import android.os.AsyncTask;
|
||||
import android.os.Build;
|
||||
@ -102,7 +101,6 @@ import androidx.core.app.NotificationManagerCompat;
|
||||
|
||||
public class TabLayoutActivity extends AbstractSDParentActivity {
|
||||
|
||||
private final String TAG = "TabLayoutActivity";
|
||||
/* Misc */
|
||||
private Resources res;
|
||||
private Context context;
|
||||
@ -181,9 +179,6 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
||||
private static final String SETTINGS = "Setup";
|
||||
private static final String ABOUT = "SafeMobile";
|
||||
|
||||
private final Handler uiHandler = new Handler(Looper.getMainLooper());
|
||||
|
||||
|
||||
// default app language
|
||||
public static final String DATABASE_LANGUAGE = "en"; // database language : en, de, tr, ro or empty
|
||||
|
||||
@ -607,7 +602,6 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
||||
Vehicle vehicle = getVehicle4Imei(getImei());
|
||||
if (vehicle != null)
|
||||
getMessageActivity().setScId(vehicle.sc_id);
|
||||
Log.v(TAG, "lastmessages: false");
|
||||
getMessageActivity().LASTMESSAGES = false;
|
||||
getMessageActivity().getLastSMS();
|
||||
|
||||
@ -700,19 +694,6 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
||||
|
||||
@Override
|
||||
public void whenBackPressed(AppParams.ActivityResult result) {
|
||||
try {
|
||||
prepareForLogOut(result);
|
||||
|
||||
finish();
|
||||
android.os.Process.killProcess(android.os.Process.myPid());
|
||||
System.exit(0);
|
||||
} catch (Exception e) {
|
||||
Log.v(TAG, e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
private void prepareForLogOut(AppParams.ActivityResult result) {
|
||||
Log.v(TAG, "prepareForLogOut");
|
||||
if (tcpTimer != null) {
|
||||
tcpTimer.cancel();
|
||||
tcpTimer.purge();
|
||||
@ -740,6 +721,10 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
||||
|
||||
getIntent().putExtra("result", result);
|
||||
setResult(RESULT_OK, getIntent()); //-> used for exit
|
||||
|
||||
finish();
|
||||
android.os.Process.killProcess(android.os.Process.myPid());
|
||||
System.exit(0);
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -747,13 +732,12 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
||||
// recreate UI
|
||||
Locale locale = new Locale(AppParams.LANGUAGETMP);
|
||||
Locale.setDefault(locale);
|
||||
setLocale(getLiveActivity(), locale);
|
||||
android.content.res.Configuration configuration = new android.content.res.Configuration();
|
||||
configuration.locale = locale;
|
||||
getBaseContext().getResources().updateConfiguration(configuration,
|
||||
getBaseContext().getResources().getDisplayMetrics());
|
||||
|
||||
// change UI for RadioActivity and MessageActivity
|
||||
if (getLiveActivity() != null)
|
||||
getLiveActivity().setLanguage();
|
||||
if (getHistoryActivity() != null)
|
||||
getHistoryActivity().setLanguage();
|
||||
if (getRadioActivity() != null)
|
||||
getRadioActivity().onCreate(getRadioActivity().savedInstanceState);
|
||||
if (getMessageActivity() != null)
|
||||
@ -764,13 +748,6 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
||||
getAlarmActivity().onCreate(getAlarmActivity().getSavedInstanceState());
|
||||
}
|
||||
|
||||
public static void setLocale(Activity activity, Locale locale) {
|
||||
Resources resources = activity.getResources();
|
||||
Configuration config = resources.getConfiguration();
|
||||
config.setLocale(locale);
|
||||
resources.updateConfiguration(config, resources.getDisplayMetrics());
|
||||
}
|
||||
|
||||
//timer stuff
|
||||
private void timerMethod() {
|
||||
if (!AppParams.DEMO)
|
||||
@ -2052,50 +2029,8 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
||||
|
||||
@Override
|
||||
public void onTCPConnectionDown(boolean previousWasConnectionUp) {
|
||||
Timer timer = new Timer();
|
||||
timer.schedule(new TimerTask() {
|
||||
@Override
|
||||
public void run() {
|
||||
boolean isNetworkConnected = isNetworkConnected();
|
||||
Log.v(TAG, "isNetworkConnected: " + isNetworkConnected);
|
||||
if (isNetworkConnected) {
|
||||
if (tcp != null && !tcp.isConnectionUP) {
|
||||
tcp.Stop();
|
||||
// if (tcpParser != null)
|
||||
// tcpParser.clearMsgList();
|
||||
tcp = null;
|
||||
|
||||
uiHandler.post(() -> {
|
||||
if (myService != null) {
|
||||
myService.stopTCPConnection();
|
||||
|
||||
|
||||
myService.recreateTCPConnection();
|
||||
|
||||
getApplicationContext().bindService(new Intent(context, TCPService.class), serviceConnection, Context.BIND_AUTO_CREATE);
|
||||
if (getRadioActivity() != null)
|
||||
getRadioActivity().onCreate(getRadioActivity().savedInstanceState);
|
||||
if (getMessageActivity() != null)
|
||||
getMessageActivity().onCreate(getMessageActivity().getSavedInstanceState());
|
||||
if (getRecordingsActivity() != null)
|
||||
getRecordingsActivity().onCreate(getRecordingsActivity().getSavedInstanceState());
|
||||
if (getAlarmActivity() != null)
|
||||
getAlarmActivity().onCreate(getAlarmActivity().getSavedInstanceState());
|
||||
|
||||
uiHandler.post(initTCPRUN);
|
||||
}
|
||||
SM.Debug("RECREATE TCP", "IP: " + AppParams.IP + " | Port: " + AppParams.PORT);
|
||||
});
|
||||
}
|
||||
|
||||
this.cancel();
|
||||
}
|
||||
}
|
||||
}, 0, 100);
|
||||
|
||||
prepareForLogOut(AppParams.ActivityResult.tcpDown);
|
||||
// execute logout
|
||||
// whenBackPressed(AppParams.ActivityResult.tcpDown);
|
||||
whenBackPressed(AppParams.ActivityResult.tcpDown);
|
||||
|
||||
// send a broadcast
|
||||
notifyBroadcast(OperationCodes.TCP_CONNECTION_DOWN + "");
|
||||
@ -2119,19 +2054,6 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
||||
});
|
||||
}
|
||||
|
||||
// Create runnable for posting
|
||||
final Runnable initTCPRUN = () -> {
|
||||
// start thread to add listener
|
||||
SM.Debug("##### initTCPRUN");
|
||||
if (!AppParams.DEMO)
|
||||
tcpInit();
|
||||
};
|
||||
|
||||
private boolean isNetworkConnected() {
|
||||
ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
|
||||
return cm.getActiveNetworkInfo() != null && cm.getActiveNetworkInfo().isConnected();
|
||||
}
|
||||
|
||||
// Create runnable for posting
|
||||
final Runnable updateResultsAlarm = () -> updateResultsAlarmInUi("realpha");
|
||||
|
||||
|
@ -10,7 +10,6 @@
|
||||
android:gravity="center_vertical" >
|
||||
|
||||
<TextView
|
||||
android:id="@+id/unit_name"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/unitName"
|
||||
|
Loading…
Reference in New Issue
Block a user