|
@@ -7,7 +7,6 @@ import android.content.DialogInterface;
|
|
|
import android.content.Intent;
|
|
|
import android.content.IntentFilter;
|
|
|
import android.content.SharedPreferences;
|
|
|
-import android.net.wifi.WifiManager;
|
|
|
import android.os.Bundle;
|
|
|
import android.support.v4.content.LocalBroadcastManager;
|
|
|
import android.view.LayoutInflater;
|
|
@@ -52,7 +51,7 @@ public class HomeFragment extends Fragment {
|
|
|
private SharedPreferences mConnectionInfo;
|
|
|
private UglyDbHelper dbh;
|
|
|
|
|
|
- private static int DANGER_LEVEL= 0;
|
|
|
+ private static ThreatIndicatorGLRenderer.ThreatLevel THREAT_LEVEL = ThreatIndicatorGLRenderer.ThreatLevel.NO_THREAT;
|
|
|
|
|
|
private void assignViews() {
|
|
|
mHomeSwitchConnection = (Switch) rootView.findViewById(R.id.home_switch_connection);
|
|
@@ -68,17 +67,10 @@ public class HomeFragment extends Fragment {
|
|
|
mReceiver = new BroadcastReceiver() {
|
|
|
@Override
|
|
|
public void onReceive(Context context, Intent intent) {
|
|
|
- //final String action = intent.getAction();
|
|
|
- //if (action.equals(WifiManager.SUPPLICANT_CONNECTION_CHANGE_ACTION) || action.equals(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION)) {
|
|
|
- updateUI();
|
|
|
- /*if (intent.getBooleanExtra(WifiManager.EXTRA_SUPPLICANT_CONNECTED, false)){
|
|
|
-
|
|
|
- } else {
|
|
|
- // wifi connection was lost
|
|
|
- }*/
|
|
|
- //}
|
|
|
+ updateUI();
|
|
|
}
|
|
|
};
|
|
|
+
|
|
|
LocalBroadcastManager.getInstance(getActivity()).registerReceiver(mReceiver, new IntentFilter(getString(R.string.broadcast)));
|
|
|
}
|
|
|
|
|
@@ -92,7 +84,7 @@ public class HomeFragment extends Fragment {
|
|
|
mHomeTextProfileHeader.setTextColor(getResources().getColor(R.color.light_grey));
|
|
|
|
|
|
if(!initial){
|
|
|
- ThreatIndicatorGLRenderer.setThreatLevel(ThreatIndicatorGLRenderer.kThreatLevelNotMonitoring);
|
|
|
+ ThreatIndicatorGLRenderer.setThreatLevel(ThreatIndicatorGLRenderer.ThreatLevel.NOT_MONITORING);
|
|
|
}
|
|
|
|
|
|
mHomeSwitchConnection.setChecked(false);
|
|
@@ -115,7 +107,7 @@ public class HomeFragment extends Fragment {
|
|
|
mHomeTextProfileHeader.setTextColor(defaultTextColor);
|
|
|
|
|
|
if(!initial){
|
|
|
- ThreatIndicatorGLRenderer.setThreatLevel(ThreatIndicatorGLRenderer.kThreatLevelNoThreat);
|
|
|
+ ThreatIndicatorGLRenderer.setThreatLevel(ThreatIndicatorGLRenderer.ThreatLevel.NO_THREAT);
|
|
|
}
|
|
|
|
|
|
mHomeSwitchConnection.setChecked(true);
|
|
@@ -163,43 +155,53 @@ public class HomeFragment extends Fragment {
|
|
|
totalLogged += log_attacks;
|
|
|
|
|
|
if(log_attacks > 0){
|
|
|
- DANGER_LEVEL = Math.max(1, DANGER_LEVEL);
|
|
|
+ if(THREAT_LEVEL != ThreatIndicatorGLRenderer.ThreatLevel.LIVE_THREAT){
|
|
|
+ THREAT_LEVEL = ThreatIndicatorGLRenderer.ThreatLevel.PAST_THREAT;
|
|
|
+ }
|
|
|
} else {
|
|
|
- DANGER_LEVEL = Math.max(0, DANGER_LEVEL);
|
|
|
+ if(THREAT_LEVEL != ThreatIndicatorGLRenderer.ThreatLevel.LIVE_THREAT && THREAT_LEVEL != ThreatIndicatorGLRenderer.ThreatLevel.PAST_THREAT){
|
|
|
+ THREAT_LEVEL = ThreatIndicatorGLRenderer.ThreatLevel.NO_THREAT;
|
|
|
+ }
|
|
|
}
|
|
|
} else {
|
|
|
totalAttacks += attacks;
|
|
|
- DANGER_LEVEL = Math.max(2, DANGER_LEVEL);
|
|
|
+ THREAT_LEVEL = ThreatIndicatorGLRenderer.ThreatLevel.LIVE_THREAT;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
if(hasActiveListeners){
|
|
|
setStateActive(true);
|
|
|
|
|
|
- if(DANGER_LEVEL == 0){
|
|
|
- mHomeTextAttacks.setText("0 attacks recorded");
|
|
|
- mHomeTextSecurity.setText("Secure");
|
|
|
- mHomeTextAttacks.setTextColor(getResources().getColor(R.color.holo_dark_green));
|
|
|
- mHomeTextSecurity.setTextColor(getResources().getColor(R.color.holo_dark_green));
|
|
|
- } else if(DANGER_LEVEL == 1){
|
|
|
- mHomeTextAttacks.setText(totalLogged + (totalLogged == 1 ? " attack" : " attacks") + " logged");
|
|
|
- mHomeTextSecurity.setText("Insecure");
|
|
|
- mHomeTextAttacks.setTextColor(getResources().getColor(R.color.holo_yellow));
|
|
|
- mHomeTextSecurity.setTextColor(getResources().getColor(R.color.holo_yellow));
|
|
|
- } else if(DANGER_LEVEL == 2){
|
|
|
- mHomeTextAttacks.setText(totalAttacks + (totalAttacks == 1 ? " attack" : " attacks") + " recorded");
|
|
|
- mHomeTextSecurity.setText("Insecure");
|
|
|
- mHomeTextAttacks.setTextColor(getResources().getColor(R.color.holo_red));
|
|
|
- mHomeTextSecurity.setTextColor(getResources().getColor(R.color.holo_red));
|
|
|
+ switch(THREAT_LEVEL){
|
|
|
+ case NO_THREAT:
|
|
|
+ mHomeTextAttacks.setText("0 attacks recorded");
|
|
|
+ mHomeTextSecurity.setText("Secure");
|
|
|
+ mHomeTextAttacks.setTextColor(getResources().getColor(R.color.holo_dark_green));
|
|
|
+ mHomeTextSecurity.setTextColor(getResources().getColor(R.color.holo_dark_green));
|
|
|
+ break;
|
|
|
+ case PAST_THREAT:
|
|
|
+ mHomeTextAttacks.setText(totalLogged + (totalLogged == 1 ? " attack" : " attacks") + " logged");
|
|
|
+ mHomeTextSecurity.setText("Insecure");
|
|
|
+ mHomeTextAttacks.setTextColor(getResources().getColor(R.color.holo_yellow));
|
|
|
+ mHomeTextSecurity.setTextColor(getResources().getColor(R.color.holo_yellow));
|
|
|
+ break;
|
|
|
+ case LIVE_THREAT:
|
|
|
+ mHomeTextAttacks.setText(totalAttacks + (totalAttacks == 1 ? " attack" : " attacks") + " recorded");
|
|
|
+ mHomeTextSecurity.setText("Insecure");
|
|
|
+ mHomeTextAttacks.setTextColor(getResources().getColor(R.color.holo_red));
|
|
|
+ mHomeTextSecurity.setTextColor(getResources().getColor(R.color.holo_red));
|
|
|
+ break;
|
|
|
}
|
|
|
|
|
|
- ThreatIndicatorGLRenderer.setThreatLevel(DANGER_LEVEL + 1);
|
|
|
+ ThreatIndicatorGLRenderer.setThreatLevel(THREAT_LEVEL);
|
|
|
} else {
|
|
|
mHomeSwitchConnection.setOnCheckedChangeListener(null);
|
|
|
setStateNotActive();
|
|
|
- DANGER_LEVEL = 0;
|
|
|
+ THREAT_LEVEL = ThreatIndicatorGLRenderer.ThreatLevel.NO_THREAT;
|
|
|
|
|
|
if(!HelperUtils.isWifiConnected(getActivity())){
|
|
|
setStateNotConnected();
|